Browse Source

Linux build fixes.

mingodad 13 years ago
parent
commit
0f609c7c2d
4 changed files with 288 additions and 287 deletions
  1. 112 112
      SquiLu-editor/editor.cbp
  2. 3 1
      SquiLu-editor/editor.cxx
  3. 157 155
      SquiLu/squilu.cbp
  4. 16 19
      fltk/fluid/fluid.cbp

+ 112 - 112
SquiLu-editor/editor.cbp

@@ -7,13 +7,13 @@
 		<Option compiler="gcc" />
 		<Build>
 			<Target title="Debug">
-				<Option output="bin\Debug\editor" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj\Debug\" />
+				<Option output="bin/Debug/editor" prefix_auto="1" extension_auto="1" />
+				<Option object_output="obj/Debug/" />
 				<Option type="1" />
 				<Option compiler="gcc" />
 				<Compiler>
 					<Add option="-g" />
-					<Add directory="\usr\include\postgresql" />
+					<Add directory="/usr/include/postgresql" />
 				</Compiler>
 				<Linker>
 					<Add library="X11" />
@@ -34,8 +34,8 @@
 				<Option type="1" />
 				<Option compiler="gcc" />
 				<Compiler>
-					<Add option="-O2" />
-					<Add directory="\usr\include\postgresql" />
+					<Add option="-O3" />
+					<Add directory="/usr/include/postgresql" />
 				</Compiler>
 				<Linker>
 					<Add option="-s" />
@@ -44,11 +44,11 @@
 					<Add library="Xft" />
 					<Add library="Xext" />
 					<Add library="pthread" />
-					<Add library="rt" />
+					<Add library="zmq3" />
 					<Add library="axtls" />
 					<Add library="mpdecimal" />
-					<Add library="zmq3" />
 					<Add library="discount" />
+					<Add library="rt" />
 				</Linker>
 			</Target>
 			<Target title="Release win32">
@@ -63,11 +63,11 @@
 					<Add option="-DAS_STATIC_LIB=1" />
 					<Add option="-DINET_ATON=1" />
 					<Add option="-DWITH_FLTK=1" />
-					<Add directory="..\..\zeromq-3.2.2\include" />
-					<Add directory="..\fltk" />
-					<Add directory="..\libharu\include" />
-					<Add directory="..\flu" />
-					<Add directory="..\..\..\..\Program Files\PostgreSQL\9.1\include" />
+					<Add directory="../../zeromq-3.2.2/include" />
+					<Add directory="../fltk" />
+					<Add directory="../libharu/include" />
+					<Add directory="../flu" />
+					<Add directory="../../../../Program Files/PostgreSQL/9.1/include" />
 				</Compiler>
 				<Linker>
 					<Add option="-s" />
@@ -85,11 +85,11 @@
 					<Add library="comctl32" />
 					<Add library="ws2_32" />
 					<Add library="rpcrt4" />
-					<Add directory="..\..\zeromq-3.2.2\include" />
-					<Add directory="..\..\..\..\Program Files\PostgreSQL\9.1\include" />
-					<Add directory="..\fltk" />
-					<Add directory="..\libharu\include" />
-					<Add directory="..\flu" />
+					<Add directory="../../zeromq-3.2.2/include" />
+					<Add directory="../../../../Program Files/PostgreSQL/9.1/include" />
+					<Add directory="../fltk" />
+					<Add directory="../libharu/include" />
+					<Add directory="../flu" />
 				</Linker>
 			</Target>
 		</Build>
@@ -128,16 +128,16 @@
 			<Add option="-DSSL_STATIC_LIBRARY=1" />
 			<Add option="-DPDF_USING_ZLIB=1" />
 			<Add option="-DRS232_STATIC=1" />
-			<Add directory="..\fltk" />
-			<Add directory="..\SquiLu\include" />
-			<Add directory="..\myaxtls" />
-			<Add directory="..\SquiLu\sqstdlib" />
-			<Add directory="..\SquiLu-ext" />
-			<Add directory="..\..\zeromq-3.2.2\include" />
-			<Add directory="..\flu" />
-			<Add directory="..\libharu\include" />
-			<Add directory="..\discount" />
-			<Add directory="..\SquiLu-editor" />
+			<Add directory="../fltk" />
+			<Add directory="../SquiLu/include" />
+			<Add directory="../myaxtls" />
+			<Add directory="../SquiLu/sqstdlib" />
+			<Add directory="../SquiLu-ext" />
+			<Add directory="../../zeromq-3.2.2/include" />
+			<Add directory="../flu" />
+			<Add directory="../libharu/include" />
+			<Add directory="../discount" />
+			<Add directory="../SquiLu-editor" />
 			<Add directory=".." />
 		</Compiler>
 		<Linker>
@@ -149,113 +149,113 @@
 			<Add library="fltk" />
 			<Add library="m" />
 			<Add library="hpdfs" />
-			<Add directory="..\fltk\lib" />
-			<Add directory="..\mpdecimal" />
-			<Add directory="..\myaxtls" />
-			<Add directory="..\..\zeromq-3.2.2" />
-			<Add directory="..\flu" />
-			<Add directory="..\libharu\src" />
-			<Add directory="..\discount" />
+			<Add directory="../fltk/lib" />
+			<Add directory="../mpdecimal" />
+			<Add directory="../myaxtls" />
+			<Add directory="../../zeromq-3.2.2" />
+			<Add directory="../flu" />
+			<Add directory="../libharu/src" />
+			<Add directory="../discount" />
 		</Linker>
 		<Unit filename="dadbiz.rc">
 			<Option compilerVar="WINDRES" />
 			<Option target="Release win32" />
 		</Unit>
 		<Unit filename="editor.cxx" />
