Sfoglia il codice sorgente

Change the working directory before execute/debug.

mingo 13 anni fa
parent
commit
75ba7fdc1f
2 ha cambiato i file con 197 aggiunte e 113 eliminazioni
  1. 164 108
      SquiLu-editor/editor.cbp
  2. 33 5
      SquiLu-editor/editor.cxx

+ 164 - 108
SquiLu-editor/editor.cbp

@@ -7,13 +7,26 @@
 		<Option compiler="gcc" />
 		<Option compiler="gcc" />
 		<Build>
 		<Build>
 			<Target title="Debug">
 			<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 type="1" />
 				<Option compiler="gcc" />
 				<Option compiler="gcc" />
 				<Compiler>
 				<Compiler>
 					<Add option="-g" />
 					<Add option="-g" />
+					<Add directory="\usr\include\postgresql" />
 				</Compiler>
 				</Compiler>
+				<Linker>
+					<Add library="X11" />
+					<Add library="Xinerama" />
+					<Add library="Xft" />
+					<Add library="Xext" />
+					<Add library="pthread" />
+					<Add library="rt" />
+					<Add library="axtls" />
+					<Add library="mpdecimal" />
+					<Add library="zmq3" />
+					<Add library="discount" />
+				</Linker>
 			</Target>
 			</Target>
 			<Target title="Release">
 			<Target title="Release">
 				<Option output="editor" prefix_auto="1" extension_auto="1" />
 				<Option output="editor" prefix_auto="1" extension_auto="1" />
@@ -22,9 +35,59 @@
 				<Option compiler="gcc" />
 				<Option compiler="gcc" />
 				<Compiler>
 				<Compiler>
 					<Add option="-O2" />
 					<Add option="-O2" />
+					<Add directory="\usr\include\postgresql" />
+				</Compiler>
+				<Linker>
+					<Add option="-s" />
+					<Add library="X11" />
+					<Add library="Xinerama" />
+					<Add library="Xft" />
+					<Add library="Xext" />
+					<Add library="pthread" />
+					<Add library="rt" />
+					<Add library="axtls" />
+					<Add library="mpdecimal" />
+					<Add library="zmq3" />
+					<Add library="discount" />
+				</Linker>
+			</Target>
+			<Target title="Release win32">
+				<Option output="editor" prefix_auto="1" extension_auto="1" />
+				<Option object_output="objs" />
+				<Option type="1" />
+				<Option compiler="gcc" />
+				<Compiler>
+					<Add option="-O2" />
+					<Add option="-fno-rtti" />
+					<Add option="-fno-strict-aliasing" />
+					<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" />
 				</Compiler>
 				</Compiler>
 				<Linker>
 				<Linker>
 					<Add option="-s" />
 					<Add option="-s" />
+					<Add library="axtls-win32" />
+					<Add library="mpdecimal-win32" />
+					<Add library="zeromq-win32" />
+					<Add library="discount-win32" />
+					<Add library="gdi32" />
+					<Add library="uuid" />
+					<Add library="ole32" />
+					<Add library="winspool" />
+					<Add library="comdlg32" />
+					<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" />
 				</Linker>
 				</Linker>
 			</Target>
 			</Target>
 		</Build>
 		</Build>
@@ -63,17 +126,16 @@
 			<Add option="-DSSL_STATIC_LIBRARY=1" />
 			<Add option="-DSSL_STATIC_LIBRARY=1" />
 			<Add option="-DPDF_USING_ZLIB=1" />
 			<Add option="-DPDF_USING_ZLIB=1" />
 			<Add option="-DRS232_STATIC=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="/usr/include/postgresql" />
-			<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=".." />
 			<Add directory=".." />
 		</Compiler>
 		</Compiler>
 		<Linker>
 		<Linker>
@@ -83,121 +145,115 @@
 			<Add library="fltkutils" />
 			<Add library="fltkutils" />
 			<Add library="fltk_z" />
 			<Add library="fltk_z" />
 			<Add library="fltk" />
 			<Add library="fltk" />
-			<Add library="X11" />
-			<Add library="Xinerama" />
-			<Add library="Xft" />
-			<Add library="Xext" />
-			<Add library="axtls" />
-			<Add library="mpdecimal" />
 			<Add library="m" />
 			<Add library="m" />
-			<Add library="pthread" />
-			<Add library="zmq3" />
-			<Add library="rt" />
 			<Add library="hpdfs" />
 			<Add library="hpdfs" />
-			<Add library="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" />
+			<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>
 		</Linker>
+		<Unit filename="dadbiz.rc">
+			<Option compilerVar="WINDRES" />
+			<Option target="Release win32" />
+		</Unit>
 		<Unit filename="editor.cxx" />
 		<Unit filename="editor.cxx" />
-		<Unit filename="../SquiLu-ext/code_mix_prep.c">
+		<Unit filename="..\SquiLu-ext\code_mix_prep.c">
 			<Option compilerVar="CC" />
 			<Option compilerVar="CC" />
 		</Unit>
 		</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" />
 			<Option compilerVar="CC" />
 		</Unit>
 		</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" />
 			<Option compilerVar="CC" />
 		</Unit>
 		</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" />
 			<Option compilerVar="CC" />
 		</Unit>
 		</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" />
 			<Option compilerVar="CC" />
 		</Unit>
 		</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" />
 			<Option compilerVar="CC" />
 		</Unit>
 		</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" />
 			<Option compilerVar="CC" />
 		</Unit>
 		</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" />
 			<Option compilerVar="CC" />
 		</Unit>
 		</Unit>
