diff -ruN upp-2008.1/Makefile upp/Makefile --- upp-2008.1/Makefile Thu Jul 31 21:34:10 2008 +++ upp/Makefile Sat Nov 22 14:39:20 2008 @@ -1,5 +1,5 @@ # change to your host type (allowed are: LINUX, FREEBSD) -HOSTTYPE = FREEBSD +HOSTTYPE = OPENBSD UPPOUT = out/ OutFile = $(UPPOUT)ide/GCC-Gcc-Gui-$(HOSTTYPE)-Main-Shared/ide diff -ruN upp-2008.1/uppsrc/Core/Core.h upp/uppsrc/Core/Core.h --- upp-2008.1/uppsrc/Core/Core.h Mon Jul 28 23:00:41 2008 +++ upp/uppsrc/Core/Core.h Fri Nov 28 21:34:53 2008 @@ -69,6 +69,15 @@ #ifdef flagFREEBSD #define PLATFORM_FREEBSD + #define PLATFORM_BSD +#endif + +#ifdef flagOPENBSD + #define PLATFORM_OPENBSD + #define PLATFORM_BSD +#endif + +#ifdef PLATFORM_BSD #define PLATFORM_POSIX #ifdef flagGUI #define PLATFORM_X11 diff -ruN upp-2008.1/uppsrc/Core/Core.upp upp/uppsrc/Core/Core.upp --- upp-2008.1/uppsrc/Core/Core.upp Mon Jul 28 23:00:40 2008 +++ upp/uppsrc/Core/Core.upp Sat Nov 29 13:03:43 2008 @@ -11,7 +11,7 @@ library(LINUX) "pthread dl"; -library(FREEBSD) pthread; +library(FREEBSD | OPENBSD) pthread; library(WIN32 !MSC8ARM) "advapi32 shell32 winmm mpr"; diff -ruN upp-2008.1/uppsrc/Core/Cpu.cpp upp/uppsrc/Core/Cpu.cpp --- upp-2008.1/uppsrc/Core/Cpu.cpp Mon Jul 28 23:00:41 2008 +++ upp/uppsrc/Core/Cpu.cpp Sun Nov 30 18:45:11 2008 @@ -57,8 +57,11 @@ bool CpuSSE3() { sCheckCPU(); return sHasSSE3; } #ifdef PLATFORM_POSIX -#ifdef PLATFORM_FREEBSD -#include +#ifdef PLATFORM_OPENBSD +#include +#endif +#ifdef PLATFORM_BSD +#include #else #include #endif @@ -81,8 +84,13 @@ n += !!(sa & (1 << i)); #endif #elif defined(PLATFORM_POSIX) -#ifdef PLATFORM_FREEBSD - n = minmax((int)sysconf(_SC_NPROCESSORS_ONLN), 1, 256); +#ifdef PLATFORM_BSD + int mib[2]; + size_t len = sizeof(n); + mib[0] = CTL_HW; + mib[1] = HW_NCPU; + sysctl(mib, 2, &n, &len, NULL, 0); + n = minmax(n, 1, 256); #else n = minmax(get_nprocs(), 1, 256); #endif diff -ruN upp-2008.1/uppsrc/Core/Debug.cpp upp/uppsrc/Core/Debug.cpp --- upp-2008.1/uppsrc/Core/Debug.cpp Mon Jul 28 23:00:41 2008 +++ upp/uppsrc/Core/Debug.cpp Sun Nov 30 00:49:31 2008 @@ -41,13 +41,13 @@ *fn = '\0'; strcat(path, ".upp/"); const char *exe = procexepath_(); - if(!exe) { + if(!*exe) { exe = Argv0__; } const char *q = strrchr(exe, '/'); if(q) exe = q + 1; - if(!exe) + if(!*exe) exe = "upp"; strcat(path, exe); mkdir(path, 0755); diff -ruN upp-2008.1/uppsrc/Core/Util.cpp upp/uppsrc/Core/Util.cpp --- upp-2008.1/uppsrc/Core/Util.cpp Mon Jul 28 23:00:40 2008 +++ upp/uppsrc/Core/Util.cpp Sat Nov 29 15:25:29 2008 @@ -158,7 +158,7 @@ #ifndef PLATFORM_WIN32 void Sleep(int msec) { - timespec tval; + ::timespec tval; tval.tv_sec = msec / 1000; tval.tv_nsec = (msec % 1000) * 1000000; nanosleep(&tval, NULL); diff -ruN upp-2008.1/uppsrc/CtrlLib/CtrlLib.upp upp/uppsrc/CtrlLib/CtrlLib.upp --- upp-2008.1/uppsrc/CtrlLib/CtrlLib.upp Mon Jul 28 23:00:27 2008 +++ upp/uppsrc/CtrlLib/CtrlLib.upp Sat Nov 29 13:03:30 2008 @@ -9,7 +9,7 @@ uses(LINUX) PdfDraw; -uses(FREEBSD) PdfDraw; +uses(FREEBSD | OPENBSD) PdfDraw; uses(OSX11) PdfDraw; diff -ruN upp-2008.1/uppsrc/Draw/Draw.upp upp/uppsrc/Draw/Draw.upp --- upp-2008.1/uppsrc/Draw/Draw.upp Mon Jul 28 23:00:47 2008 +++ upp/uppsrc/Draw/Draw.upp Sat Nov 29 14:40:50 2008 @@ -6,7 +6,7 @@ uses Core; -library((LINUX | FREEBSD) & !NOGTK) "gtk-x11-2.0 gdk-x11-2.0 atk-1.0 gdk_pixbuf-2.0 m pangocairo-1.0 fontconfig Xext Xrender Xinerama Xi Xrandr Xcursor Xfixes pango-1.0 cairo X11 gobject-2.0 gmodule-2.0 glib-2.0"; +library((LINUX | FREEBSD | OPENBSD) & !NOGTK) "gtk-x11-2.0 gdk-x11-2.0 atk-1.0 gdk_pixbuf-2.0 m pangocairo-1.0 fontconfig Xext Xrender Xinerama Xi Xrandr Xcursor Xfixes pango-1.0 cairo X11 gobject-2.0 gmodule-2.0 glib-2.0"; library(WIN32 !MSC8ARM) "user32 gdi32"; @@ -16,9 +16,9 @@ library(LINUX !XLFD) Xft; -library(FREEBSD) X11; +library(FREEBSD | OPENBSD) "X11 Xau Xdmcp"; -library(FREEBSD !XLFD) "Xft fontconfig Xrender freetype expat"; +library((FREEBSD | OPENBSD) & !XLFD) "Xft fontconfig Xrender freetype expat"; library(LINUX !XLFD !SHARED) "fontconfig Xrender freetype expat"; diff -ruN upp-2008.1/uppsrc/coff/util.h upp/uppsrc/coff/util.h --- upp-2008.1/uppsrc/coff/util.h Mon Jul 28 23:00:50 2008 +++ upp/uppsrc/coff/util.h Fri Nov 28 21:44:55 2008 @@ -7,7 +7,7 @@ #undef __offsetof #endif -#ifdef PLATFORM_FREEBSD +#ifdef PLATFORM_BSD #include #include #endif diff -ruN upp-2008.1/uppsrc/ide/Host.cpp upp/uppsrc/ide/Host.cpp --- upp-2008.1/uppsrc/ide/Host.cpp Mon Jul 28 23:02:06 2008 +++ upp/uppsrc/ide/Host.cpp Sun Nov 30 02:32:15 2008 @@ -174,10 +174,11 @@ else i++; } -#endif String LinuxHostConsole = "/usr/bin/xterm -e"; +#endif + void LocalHost::Launch(const char *_cmdline, bool console) { String cmdline = FindCommand(exedirs, _cmdline); @@ -214,7 +215,7 @@ out << "#!/bin/sh\n" << cmdline << '\n' << "echo \"<--- Finished, press any key to close the window --->\"\nread\n"; - cmdline = LinuxHostConsole + " bash " + script; + cmdline = LinuxHostConsole + " sh " + script; } DUMP(LoadFile(script)); SaveFile(GetHomeDirFile("test"), LoadFile(script)); @@ -295,6 +296,8 @@ cfg.Add("LINUX"); #elif defined(PLATFORM_FREEBSD) cfg.Add("FREEBSD"); +#elif defined(PLATFORM_OPENBSD) + cfg.Add("OPENBSD"); #elif defined(PLATFORM_SOLARIS) cfg.Add("SOLARIS"); #elif defined(PLATFORM_OSX11) diff -ruN upp-2008.1/uppsrc/ide/Makefile upp/uppsrc/ide/Makefile --- upp-2008.1/uppsrc/ide/Makefile Thu Jul 31 21:35:01 2008 +++ upp/uppsrc/ide/Makefile Sun Nov 30 14:08:53 2008 @@ -6,7 +6,7 @@ UPPDIR1 = uppsrc/ UPPOUT = out/ -CINC = -I$(UPPDIR1) -I$(LOCALBASE)/include -I$(LOCALBASE)/include/freetype2 -I$(LOCALBASE)/include/gtk-2.0 -I$(LOCALBASE)/include/glib-2.0 -I$(LOCALBASE)/include/cairo -I$(LOCALBASE)/include/pango-1.0 -I$(LOCALBASE)/include/atk-1.0 +CINC = -I$(XORG_BASE)/include -I$(XORG_BASE)/include/freetype2 -I$(LOCALBASE)/lib/glib-2.0/include -I$(LOCALBASE)/lib/gtk-2.0/include -I$(LOCALBASE)/include/libpng -I$(UPPDIR1) -I$(LOCALBASE)/include -I$(LOCALBASE)/include/freetype2 -I$(LOCALBASE)/include/gtk-2.0 -I$(LOCALBASE)/include/glib-2.0 -I$(LOCALBASE)/include/cairo -I$(LOCALBASE)/include/pango-1.0 -I$(LOCALBASE)/include/atk-1.0 Macro = -DflagGUI -DflagGCC -DflagSHARED -Dflag$(HOSTTYPE) CC ?= c++ C_FLAGS = $(CC) -c -O2 -x c $(CFLAGS) @@ -254,7 +254,6 @@ $(OutDir_plugin_astyle)astyle.a \ $(OutDir_Esc)Esc.a \ $(OutDir_Core)Core.a \ - $(OutDir_plugin_z)z.a \ $(OutDir_RichEdit)RichEdit.o \ $(OutDir_RichEdit)RichEdit.a \ $(OutDir_IconDes)IconDes.a \ diff -ruN upp-2008.1/uppsrc/ide/Methods.cpp upp/uppsrc/ide/Methods.cpp --- upp-2008.1/uppsrc/ide/Methods.cpp Mon Jul 28 23:02:06 2008 +++ upp/uppsrc/ide/Methods.cpp Fri Nov 28 21:46:31 2008 @@ -217,6 +217,7 @@ remote_os.Add("UNIX"); remote_os.Add("SOLARIS"); remote_os.Add("FREEBSD"); + remote_os.Add("OPENBSD"); method.AddCtrl("REMOTE_TRANSFER", remote_file_access); remote_file_access.Add("0", "direct (SAMBA)"); remote_file_access.Add("1", "indirect (transfer)");