-		<Unit filename="..\SquiLu-ext\code_mix_prep.c">
+		<Unit filename="../SquiLu-ext/code_mix_prep.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\SquiLu-ext\dynamic_library.cpp" />
-		<Unit filename="..\SquiLu-ext\dynamic_library.h" />
-		<Unit filename="..\SquiLu-ext\fpdf.cpp" />
-		<Unit filename="..\SquiLu-ext\fpdf.h" />
-		<Unit filename="..\SquiLu-ext\lua_socket.cpp" />
-		<Unit filename="..\SquiLu-ext\lua_socket.h" />
-		<Unit filename="..\SquiLu-ext\mongoose.c">
+		<Unit filename="../SquiLu-ext/dynamic_library.cpp" />
+		<Unit filename="../SquiLu-ext/dynamic_library.h" />
+		<Unit filename="../SquiLu-ext/fpdf.cpp" />
+		<Unit filename="../SquiLu-ext/fpdf.h" />
+		<Unit filename="../SquiLu-ext/lua_socket.cpp" />
+		<Unit filename="../SquiLu-ext/lua_socket.h" />
+		<Unit filename="../SquiLu-ext/mongoose.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\SquiLu-ext\mongoose.h" />
-		<Unit filename="..\SquiLu-ext\pdf-font.cpp" />
-		<Unit filename="..\SquiLu-ext\pdf-font.h" />
-		<Unit filename="..\SquiLu-ext\sq_axtls.c">
+		<Unit filename="../SquiLu-ext/mongoose.h" />
+		<Unit filename="../SquiLu-ext/pdf-font.cpp" />
+		<Unit filename="../SquiLu-ext/pdf-font.h" />
+		<Unit filename="../SquiLu-ext/sq_axtls.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\SquiLu-ext\sq_base64.cpp" />
-		<Unit filename="..\SquiLu-ext\sq_decimal.cpp" />
-		<Unit filename="..\SquiLu-ext\sq_fltk.cpp" />
-		<Unit filename="..\SquiLu-ext\sq_fpdf.cpp" />
-		<Unit filename="..\SquiLu-ext\sq_fs.c">
+		<Unit filename="../SquiLu-ext/sq_base64.cpp" />
+		<Unit filename="../SquiLu-ext/sq_decimal.cpp" />
+		<Unit filename="../SquiLu-ext/sq_fltk.cpp" />
+		<Unit filename="../SquiLu-ext/sq_fpdf.cpp" />
+		<Unit filename="../SquiLu-ext/sq_fs.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\SquiLu-ext\sq_markdown.cpp" />
-		<Unit filename="..\SquiLu-ext\sq_mix.cpp" />
-		<Unit filename="..\SquiLu-ext\sq_mongoose.cpp" />
-		<Unit filename="..\SquiLu-ext\sq_postgresql.cpp" />
-		<Unit filename="..\SquiLu-ext\sq_rs232.c">
+		<Unit filename="../SquiLu-ext/sq_markdown.cpp" />
+		<Unit filename="../SquiLu-ext/sq_mix.cpp" />
+		<Unit filename="../SquiLu-ext/sq_mongoose.cpp" />
+		<Unit filename="../SquiLu-ext/sq_postgresql.cpp" />
+		<Unit filename="../SquiLu-ext/sq_rs232.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\SquiLu-ext\sq_slave_vm.cpp" />
-		<Unit filename="..\SquiLu-ext\sq_socket.cpp" />
-		<Unit filename="..\SquiLu-ext\sq_sqlite3.cpp" />
-		<Unit filename="..\SquiLu-ext\sq_tinyxml2.cpp" />
-		<Unit filename="..\SquiLu-ext\sq_zlib.cpp" />
-		<Unit filename="..\SquiLu-ext\sq_zmq3.cpp" />
-		<Unit filename="..\SquiLu-ext\sqfs.h" />
-		<Unit filename="..\SquiLu-ext\sqlite3.c">
+		<Unit filename="../SquiLu-ext/sq_slave_vm.cpp" />
+		<Unit filename="../SquiLu-ext/sq_socket.cpp" />
+		<Unit filename="../SquiLu-ext/sq_sqlite3.cpp" />
+		<Unit filename="../SquiLu-ext/sq_tinyxml2.cpp" />
+		<Unit filename="../SquiLu-ext/sq_zlib.cpp" />
+		<Unit filename="../SquiLu-ext/sq_zmq3.cpp" />
+		<Unit filename="../SquiLu-ext/sqfs.h" />
+		<Unit filename="../SquiLu-ext/sqlite3.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\SquiLu-ext\sqlite3.h" />
-		<Unit filename="..\SquiLu-ext\sqmodule.h" />
-		<Unit filename="..\SquiLu-ext\sqratimport.cpp" />
-		<Unit filename="..\SquiLu-ext\sqratimport.h" />
-		<Unit filename="..\SquiLu-ext\tinyxml2.cpp" />
-		<Unit filename="..\SquiLu-ext\tinyxml2.h" />
-		<Unit filename="..\SquiLu\sqstdlib\sqstdaux.cpp" />
-		<Unit filename="..\SquiLu\sqstdlib\sqstdblob.cpp" />
-		<Unit filename="..\SquiLu\sqstdlib\sqstdblobimpl.h" />
-		<Unit filename="..\SquiLu\sqstdlib\sqstdio.cpp" />
-		<Unit filename="..\SquiLu\sqstdlib\sqstdmath.cpp" />
-		<Unit filename="..\SquiLu\sqstdlib\sqstdrex.cpp" />
-		<Unit filename="..\SquiLu\sqstdlib\sqstdstream.cpp" />
-		<Unit filename="..\SquiLu\sqstdlib\sqstdstream.h" />
-		<Unit filename="..\SquiLu\sqstdlib\sqstdstring.cpp" />
-		<Unit filename="..\SquiLu\sqstdlib\sqstdsystem.cpp" />
-		<Unit filename="..\SquiLu\squirrel\lua-regex.c">
+		<Unit filename="../SquiLu-ext/sqlite3.h" />
+		<Unit filename="../SquiLu-ext/sqmodule.h" />
+		<Unit filename="../SquiLu-ext/sqratimport.cpp" />
+		<Unit filename="../SquiLu-ext/sqratimport.h" />
+		<Unit filename="../SquiLu-ext/tinyxml2.cpp" />
+		<Unit filename="../SquiLu-ext/tinyxml2.h" />
+		<Unit filename="../SquiLu/sqstdlib/sqstdaux.cpp" />
+		<Unit filename="../SquiLu/sqstdlib/sqstdblob.cpp" />
+		<Unit filename="../SquiLu/sqstdlib/sqstdblobimpl.h" />
+		<Unit filename="../SquiLu/sqstdlib/sqstdio.cpp" />
+		<Unit filename="../SquiLu/sqstdlib/sqstdmath.cpp" />
+		<Unit filename="../SquiLu/sqstdlib/sqstdrex.cpp" />
+		<Unit filename="../SquiLu/sqstdlib/sqstdstream.cpp" />
+		<Unit filename="../SquiLu/sqstdlib/sqstdstream.h" />
+		<Unit filename="../SquiLu/sqstdlib/sqstdstring.cpp" />
+		<Unit filename="../SquiLu/sqstdlib/sqstdsystem.cpp" />
+		<Unit filename="../SquiLu/squirrel/lua-regex.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\SquiLu\squirrel\lua-regex.h" />
-		<Unit filename="..\SquiLu\squirrel\sqapi.cpp" />
-		<Unit filename="..\SquiLu\squirrel\sqarray.h" />
-		<Unit filename="..\SquiLu\squirrel\sqbaselib.cpp" />
-		<Unit filename="..\SquiLu\squirrel\sqclass.cpp" />
-		<Unit filename="..\SquiLu\squirrel\sqclass.h" />
-		<Unit filename="..\SquiLu\squirrel\sqclosure.h" />
-		<Unit filename="..\SquiLu\squirrel\sqcompiler.cpp" />
-		<Unit filename="..\SquiLu\squirrel\sqcompiler.h" />
-		<Unit filename="..\SquiLu\squirrel\sqdebug.cpp" />
-		<Unit filename="..\SquiLu\squirrel\sqfuncproto.h" />
-		<Unit filename="..\SquiLu\squirrel\sqfuncstate.cpp" />
-		<Unit filename="..\SquiLu\squirrel\sqfuncstate.h" />
-		<Unit filename="..\SquiLu\squirrel\sqlexer.cpp" />
-		<Unit filename="..\SquiLu\squirrel\sqlexer.h" />
-		<Unit filename="..\SquiLu\squirrel\sqmem.cpp" />
-		<Unit filename="..\SquiLu\squirrel\sqobject.cpp" />
-		<Unit filename="..\SquiLu\squirrel\sqobject.h" />
-		<Unit filename="..\SquiLu\squirrel\sqopcodes.h" />
-		<Unit filename="..\SquiLu\squirrel\sqpcheader.h" />
-		<Unit filename="..\SquiLu\squirrel\sqstate.cpp" />
-		<Unit filename="..\SquiLu\squirrel\sqstate.h" />
-		<Unit filename="..\SquiLu\squirrel\sqstring.h" />
-		<Unit filename="..\SquiLu\squirrel\sqtable.cpp" />
-		<Unit filename="..\SquiLu\squirrel\sqtable.h" />
-		<Unit filename="..\SquiLu\squirrel\squserdata.h" />
-		<Unit filename="..\SquiLu\squirrel\squtils.h" />
-		<Unit filename="..\SquiLu\squirrel\sqvm.cpp" />
-		<Unit filename="..\SquiLu\squirrel\sqvm.h" />
-		<Unit filename="..\SquiLu\squirrel\sublatin.c">
+		<Unit filename="../SquiLu/squirrel/lua-regex.h" />
+		<Unit filename="../SquiLu/squirrel/sqapi.cpp" />
+		<Unit filename="../SquiLu/squirrel/sqarray.h" />
+		<Unit filename="../SquiLu/squirrel/sqbaselib.cpp" />
+		<Unit filename="../SquiLu/squirrel/sqclass.cpp" />
+		<Unit filename="../SquiLu/squirrel/sqclass.h" />
+		<Unit filename="../SquiLu/squirrel/sqclosure.h" />
+		<Unit filename="../SquiLu/squirrel/sqcompiler.cpp" />
+		<Unit filename="../SquiLu/squirrel/sqcompiler.h" />
+		<Unit filename="../SquiLu/squirrel/sqdebug.cpp" />
+		<Unit filename="../SquiLu/squirrel/sqfuncproto.h" />
+		<Unit filename="../SquiLu/squirrel/sqfuncstate.cpp" />
+		<Unit filename="../SquiLu/squirrel/sqfuncstate.h" />
+		<Unit filename="../SquiLu/squirrel/sqlexer.cpp" />
+		<Unit filename="../SquiLu/squirrel/sqlexer.h" />
+		<Unit filename="../SquiLu/squirrel/sqmem.cpp" />
+		<Unit filename="../SquiLu/squirrel/sqobject.cpp" />
+		<Unit filename="../SquiLu/squirrel/sqobject.h" />
+		<Unit filename="../SquiLu/squirrel/sqopcodes.h" />
+		<Unit filename="../SquiLu/squirrel/sqpcheader.h" />
+		<Unit filename="../SquiLu/squirrel/sqstate.cpp" />
+		<Unit filename="../SquiLu/squirrel/sqstate.h" />
+		<Unit filename="../SquiLu/squirrel/sqstring.h" />
+		<Unit filename="../SquiLu/squirrel/sqtable.cpp" />
+		<Unit filename="../SquiLu/squirrel/sqtable.h" />
+		<Unit filename="../SquiLu/squirrel/squserdata.h" />
+		<Unit filename="../SquiLu/squirrel/squtils.h" />
+		<Unit filename="../SquiLu/squirrel/sqvm.cpp" />
+		<Unit filename="../SquiLu/squirrel/sqvm.h" />
+		<Unit filename="../SquiLu/squirrel/sublatin.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\SquiLu\squirrel\sublatin.h" />
+		<Unit filename="../SquiLu/squirrel/sublatin.h" />
 		<Extensions>
 			<envvars />
 			<code_completion />

