Browse Source

Added axtls and zmq3 to squilu.

mingodad 13 years ago
parent
commit
75799d59d7
2 changed files with 11 additions and 3 deletions
  1. 4 2
      sq/sq.c
  2. 7 1
      squilu.cbp

+ 4 - 2
sq/sq.c

@@ -311,7 +311,8 @@ SQRESULT sqext_register_sq_socket(HSQUIRRELVM v);
 SQRESULT sqext_register_sq_zlib(HSQUIRRELVM v);
 SQRESULT sqext_register_mongoose(HSQUIRRELVM v);
 SQRESULT sqrat_register_importlib(HSQUIRRELVM v);
-SQRESULT sqext_register_sq_slave_vm(HSQUIRRELVM v);
+SQRESULT sqext_register_sq_slave_vm(HSQUIRRELVM v);
+SQRESULT sqext_register_axtls (HSQUIRRELVM v);
 
 int main(int argc, char* argv[])
 {
@@ -341,12 +342,13 @@ int main(int argc, char* argv[])
 	sqext_register_mix(v);
 	sqext_register_sqfs(v);
 	sqext_register_sq_socket(v);
+	sqext_register_axtls(v);
 	sqext_register_sq_zlib(v);
 	sqext_register_mongoose(v);
 	sqrat_register_importlib(v);
 	sqext_register_sq_slave_vm(v);
 
-	//sqext_register_sq_zmq3(v);
+	sqext_register_sq_zmq3(v);
 	//sqstd_register_memory_buffer(v);
 #ifdef WITH_FLTK
 	sqext_register_fltklib(v);

+ 7 - 1
squilu.cbp

@@ -32,9 +32,11 @@
 					<Add option="-Wall" />
 					<Add option="-fno-rtti" />
 					<Add option="-fno-strict-aliasing" />
+					<Add directory="../zeromq-3.2.2/include" />
 				</Compiler>
 				<Linker>
 					<Add option="-s" />
+					<Add library="../zeromq-3.2.2/libzmq3.a" />
 					<Add library="pthread" />
 					<Add library="rt" />
 					<Add library="dl" />
@@ -68,13 +70,16 @@
 					<Add option="-Wall" />
 					<Add option="-fno-rtti" />
 					<Add option="-fno-strict-aliasing" />
+					<Add option="-DAS_STATIC_LIB=1" />
+					<Add directory="../../../../media/DATA/dadbiz++/zeromq-3.2.2/include" />
 				</Compiler>
 				<Linker>
 					<Add option="-s" />
 					<Add option="-static-libstdc++" />
 					<Add option="-static-libgcc" />
-					<Add library="ws2_32" />
+					<Add library="../../../../media/DATA/dadbiz++/zeromq-3.2.2/libzeromq-win32.a" />
 					<Add library="axtls-win32" />
+					<Add library="ws2_32" />
 				</Linker>
 			</Target>
 		</Build>
@@ -145,6 +150,7 @@
 		<Unit filename="ext/sq_socket.cpp" />
 		<Unit filename="ext/sq_sqlite3.cpp" />
 		<Unit filename="ext/sq_zlib.cpp" />
+		<Unit filename="ext/sq_zmq3.cpp" />
 		<Unit filename="ext/sqmodule.h" />
 		<Unit filename="ext/sqratimport.cpp" />
 		<Unit filename="ext/sqratimport.h" />