-		<Unit filename="../SquiLu/squirrel/sublatin.h" />
+		<Unit filename="..\SquiLu\squirrel\sublatin.h" />
 		<Extensions>
 		<Extensions>
 			<envvars />
 			<envvars />
 			<code_completion />
 			<code_completion />

+ 33 - 5
SquiLu-editor/editor.cxx

@@ -30,6 +30,11 @@
 #include <sqstdmath.h>
 #include <sqstdmath.h>
 #include <sqstdstring.h>
 #include <sqstdstring.h>
 #include <sqstdaux.h>
 #include <sqstdaux.h>
+
+#ifdef _WIN32
+#include <direct.h>
+#include <io.h>
+#endif
 
 
 #ifdef SQUNICODE
 #ifdef SQUNICODE
 #define scfprintf fwprintf
 #define scfprintf fwprintf
@@ -752,13 +757,28 @@ void saveas_cb() {
   fnfc.type(Fl_Native_File_Chooser::BROWSE_SAVE_FILE);
   fnfc.type(Fl_Native_File_Chooser::BROWSE_SAVE_FILE);
   if ( fnfc.show() ) return;
   if ( fnfc.show() ) return;
   save_file(fnfc.filename());
   save_file(fnfc.filename());
+}
+
+void chdir_to(){
+  if (filename[0]) {
+    char buf[MAX_PATH];
+    int len = snprintf(buf, sizeof(buf), "%s", filename);
+    for(int i=len; i >=0; --i){
+        if(buf[i] == '/' || buf[i] == '\\'){
+            buf[i] = '\0';
+            break;
+        }
+    }
+    chdir(buf);
+  }
 }
 }
 
 
 void run_cb() {
 void run_cb() {
-  if (filename[0]) {
+  if (filename[0]) {
+      chdir_to();
       sq_setnativedebughook(v, NULL);
       sq_setnativedebughook(v, NULL);
       sq_enabledebuginfo(v, 0);
       sq_enabledebuginfo(v, 0);
-      sqstd_dofile(v, filename, SQFalse, SQTrue);
+      sqstd_dofile(v, filename, SQFalse, SQTrue, SQTrue);
   }
   }
 }
 }
 
 
@@ -770,6 +790,7 @@ void debug_cb(Fl_Widget*, void* ew) {
       return;
       return;
   }
   }
   if (filename[0]) {
   if (filename[0]) {
+      chdir_to();
       _debug_wait = true;
       _debug_wait = true;
       _stop_debug = false;
       _stop_debug = false;
       _debug_pos = 0;
       _debug_pos = 0;
@@ -780,7 +801,7 @@ void debug_cb(Fl_Widget*, void* ew) {
       sq_poptop(v);
       sq_poptop(v);
       sq_setnativedebughook(v, sq_debug_hook);
       sq_setnativedebughook(v, sq_debug_hook);
       sq_enabledebuginfo(v, 1);
       sq_enabledebuginfo(v, 1);
-      sqstd_dofile(v, filename, SQFalse, SQTrue);
+      sqstd_dofile(v, filename, SQFalse, SQTrue, SQTrue);
   }
   }
 }
 }
 
 
@@ -893,9 +914,12 @@ extern "C" {
     SQRESULT sqext_register_rs232(HSQUIRRELVM v);
     SQRESULT sqext_register_rs232(HSQUIRRELVM v);
     SQRESULT sqext_register_tinyxml2(HSQUIRRELVM v);
     SQRESULT sqext_register_tinyxml2(HSQUIRRELVM v);
     SQRESULT sqext_register_decimal(HSQUIRRELVM v);
     SQRESULT sqext_register_decimal(HSQUIRRELVM v);
-    SQRESULT sqext_register_fltklib(HSQUIRRELVM v);
     SQRESULT sqext_register_markdown(HSQUIRRELVM v);
     SQRESULT sqext_register_markdown(HSQUIRRELVM v);
     SQRESULT sqext_register_PostgreSQL(HSQUIRRELVM v);
     SQRESULT sqext_register_PostgreSQL(HSQUIRRELVM v);
+    SQRESULT sqext_register_Java(HSQUIRRELVM v);
+    SQRESULT sqext_register_ThreadObjects(HSQUIRRELVM v);
+    SQRESULT sqext_register_csv_parser (HSQUIRRELVM v);
+    SQRESULT sqext_register_fltklib(HSQUIRRELVM v);
 }
 }
 
 
 
 
@@ -967,12 +991,16 @@ int main(int argc, char **argv) {
 	sqext_register_sq_zlib(v);
 	sqext_register_sq_zlib(v);
 	sqext_register_mongoose(v);
 	sqext_register_mongoose(v);
 	sqrat_register_importlib(v);
 	sqrat_register_importlib(v);
-	sqext_register_sq_slave_vm(v);
 	sqext_register_tinyxml2(v);
 	sqext_register_tinyxml2(v);
 	sqext_register_decimal(v);
 	sqext_register_decimal(v);
 	sqext_register_markdown(v);
 	sqext_register_markdown(v);
+	//sqext_register_csv_parser(v);
+
+	sqext_register_sq_slave_vm(v);
+	//sqext_register_ThreadObjects(v);
 
 
 	sqext_register_sq_zmq3(v);
 	sqext_register_sq_zmq3(v);
+	//sqext_register_Java(v);
 
 
 	sqext_register_rs232(v);
 	sqext_register_rs232(v);
 #ifdef WITH_FLTK
 #ifdef WITH_FLTK