+ 3 - 1
SquiLu-editor/editor.cxx

@@ -33,7 +33,9 @@
 
 #ifdef _WIN32
 #include <direct.h>
-#include <io.h>
+#include <io.h>
+#else
+#define MAX_PATH 1024
 #endif
 
 #ifdef SQUNICODE

+ 157 - 155
SquiLu/squilu.cbp

@@ -7,17 +7,17 @@
 		<Option compiler="gcc" />
 		<Build>
 			<Target title="Debug">
-				<Option output="bin\squilu-dbg" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj\Debug\" />
+				<Option output="bin/squilu-dbg" prefix_auto="1" extension_auto="1" />
+				<Option object_output="obj/Debug/" />
 				<Option type="1" />
 				<Option compiler="gcc" />
 				<Option parameters="test-weakref.nut" />
 				<Compiler>
 					<Add option="-g" />
-					<Add directory="..\..\zeromq-3.2.2\include" />
+					<Add directory="../../zeromq-3.2.2/include" />
 				</Compiler>
 				<Linker>
-					<Add library="..\..\zeromq-3.2.2\libzmq3.a" />
+					<Add library="../../zeromq-3.2.2/libzmq3.a" />
 					<Add library="pthread" />
 					<Add library="rt" />
 					<Add library="dl" />
