Prechádzať zdrojové kódy

Adapted to use the new repository structure.

mingodad 13 rokov pred
rodič
commit
12ac9d5109
2 zmenil súbory, kde vykonal 21 pridanie a 19 odobranie
  1. 15 13
      SquiLu-editor/editor.cbp
  2. 6 6
      SquiLu/squilu.cbp

+ 15 - 13
SquiLu-editor/editor.cbp

@@ -63,16 +63,15 @@
 			<Add option="-DSSL_STATIC_LIBRARY=1" />
 			<Add option="-DPDF_USING_ZLIB=1" />
 			<Add option="-DRS232_STATIC=1" />
-			<Add directory="../../dadbiz++/third-party/fltk" />
+			<Add directory="../fltk" />
 			<Add directory="../SquiLu/include" />
 			<Add directory="../myaxtls" />
 			<Add directory="../SquiLu/sqstdlib" />
 			<Add directory="../SquiLu-ext" />
-			<Add directory="../../dadbiz++/third-party/sqlite3" />
 			<Add directory="../../zeromq-3.2.2/include" />
-			<Add directory="../../dadbiz++/third-party/flu" />
-			<Add directory="../../dadbiz++/third-party/libharu/include" />
-			<Add directory="../../dadbiz++/third-party/discount-2.1.2" />
+			<Add directory="../flu" />
+			<Add directory="../libharu/include" />
+			<Add directory="../discount" />
 			<Add directory="/usr/include/postgresql" />
 			<Add directory="../SquiLu-editor" />
 			<Add directory=".." />
@@ -96,15 +95,18 @@
 			<Add library="rt" />
 			<Add library="hpdfs" />
 			<Add library="discount" />
-			<Add directory="../../dadbiz++/third-party/fltk/lib" />
+			<Add directory="../fltk/lib" />
 			<Add directory="../mpdecimal" />
 			<Add directory="../myaxtls" />
 			<Add directory="../../zeromq-3.2.2" />
-			<Add directory="../../dadbiz++/third-party/flu" />
-			<Add directory="../../dadbiz++/third-party/libharu/src" />
-			<Add directory="../../dadbiz++/third-party/discount-2.1.2" />
+			<Add directory="../flu" />
+			<Add directory="../libharu/src" />
+			<Add directory="../discount" />
 		</Linker>
 		<Unit filename="editor.cxx" />
+		<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" />
@@ -141,6 +143,10 @@
 		<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" />
@@ -192,10 +198,6 @@
 			<Option compilerVar="CC" />
 		</Unit>
 		<Unit filename="../SquiLu/squirrel/sublatin.h" />
-		<Unit filename="../../dadbiz++/third-party/sqlite3/sqlite3.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../dadbiz++/third-party/sqlite3/sqlite3.h" />
 		<Extensions>
 			<envvars />
 			<code_completion />

+ 6 - 6
SquiLu/squilu.cbp

@@ -104,9 +104,9 @@
 					<Add option="-fno-strict-aliasing" />
 					<Add option="-DWITH_FLTK=1" />
 					<Add directory="../../zeromq-3.2.2/include" />
-					<Add directory="../../dadbiz++/third-party/fltk" />
-					<Add directory="../../dadbiz++/third-party/flu" />
-					<Add directory="../../dadbiz++/third-party/libharu/include" />
+					<Add directory="../fltk" />
+					<Add directory="../third-party/flu" />
+					<Add directory="../libharu/include" />
 				</Compiler>
 				<Linker>
 					<Add option="-s" />
@@ -128,9 +128,9 @@
 					<Add library="hpdfs" />
 					<Add library="discount" />
 					<Add directory="../../zeromq-3.2.2" />
-					<Add directory="../../dadbiz++/third-party/fltk/lib" />
-					<Add directory="../../dadbiz++/third-party/flu" />
-					<Add directory="../../dadbiz++/third-party/libharu/src" />
+					<Add directory="../fltk/lib" />
+					<Add directory="../flu" />
+					<Add directory="../libharu/src" />
 				</Linker>
 			</Target>
 			<Target title="Debug FLTK">