@@ -26,8 +26,8 @@
 				</Linker>
 			</Target>
 			<Target title="Release">
-				<Option output="bin\squilu" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj\Release\" />
+				<Option output="bin/squilu" prefix_auto="1" extension_auto="1" />
+				<Option object_output="obj/Release/" />
 				<Option type="1" />
 				<Option compiler="gcc" />
 				<Compiler>
@@ -35,23 +35,25 @@
 					<Add option="-Wall" />
 					<Add option="-fno-rtti" />
 					<Add option="-fno-strict-aliasing" />
-					<Add directory="..\..\zeromq-3.2.2\include" />
+					<Add directory="../../zeromq-3.2.2/include" />
 				</Compiler>
 				<Linker>
 					<Add option="-s" />
-					<Add library="..\..\zeromq-3.2.2\libzmq3.a" />
+					<Add library="../../zeromq-3.2.2/libzmq3.a" />
 					<Add library="pthread" />
 					<Add library="rt" />
 					<Add library="dl" />
 					<Add library="axtls" />
 					<Add library="mpdecimal" />
 					<Add library="discount" />
-					<Add directory="..\..\zeromq-3.2.2" />
+					<Add library="fltk_z" />
+					<Add directory="../../zeromq-3.2.2" />
+					<Add directory="../fltk/lib" />
 				</Linker>
 			</Target>
 			<Target title="Release clang">
-				<Option output="bin\squilu" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj\Release\" />
+				<Option output="bin/squilu" prefix_auto="1" extension_auto="1" />
+				<Option object_output="obj/Release/" />
 				<Option type="1" />
 				<Option compiler="clang_compiler" />
 				<Compiler>
@@ -68,8 +70,8 @@
 				</Linker>
 			</Target>
 			<Target title="Release win32">
-				<Option output="bin\squilu.exe" prefix_auto="1" extension_auto="0" />
-				<Option object_output="obj\Release-win32\" />
+				<Option output="bin/squilu.exe" prefix_auto="1" extension_auto="0" />
+				<Option object_output="obj/Release-win32/" />
 				<Option type="1" />
 				<Option compiler="gnu_gcc_compiler_static" />
 				<Compiler>
@@ -79,8 +81,8 @@
 					<Add option="-fno-strict-aliasing" />
 					<Add option="-DAS_STATIC_LIB=1" />
 					<Add option="-DINET_ATON=1" />
-					<Add directory="..\..\zeromq-3.2.2\include" />
-					<Add directory="..\..\..\..\Program Files\PostgreSQL\9.1\include" />
+					<Add directory="../../zeromq-3.2.2/include" />
+					<Add directory="../../../../Program Files/PostgreSQL/9.1/include" />
 				</Compiler>
 				<Linker>
 					<Add option="-s" />
@@ -92,13 +94,13 @@
 					<Add library="mpdecimal-win32" />
 					<Add library="discount-win32" />
 					<Add library="fltk_z" />
-					<Add directory="..\..\zeromq-3.2.2" />
-					<Add directory="..\fltk\lib" />
+					<Add directory="../../zeromq-3.2.2" />
+					<Add directory="../fltk/lib" />
 				</Linker>
 			</Target>
 			<Target title="Release FLTK">
-				<Option output="bin\squilu" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj\Release\" />
+				<Option output="bin/squilu" prefix_auto="1" extension_auto="1" />
+				<Option object_output="obj/Release/" />
 				<Option type="1" />
 				<Option compiler="gcc" />
 				<Compiler>
@@ -107,14 +109,14 @@
 					<Add option="-fno-rtti" />
 					<Add option="-fno-strict-aliasing" />
 					<Add option="-DWITH_FLTK=1" />
-					<Add directory="..\..\zeromq-3.2.2\include" />
-					<Add directory="..\fltk" />
-					<Add directory="..\libharu\include" />
-					<Add directory="..\flu" />
+					<Add directory="../../zeromq-3.2.2/include" />
+					<Add directory="../fltk" />
+					<Add directory="../libharu/include" />
+					<Add directory="../flu" />
 				</Compiler>
 				<Linker>
 					<Add option="-s" />
-					<Add library="..\..\zeromq-3.2.2\libzmq3.a" />
+					<Add library="../../zeromq-3.2.2/libzmq3.a" />
 					<Add library="pthread" />
 					<Add library="rt" />
 					<Add library="dl" />
@@ -131,16 +133,16 @@
 					<Add library="mpdecimal" />
 					<Add library="hpdfs" />
 					<Add library="discount" />
-					<Add directory="..\..\zeromq-3.2.2" />
-					<Add directory="..\fltk\lib" />
-					<Add directory="..\flu" />
-					<Add directory="..\libharu\src" />
+					<Add directory="../../zeromq-3.2.2" />
+					<Add directory="../fltk/lib" />
+					<Add directory="../flu" />
+					<Add directory="../libharu/src" />
 				</Linker>
 			</Target>
 			<Target title="Debug FLTK">
-				<Option output="bin\squilu-dbg" prefix_auto="1" extension_auto="1" />
+				<Option output="bin/squilu-dbg" prefix_auto="1" extension_auto="1" />
 				<Option working_dir="ourbiz" />
-				<Option object_output="obj\Debug\" />
+				<Option object_output="obj/Debug/" />
 				<Option type="1" />
 				<Option compiler="gcc" />
 				<Option parameters="ourbiz-fltk.nut" />
@@ -150,13 +152,13 @@
 					<Add option="-fno-rtti" />
 					<Add option="-fno-strict-aliasing" />
 					<Add option="-DWITH_FLTK=1" />
-					<Add directory="..\..\zeromq-3.2.2\include" />
-					<Add directory="..\fltk" />
-					<Add directory="..\flu" />
-					<Add directory="..\libharu\include" />
+					<Add directory="../../zeromq-3.2.2/include" />
+					<Add directory="../fltk" />
+					<Add directory="../flu" />
+					<Add directory="../libharu/include" />
 				</Compiler>
 				<Linker>
-					<Add library="..\..\zeromq-3.2.2\libzmq3.a" />
+					<Add library="../../zeromq-3.2.2/libzmq3.a" />
 					<Add library="pthread" />
 					<Add library="rt" />
 					<Add library="dl" />
@@ -173,15 +175,15 @@
 					<Add library="mpdecimal" />
 					<Add library="hpdfs" />
 					<Add library="discount" />
-					<Add directory="..\..\zeromq-3.2.2" />
-					<Add directory="..\fltk\lib" />
-					<Add directory="..\flu" />
-					<Add directory="..\libharu\src" />
+					<Add directory="../../zeromq-3.2.2" />
+					<Add directory="../fltk/lib" />
+					<Add directory="../flu" />
+					<Add directory="../libharu/src" />
 				</Linker>
 			</Target>
 			<Target title="Release FLTK win32">
-				<Option output="bin\squilu-fltk.exe" prefix_auto="1" extension_auto="0" />
-				<Option object_output="obj\Release-win32\" />
+				<Option output="bin/squilu-fltk.exe" prefix_auto="1" extension_auto="0" />
+				<Option object_output="obj/Release-win32/" />
 				<Option type="1" />
 				<Option compiler="gnu_gcc_compiler_static" />
 				<Compiler>
@@ -192,11 +194,11 @@
 					<Add option="-DAS_STATIC_LIB=1" />
 					<Add option="-DINET_ATON=1" />
 					<Add option="-DWITH_FLTK=1" />
-					<Add directory="..\..\zeromq-3.2.2\include" />
-					<Add directory="..\..\..\..\Program Files\PostgreSQL\9.1\include" />
-					<Add directory="..\fltk" />
-					<Add directory="..\libharu\include" />
-					<Add directory="..\flu" />
+					<Add directory="../../zeromq-3.2.2/include" />
+					<Add directory="../../../../Program Files/PostgreSQL/9.1/include" />
+					<Add directory="../fltk" />
+					<Add directory="../libharu/include" />
+					<Add directory="../flu" />
 				</Compiler>
 				<Linker>
 					<Add option="-s" />
@@ -221,15 +223,15 @@
 					<Add library="winspool" />
 					<Add library="rpcrt4" />
 					<Add library="comdlg32" />
-					<Add directory="..\..\zeromq-3.2.2" />
-					<Add directory="..\fltk\lib" />
-					<Add directory="..\flu" />
-					<Add directory="..\libharu\src" />
+					<Add directory="../../zeromq-3.2.2" />
+					<Add directory="../fltk/lib" />
+					<Add directory="../flu" />
+					<Add directory="../libharu/src" />
 				</Linker>
 			</Target>
 			<Target title="Release FLTK win32 no console">
-				<Option output="bin\squilu-fltk-w.exe" prefix_auto="1" extension_auto="0" />
-				<Option object_output="obj\Release-win32\" />
+				<Option output="bin/squilu-fltk-w.exe" prefix_auto="1" extension_auto="0" />
+				<Option object_output="obj/Release-win32/" />
 				<Option type="0" />
 				<Option compiler="gnu_gcc_compiler_static" />
 				<Compiler>
@@ -240,11 +242,11 @@
 					<Add option="-DAS_STATIC_LIB=1" />
 					<Add option="-DINET_ATON=1" />
 					<Add option="-DWITH_FLTK=1" />
-					<Add directory="..\..\zeromq-3.2.2\include" />
-					<Add directory="..\..\..\..\Program Files\PostgreSQL\9.1\include" />
-					<Add directory="..\fltk" />
-					<Add directory="..\libharu\include" />
-					<Add directory="..\flu" />
+					<Add directory="../../zeromq-3.2.2/include" />
+					<Add directory="../../../../Program Files/PostgreSQL/9.1/include" />
+					<Add directory="../fltk" />
+					<Add directory="../libharu/include" />
+					<Add directory="../flu" />
 				</Compiler>
 				<Linker>
 					<Add option="-s" />
@@ -269,10 +271,10 @@
 					<Add library="winspool" />
 					<Add library="rpcrt4" />
 					<Add library="comdlg32" />
-					<Add directory="..\..\zeromq-3.2.2" />
-					<Add directory="..\fltk\lib" />
-					<Add directory="..\flu" />
-					<Add directory="..\libharu\src" />
+					<Add directory="../../zeromq-3.2.2" />
+					<Add directory="../fltk/lib" />
+					<Add directory="../flu" />
+					<Add directory="../libharu/src" />
 				</Linker>
 			</Target>
 		</Build>
@@ -314,128 +316,128 @@
 			<Add option="-DRS232_STATIC=1" />
 			<Add directory="include" />
 			<Add directory="sqstdlib" />
-			<Add directory="..\myaxtls" />
-			<Add directory="..\discount" />
-			<Add directory="\usr\include\postgresql" />
-			<Add directory="\usr\lib\jvm\default-java\include" />
-			<Add directory="\usr\lib\llvm-3.1\include" />
-			<Add directory="..\SquiLu-ext\threadObject" />
+			<Add directory="../myaxtls" />
+			<Add directory="../discount" />
+			<Add directory="/usr/include/postgresql" />
+			<Add directory="/usr/lib/jvm/default-java/include" />
+			<Add directory="/usr/lib/llvm-3.1/include" />
+			<Add directory="../SquiLu-ext/threadObject" />
 			<Add directory=".." />
 		</Compiler>
 		<Linker>
 			<Add library="m" />
 			<Add directory="lib" />
-			<Add directory="..\myaxtls" />
-			<Add directory="..\mpdecimal" />
-			<Add directory="..\discount" />
+			<Add directory="../myaxtls" />
+			<Add directory="../mpdecimal" />
+			<Add directory="../discount" />
 		</Linker>
-		<Unit filename="..\SquiLu-ext\dynamic_library.cpp" />
-		<Unit filename="..\SquiLu-ext\dynamic_library.h" />
-		<Unit filename="..\SquiLu-ext\fpdf.cpp" />
-		<Unit filename="..\SquiLu-ext\fpdf.h" />
-		<Unit filename="..\SquiLu-ext\lua_socket.cpp" />
-		<Unit filename="..\SquiLu-ext\lua_socket.h" />
-		<Unit filename="..\SquiLu-ext\mongoose.c">
+		<Unit filename="../SquiLu-ext/dynamic_library.cpp" />
+		<Unit filename="../SquiLu-ext/dynamic_library.h" />
+		<Unit filename="../SquiLu-ext/fpdf.cpp" />
+		<Unit filename="../SquiLu-ext/fpdf.h" />
+		<Unit filename="../SquiLu-ext/lua_socket.cpp" />
+		<Unit filename="../SquiLu-ext/lua_socket.h" />
+		<Unit filename="../SquiLu-ext/mongoose.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\SquiLu-ext\mongoose.h" />
-		<Unit filename="..\SquiLu-ext\pdf-font.cpp" />
-		<Unit filename="..\SquiLu-ext\pdf-font.h" />
-		<Unit filename="..\SquiLu-ext\sq_axtls.c">
+		<Unit filename="../SquiLu-ext/mongoose.h" />
+		<Unit filename="../SquiLu-ext/pdf-font.cpp" />
+		<Unit filename="../SquiLu-ext/pdf-font.h" />
+		<Unit filename="../SquiLu-ext/sq_axtls.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\SquiLu-ext\sq_base64.cpp" />
-		<Unit filename="..\SquiLu-ext\sq_decimal.cpp" />
-		<Unit filename="..\SquiLu-ext\sq_fltk.cpp" />
-		<Unit filename="..\SquiLu-ext\sq_fpdf.cpp" />
-		<Unit filename="..\SquiLu-ext\sq_fs.c">
+		<Unit filename="../SquiLu-ext/sq_base64.cpp" />
+		<Unit filename="../SquiLu-ext/sq_decimal.cpp" />
+		<Unit filename="../SquiLu-ext/sq_fltk.cpp" />
+		<Unit filename="../SquiLu-ext/sq_fpdf.cpp" />
+		<Unit filename="../SquiLu-ext/sq_fs.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\SquiLu-ext\sq_markdown.cpp" />
-		<Unit filename="..\SquiLu-ext\sq_mix.cpp" />
-		<Unit filename="..\SquiLu-ext\sq_mongoose.cpp" />
-		<Unit filename="..\SquiLu-ext\sq_parsecsv.cpp" />
-		<Unit filename="..\SquiLu-ext\sq_postgresql.cpp" />
-		<Unit filename="..\SquiLu-ext\sq_rs232.c">
+		<Unit filename="../SquiLu-ext/sq_markdown.cpp" />
+		<Unit filename="../SquiLu-ext/sq_mix.cpp" />
+		<Unit filename="../SquiLu-ext/sq_mongoose.cpp" />
+		<Unit filename="../SquiLu-ext/sq_parsecsv.cpp" />
+		<Unit filename="../SquiLu-ext/sq_postgresql.cpp" />
+		<Unit filename="../SquiLu-ext/sq_rs232.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\SquiLu-ext\sq_slave_vm.cpp" />
-		<Unit filename="..\SquiLu-ext\sq_socket.cpp" />
-		<Unit filename="..\SquiLu-ext\sq_sqlite3.cpp" />
-		<Unit filename="..\SquiLu-ext\sq_tinyxml2.cpp" />
-		<Unit filename="..\SquiLu-ext\sq_zlib.cpp" />
-		<Unit filename="..\SquiLu-ext\sq_zmq3.cpp" />
-		<Unit filename="..\SquiLu-ext\sqlite3.c">
+		<Unit filename="../SquiLu-ext/sq_slave_vm.cpp" />
+		<Unit filename="../SquiLu-ext/sq_socket.cpp" />
+		<Unit filename="../SquiLu-ext/sq_sqlite3.cpp" />
+		<Unit filename="../SquiLu-ext/sq_tinyxml2.cpp" />
+		<Unit filename="../SquiLu-ext/sq_zlib.cpp" />
+		<Unit filename="../SquiLu-ext/sq_zmq3.cpp" />
+		<Unit filename="../SquiLu-ext/sqlite3.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\SquiLu-ext\sqlite3.h" />
-		<Unit filename="..\SquiLu-ext\sqmodule.h" />
-		<Unit filename="..\SquiLu-ext\sqratimport.cpp" />
-		<Unit filename="..\SquiLu-ext\sqratimport.h" />
-		<Unit filename="..\SquiLu-ext\tinyxml2.cpp" />
-		<Unit filename="..\SquiLu-ext\tinyxml2.h" />
+		<Unit filename="../SquiLu-ext/sqlite3.h" />
+		<Unit filename="../SquiLu-ext/sqmodule.h" />
+		<Unit filename="../SquiLu-ext/sqratimport.cpp" />
+		<Unit filename="../SquiLu-ext/sqratimport.h" />
+		<Unit filename="../SquiLu-ext/tinyxml2.cpp" />
+		<Unit filename="../SquiLu-ext/tinyxml2.h" />
 		<Unit filename="dadbiz.rc">
 			<Option compilerVar="WINDRES" />
 			<Option target="Release win32" />
 			<Option target="Release FLTK win32" />
 			<Option target="Release FLTK win32 no console" />
 		</Unit>
-		<Unit filename="include\sqstdaux.h" />
-		<Unit filename="include\sqstdblob.h" />
-		<Unit filename="include\sqstdio.h" />
-		<Unit filename="include\sqstdmath.h" />
-		<Unit filename="include\sqstdstring.h" />
-		<Unit filename="include\sqstdsystem.h" />
-		<Unit filename="include\squirrel.h" />
-		<Unit filename="sq\sq.c">
+		<Unit filename="include/sqstdaux.h" />
+		<Unit filename="include/sqstdblob.h" />
+		<Unit filename="include/sqstdio.h" />
+		<Unit filename="include/sqstdmath.h" />
+		<Unit filename="include/sqstdstring.h" />
+		<Unit filename="include/sqstdsystem.h" />
+		<Unit filename="include/squirrel.h" />
+		<Unit filename="sq/sq.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="sqstdlib\sqstdaux.cpp" />
-		<Unit filename="sqstdlib\sqstdblob.cpp" />
-		<Unit filename="sqstdlib\sqstdblobimpl.h" />
-		<Unit filename="sqstdlib\sqstdio.cpp" />
-		<Unit filename="sqstdlib\sqstdmath.cpp" />
-		<Unit filename="sqstdlib\sqstdrex.cpp" />
-		<Unit filename="sqstdlib\sqstdstream.cpp" />
-		<Unit filename="sqstdlib\sqstdstream.h" />
-		<Unit filename="sqstdlib\sqstdstring.cpp" />
-		<Unit filename="sqstdlib\sqstdsystem.cpp" />
-		<Unit filename="squirrel\lua-regex.c">
+		<Unit filename="sqstdlib/sqstdaux.cpp" />
+		<Unit filename="sqstdlib/sqstdblob.cpp" />
+		<Unit filename="sqstdlib/sqstdblobimpl.h" />
+		<Unit filename="sqstdlib/sqstdio.cpp" />
+		<Unit filename="sqstdlib/sqstdmath.cpp" />
+		<Unit filename="sqstdlib/sqstdrex.cpp" />
+		<Unit filename="sqstdlib/sqstdstream.cpp" />
+		<Unit filename="sqstdlib/sqstdstream.h" />
+		<Unit filename="sqstdlib/sqstdstring.cpp" />
+		<Unit filename="sqstdlib/sqstdsystem.cpp" />
+		<Unit filename="squirrel/lua-regex.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="squirrel\lua-regex.h" />
-		<Unit filename="squirrel\sqapi.cpp" />
-		<Unit filename="squirrel\sqarray.h" />
-		<Unit filename="squirrel\sqbaselib.cpp" />
-		<Unit filename="squirrel\sqclass.cpp" />
-		<Unit filename="squirrel\sqclass.h" />
-		<Unit filename="squirrel\sqclosure.h" />
-		<Unit filename="squirrel\sqcompiler.cpp" />
-		<Unit filename="squirrel\sqcompiler.h" />
-		<Unit filename="squirrel\sqdebug.cpp" />
-		<Unit filename="squirrel\sqfuncproto.h" />
-		<Unit filename="squirrel\sqfuncstate.cpp" />
-		<Unit filename="squirrel\sqfuncstate.h" />
-		<Unit filename="squirrel\sqlexer.cpp" />
-		<Unit filename="squirrel\sqlexer.h" />
-		<Unit filename="squirrel\sqmem.cpp" />
-		<Unit filename="squirrel\sqobject.cpp" />
-		<Unit filename="squirrel\sqobject.h" />
-		<Unit filename="squirrel\sqopcodes.h" />
-		<Unit filename="squirrel\sqpcheader.h" />
-		<Unit filename="squirrel\sqstate.cpp" />
-		<Unit filename="squirrel\sqstate.h" />
-		<Unit filename="squirrel\sqstring.h" />
-		<Unit filename="squirrel\sqtable.cpp" />
-		<Unit filename="squirrel\sqtable.h" />
-		<Unit filename="squirrel\squserdata.h" />
-		<Unit filename="squirrel\squtils.h" />
-		<Unit filename="squirrel\sqvm.cpp" />
-		<Unit filename="squirrel\sqvm.h" />
-		<Unit filename="squirrel\sublatin.c">
+		<Unit filename="squirrel/lua-regex.h" />
+		<Unit filename="squirrel/sqapi.cpp" />
+		<Unit filename="squirrel/sqarray.h" />
+		<Unit filename="squirrel/sqbaselib.cpp" />
+		<Unit filename="squirrel/sqclass.cpp" />
+		<Unit filename="squirrel/sqclass.h" />
+		<Unit filename="squirrel/sqclosure.h" />
+		<Unit filename="squirrel/sqcompiler.cpp" />
+		<Unit filename="squirrel/sqcompiler.h" />
+		<Unit filename="squirrel/sqdebug.cpp" />
+		<Unit filename="squirrel/sqfuncproto.h" />
+		<Unit filename="squirrel/sqfuncstate.cpp" />
+		<Unit filename="squirrel/sqfuncstate.h" />
+		<Unit filename="squirrel/sqlexer.cpp" />
+		<Unit filename="squirrel/sqlexer.h" />
+		<Unit filename="squirrel/sqmem.cpp" />
+		<Unit filename="squirrel/sqobject.cpp" />
+		<Unit filename="squirrel/sqobject.h" />
+		<Unit filename="squirrel/sqopcodes.h" />
+		<Unit filename="squirrel/sqpcheader.h" />
+		<Unit filename="squirrel/sqstate.cpp" />
+		<Unit filename="squirrel/sqstate.h" />
+		<Unit filename="squirrel/sqstring.h" />
+		<Unit filename="squirrel/sqtable.cpp" />
+		<Unit filename="squirrel/sqtable.h" />
+		<Unit filename="squirrel/squserdata.h" />
+		<Unit filename="squirrel/squtils.h" />
+		<Unit filename="squirrel/sqvm.cpp" />
+		<Unit filename="squirrel/sqvm.h" />
+		<Unit filename="squirrel/sublatin.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="squirrel\sublatin.h" />
+		<Unit filename="squirrel/sublatin.h" />
 		<Extensions>
 			<code_completion />
 			<debugger />

+ 16 - 19
fltk/fluid/fluid.cbp

@@ -7,8 +7,8 @@
 		<Option compiler="gcc" />
 		<Build>
 			<Target title="Debug">
-				<Option output="bin\Debug\fluid" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj\Debug\" />
+				<Option output="bin/Debug/fluid" prefix_auto="1" extension_auto="1" />
+				<Option object_output="obj/Debug/" />
 				<Option type="1" />
 				<Option compiler="gcc" />
 				<Compiler>
@@ -27,8 +27,8 @@
 				</Linker>
 			</Target>
 			<Target title="Release">
-				<Option output="bin\Release\fluid" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj\Release\" />
+				<Option output="bin/Release/fluid" prefix_auto="1" extension_auto="1" />
+				<Option object_output="obj/Release/" />
 				<Option type="0" />
 				<Option compiler="gcc" />
 				<Compiler>
@@ -36,7 +36,6 @@
 				</Compiler>
 				<Linker>
 					<Add option="-s" />
-					<Add library="lua" />
 					<Add library="sqlite3" />
 					<Add library="pthread" />
 					<Add library="dl" />
@@ -44,12 +43,11 @@
 					<Add library="Xft" />
 					<Add library="Xext" />
 					<Add library="Xinerama" />
-					<Add library="squilu" />
 				</Linker>
 			</Target>
 			<Target title="Release win32">
-				<Option output="bin\Release\fluid" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj\Release\" />
+				<Option output="bin/Release/fluid" prefix_auto="1" extension_auto="1" />
+				<Option object_output="obj/Release/" />
 				<Option type="0" />
 				<Option compiler="gcc" />
 				<Compiler>
@@ -71,11 +69,11 @@
 			<Add option="-DUSE_SQUILU00=1" />
 			<Add option="-DUSE_STD_STRING2" />
 			<Add option="-DFL_INTERNALS=1" />
-			<Add directory="..\..\fltk" />
-			<Add directory="..\..\lua-5.1.4\src" />
-			<Add directory="..\..\lua-5.1.4\src\ext" />
-			<Add directory="..\..\..\..\SquiLu\include" />
-			<Add directory="..\png" />
+			<Add directory="../../fltk" />
+			<Add directory="../../lua-5.1.4/src" />
+			<Add directory="../../lua-5.1.4/src/ext" />
+			<Add directory="../../../../SquiLu/include" />
+			<Add directory="../png" />
 		</Compiler>
 		<Linker>
 			<Add library="fltk" />
@@ -84,10 +82,10 @@
 			<Add library="fltk_jpeg" />
 			<Add library="fltk_png" />
 			<Add library="fltk_z" />
-			<Add directory="..\lib" />
-			<Add directory="..\..\lua-5.1.4" />
-			<Add directory="..\..\sqlite3-android\.libs" />
-			<Add directory="..\..\..\..\SquiLu\lib" />
+			<Add directory="../lib" />
+			<Add directory="../../lua-5.1.4" />
+			<Add directory="../../sqlite3-android/.libs" />
+			<Add directory="../../../../SquiLu/lib" />
 		</Linker>
 		<Unit filename="CodeEditor.cxx" />
 		<Unit filename="CodeEditor.h" />
@@ -118,8 +116,7 @@
 			<Option compile="1" />
 		</Unit>
 		<Unit filename="luacpp.cxx">
-			<Option target="Debug" />
-			<Option target="Release" />
+			<Option target="&lt;{~None~}&gt;" />
 		</Unit>
 		<Unit filename="luacpp.h">
 			<Option target="Debug" />