Parcourir la source

Some hand made makefiles to compile squilu to no linux platforms.

mingodad il y a 10 ans
Parent
commit
8b34572c8c

+ 8 - 7
SquiLu/Makefile-SquiLu

@@ -2,10 +2,10 @@
 #INC =  -Iinclude -Isqstdlib -I../myaxtls -I../discount -I/usr/include/postgresql -I/usr/lib/jvm/default-java/include -I/usr/lib/llvm-3.1/include -I../SquiLu-ext/threadObject -I..
 #INC =  -Iinclude -Isqstdlib -I../myaxtls -I../discount -I..
 INC =  -Iinclude -Isqstdlib -I../myaxtls -I../discount -I../gumbo -I.. -I../minizip \
-    -I/usr/include/mysql -I/usr/include/postgresql
+    -I/usr/include/mysql -I/usr/include/postgresql -I../unql/src
 #CFLAGS =  -Wall -fno-strict-aliasing -DSQ_JIT_LLVM44=1 -D_DEBUG_DUMP33=1 -DWITH_DAD_EXTRAS=1 -DSQ_SUBLATIN=1 -DNEED_SUBLATIN_C2=1 -DSQUSEDOUBLE=1 -DSQUSEDECIMAL64x=1 -DNO_EXCEPTION_KEY_NOT_FOUND0=1 -D_SQ642=1 -DNO_GARBAGE_COLLECTOR00=1 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_DEFAULT_AUTOVACUUM=1 -DSQLITE_DEFAULT_FOREIGN_KEYS=1 -DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_ENABLE_EXTENSION_FUNCTIONS=1 -DSQLITE_ENABLE_FTS3=1 -DSQLITE_ENABLE_FTS3_PARENTHESIS=1 -DSQLITE_ENABLE_UNLOCK_NOTIFY=1 -DSQLITE_ENABLE_RTREE=1 -DSQLITE_ENABLE_STAT3=1 -DSQLITE_HAS_CODEC=1 -DSQLITE_OMIT_TCL_VARIABLE=1 -DSQLITE_USE_URI=1 -DSQLITE_SOUNDEX=1 -DNO_POPEN=1 -DNO_SSL_DL=1 -DHAVE_STDINT=1 -DUSE_AXTLS=1 -DUSE_AXTLS_ON_MEMORY=1 -D_FILE_OFFSET_BITS=64 -DSSL_STATIC_LIBRARY=1 -DPDF_USING_ZLIB=1 -DRS232_STATIC=1
 CFLAGS = $(INC) -O3 -Wall -fno-strict-aliasing  \
-    -DCONFIG_64=1 \
+    -DCONFIG_32=1 \
     -D_DEBUG_DUMP33=1 \
     -D_FILE_OFFSET_BITS=64 \
     -DHAS_UNIX_DOMAIN_SOCKETS=1 \
@@ -20,7 +20,7 @@ CFLAGS = $(INC) -O3 -Wall -fno-strict-aliasing  \
     -DPDF_USING_ZLIB=1 \
     -DPROFILE_SQVM0=1 \
     -DRS232_STATIC=1 \
-    -D_SQ64=1 \
+    -D_SQ64x=1 \
     -DSQ_JIT_LLVM44=1 \
     -DSQLITE_DEFAULT_AUTOVACUUM=1 \
     -DSQLITE_DEFAULT_FILE_FORMAT=4 \
@@ -46,8 +46,9 @@ CFLAGS = $(INC) -O3 -Wall -fno-strict-aliasing  \
     -DUSE_OPENSSL2=1 \
     -DUSE_SIGNAL_HANDLER=1 \
     -DWITH_DAD_EXTRAS=1 \
-    -DWITH_MYSQL=1 \
-    -DWITH_POSTGRESQL=1 \
+    -DWITH_MPDECIMAL=1 \
+    -DWITH_MYSQL2=1 \
+    -DWITH_POSTGRESQL2=1 \
     -DWITH_UUID=1
 
 RESINC = 
@@ -55,9 +56,9 @@ RESINC =
 LIBDIR =  -Llib -L../myaxtls -L../mpdecimal -L../discount -L../gumbo -L../minizip -L../unql
 LIB =  -lm
 #LDFLAGS =  -lpthread -lrt -ldl -laxtls -lmpdecimal -ldiscount -lz
-LDFLAGS =  -lpthread -lrt -ldl -luuid -laxtls -lmpdecimal -ldiscount -lgumbo -lminizip -lz -lunql
+LDFLAGS =  -lpthread -lrt -ldl -luuid -laxtls -lmpdec -ldiscount -lgumbo -lminizip -lz -lunql
 CC = gcc
-CXX = g++
+CXX = g++ -std=c++11
 
 SOURCES= sq/sq.c  \
     sqstdlib/sqstdaux.cpp  \

+ 127 - 0
SquiLu/Makefile-SquiLu-OSX

@@ -0,0 +1,127 @@
+
+#INC =  -Iinclude -Isqstdlib -I../myaxtls -I../discount -I/usr/include/postgresql -I/usr/lib/jvm/default-java/include -I/usr/lib/llvm-3.1/include -I../SquiLu-ext/threadObject -I..
+#INC =  -Iinclude -Isqstdlib -I../myaxtls -I../discount -I..
+INC =  -Iinclude -Isqstdlib -I../myaxtls -I../discount -I../gumbo -I.. -I../minizip \
+    -I/usr/include/mysql -I/usr/include/postgresql -I../unql/src
+#CFLAGS =  -Wall -fno-strict-aliasing -DSQ_JIT_LLVM44=1 -D_DEBUG_DUMP33=1 -DWITH_DAD_EXTRAS=1 -DSQ_SUBLATIN=1 -DNEED_SUBLATIN_C2=1 -DSQUSEDOUBLE=1 -DSQUSEDECIMAL64x=1 -DNO_EXCEPTION_KEY_NOT_FOUND0=1 -D_SQ642=1 -DNO_GARBAGE_COLLECTOR00=1 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_DEFAULT_AUTOVACUUM=1 -DSQLITE_DEFAULT_FOREIGN_KEYS=1 -DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_ENABLE_EXTENSION_FUNCTIONS=1 -DSQLITE_ENABLE_FTS3=1 -DSQLITE_ENABLE_FTS3_PARENTHESIS=1 -DSQLITE_ENABLE_UNLOCK_NOTIFY=1 -DSQLITE_ENABLE_RTREE=1 -DSQLITE_ENABLE_STAT3=1 -DSQLITE_HAS_CODEC=1 -DSQLITE_OMIT_TCL_VARIABLE=1 -DSQLITE_USE_URI=1 -DSQLITE_SOUNDEX=1 -DNO_POPEN=1 -DNO_SSL_DL=1 -DHAVE_STDINT=1 -DUSE_AXTLS=1 -DUSE_AXTLS_ON_MEMORY=1 -D_FILE_OFFSET_BITS=64 -DSSL_STATIC_LIBRARY=1 -DPDF_USING_ZLIB=1 -DRS232_STATIC=1
+CFLAGS = $(INC) -O3 -Wall -fno-strict-aliasing  \
+    -DCONFIG_64=1 \
+    -D_DEBUG_DUMP33=1 \
+    -D_FILE_OFFSET_BITS=64 \
+    -DHAS_UNIX_DOMAIN_SOCKETS=1 \
+    -DHAVE_STDINT=1 \
+    -DNDEBUG=1 \
+    -DNEED_SUBLATIN_C2=1 \
+    -DNO_EXCEPTION_KEY_NOT_FOUND0=1 \
+    -DNO_GARBAGE_COLLECTOR00=1 \
+    -DNO_POPEN=1 \
+    -DNO_SSL_DL=1 \
+    -DONLY_ASCII=1 \
+    -DPDF_USING_ZLIB=1 \
+    -DPROFILE_SQVM0=1 \
+    -DRS232_STATIC=1 \
+    -D_SQ64=1 \
+    -DSQ_JIT_LLVM44=1 \
+    -DSQLITE_DEFAULT_AUTOVACUUM=1 \
+    -DSQLITE_DEFAULT_FILE_FORMAT=4 \
+    -DSQLITE_DEFAULT_FOREIGN_KEYS=1 \
+    -DSQLITE_ENABLE_COLUMN_METADATA=1 \
+    -DSQLITE_ENABLE_EXTENSION_FUNCTIONS=1 \
+    -DSQLITE_ENABLE_FTS3_PARENTHESIS=1 \
+    -DSQLITE_ENABLE_FTS4=1 \
+    -DSQLITE_ENABLE_RTREE=1 \
+    -DSQLITE_ENABLE_STAT4=1 \
+    -DSQLITE_ENABLE_UNLOCK_NOTIFY=1 \
+    -DSQLITE_HAS_CODEC=1 \
+    -DSQLITE_OMIT_TCL_VARIABLE=1 \
+    -DSQLITE_SOUNDEX=1 \
+    -DSQLITE_USE_URI=1 \
+    -DSQ_SUBLATIN=1 \
+    -DSQUSEDECIMAL64x=1 \
+    -DSQUSEDOUBLE=1 \
+    -DSSL_STATIC_LIBRARY=1 \
+    -DTHREADSAFE=1 \
+    -DUSE_AXTLS=1 \
+    -DUSE_AXTLS_ON_MEMORY=1 \
+    -DUSE_OPENSSL2=1 \
+    -DUSE_SIGNAL_HANDLER=1 \
+    -DWITH_DAD_EXTRAS=1 \
+    -DWITH_MYSQL2=1 \
+    -DWITH_POSTGRESQL2=1 \
+    -DWITH_UUID=1
+
+RESINC = 
+#LIBDIR =  -Llib -L../myaxtls -L../mpdecimal -L../discount
+LIBDIR =  -Llib -L../myaxtls -L../mpdecimal -L../discount -L../gumbo -L../minizip -L../unql
+LIB =  -lm
+#LDFLAGS =  -lpthread -lrt -ldl -laxtls -lmpdecimal -ldiscount -lz
+#LDFLAGS =  -lpthread -lrt -ldl -luuid -laxtls -lmpdecimal -ldiscount -lgumbo -lminizip -lz -lunql
+LDFLAGS =  -lpthread -ldl -laxtls -lmpdecimal -ldiscount -lgumbo -lminizip -lz
+CC = gcc
+CXX = g++
+
+SOURCES= sq/sq.c  \
+    sqstdlib/sqstdaux.cpp  \
+    sqstdlib/sqstdblob.cpp  \
+    sqstdlib/sqstdio.cpp  \
+    sqstdlib/sqstdmath.cpp  \
+    sqstdlib/sqstdrex.cpp  \
+    sqstdlib/sqstdstream.cpp  \
+    sqstdlib/sqstdstring.cpp  \
+    sqstdlib/sqstdsystem.cpp  \
+    ../SquiLu-ext/dynamic_library.cpp  \
+    ../SquiLu-ext/fpdf.cpp  \
+    ../SquiLu-ext/lua_socket.cpp  \
+    ../SquiLu-ext/mongoose.c  \
+    ../SquiLu-ext/pdf-font.cpp  \
+    ../SquiLu-ext/sq_axtls.c  \
+    ../SquiLu-ext/sq_base64.cpp  \
+    ../SquiLu-ext/sq_decimal.cpp  \
+    ../SquiLu-ext/sq_fpdf.cpp  \
+    ../SquiLu-ext/sq_fs.c  \
+    ../SquiLu-ext/sq_gumbo.cpp  \
+    ../SquiLu-ext/sqlite3.c  \
+    ../SquiLu-ext/sq_unql.c  \
+    ../SquiLu-ext/sq_markdown.cpp  \
+    ../SquiLu-ext/sq_mix.c \
+    ../SquiLu-ext/sq_mongoose.cpp  \
+    ../SquiLu-ext/sq_mysql.cpp  \
+    ../SquiLu-ext/sq_postgresql.cpp  \
+    ../SquiLu-ext/sqratimport.cpp  \
+    ../SquiLu-ext/sq_rs232.c  \
+    ../SquiLu-ext/sq_slave_vm.cpp  \
+    ../SquiLu-ext/sq_socket.cpp  \
+    ../SquiLu-ext/sq_sqlite3.cpp  \
+    ../SquiLu-ext/sq_tinyxml2.cpp  \
+    ../SquiLu-ext/sq_zlib.cpp  \
+    ../SquiLu-ext/tinyxml2.cpp \
+    squirrel/lua-regex.c  \
+    squirrel/sqapi.cpp  \
+    squirrel/sqbaselib.cpp  \
+    squirrel/sqclass.cpp  \
+    squirrel/sqcompiler.cpp  \
+    squirrel/sqdebug.cpp  \
+    squirrel/sqfuncstate.cpp  \
+    squirrel/sqlexer.cpp  \
+    squirrel/sqmem.cpp  \
+    squirrel/sqobject.cpp  \
+    squirrel/sqstate.cpp  \
+    squirrel/sqtable.cpp  \
+    squirrel/sqvm.cpp  \
+    squirrel/sublatin.c
+
+	
+#SOURCES += ../SquiLu-ext/sq_fltk.cpp  ../SquiLu-ext/sq_parsecsv.cpp \
+#	../SquiLu-ext/sq_postgresql.cpp ../SquiLu-ext/sq_zmq3.cpp  
+
+OBJECTS = $(SOURCES:.c=.o)
+
+%.o: %.c
+	$(CC) -c -o $@ $< $(CFLAGS)
+	
+%.o: %.cpp
+	$(CXX) -c -o $@ $< $(CFLAGS)
+	
+squilu: $(OBJECTS)
+	$(CXX) $(CFLAGS) -o $@ $(OBJECTS) $(LIBDIR) $(LDFLAGS)
+

+ 129 - 0
SquiLu/Makefile-SquiLu-ios

@@ -0,0 +1,129 @@
+MYDEVPREFIX=/var/theos/sdks/iPhoneOS8.1.sdk/usr
+
+#INC =  -Iinclude -Isqstdlib -I../myaxtls -I../discount -I/usr/include/postgresql -I/usr/lib/jvm/default-java/include -I/usr/lib/llvm-3.1/include -I../SquiLu-ext/threadObject -I..
+#INC =  -Iinclude -Isqstdlib -I../myaxtls -I../discount -I..
+INC = -I$(MYDEVPREFIX)/include -I$(MYDEVPREFIX)/include/c++/4.2.1 -Iinclude -Isqstdlib -I../myaxtls -I../discount -I../gumbo -I.. -I../minizip \
+    -I/usr/include/mysql -I/usr/include/postgresql -I../unql/src
+#CFLAGS =  -Wall -fno-strict-aliasing -DSQ_JIT_LLVM44=1 -D_DEBUG_DUMP33=1 -DWITH_DAD_EXTRAS=1 -DSQ_SUBLATIN=1 -DNEED_SUBLATIN_C2=1 -DSQUSEDOUBLE=1 -DSQUSEDECIMAL64x=1 -DNO_EXCEPTION_KEY_NOT_FOUND0=1 -D_SQ642=1 -DNO_GARBAGE_COLLECTOR00=1 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_DEFAULT_AUTOVACUUM=1 -DSQLITE_DEFAULT_FOREIGN_KEYS=1 -DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_ENABLE_EXTENSION_FUNCTIONS=1 -DSQLITE_ENABLE_FTS3=1 -DSQLITE_ENABLE_FTS3_PARENTHESIS=1 -DSQLITE_ENABLE_UNLOCK_NOTIFY=1 -DSQLITE_ENABLE_RTREE=1 -DSQLITE_ENABLE_STAT3=1 -DSQLITE_HAS_CODEC=1 -DSQLITE_OMIT_TCL_VARIABLE=1 -DSQLITE_USE_URI=1 -DSQLITE_SOUNDEX=1 -DNO_POPEN=1 -DNO_SSL_DL=1 -DHAVE_STDINT=1 -DUSE_AXTLS=1 -DUSE_AXTLS_ON_MEMORY=1 -D_FILE_OFFSET_BITS=64 -DSSL_STATIC_LIBRARY=1 -DPDF_USING_ZLIB=1 -DRS232_STATIC=1
+CFLAGS = $(INC) -O3 -Wall -fno-strict-aliasing  \
+    -DCONFIG_32=1 \
+    -D_DEBUG_DUMP33=1 \
+    -D_FILE_OFFSET_BITS=64 \
+    -DHAS_UNIX_DOMAIN_SOCKETS=1 \
+    -DHAVE_STDINT=1 \
+    -DNDEBUG=1 \
+    -DNEED_SUBLATIN_C2=1 \
+    -DNO_EXCEPTION_KEY_NOT_FOUND0=1 \
+    -DNO_GARBAGE_COLLECTOR00=1 \
+    -DNO_POPEN=1 \
+    -DNO_SSL_DL=1 \
+    -DONLY_ASCII=1 \
+    -DPDF_USING_ZLIB=1 \
+    -DPROFILE_SQVM0=1 \
+    -DRS232_STATIC=1 \
+    -D_SQ64x=1 \
+    -DSQ_JIT_LLVM44=1 \
+    -DSQLITE_DEFAULT_AUTOVACUUM=1 \
+    -DSQLITE_DEFAULT_FILE_FORMAT=4 \
+    -DSQLITE_DEFAULT_FOREIGN_KEYS=1 \
+    -DSQLITE_ENABLE_COLUMN_METADATA=1 \
+    -DSQLITE_ENABLE_EXTENSION_FUNCTIONS=1 \
+    -DSQLITE_ENABLE_FTS3_PARENTHESIS=1 \
+    -DSQLITE_ENABLE_FTS4=1 \
+    -DSQLITE_ENABLE_RTREE=1 \
+    -DSQLITE_ENABLE_STAT4=1 \
+    -DSQLITE_ENABLE_UNLOCK_NOTIFY=1 \
+    -DSQLITE_HAS_CODEC=1 \
+    -DSQLITE_OMIT_TCL_VARIABLE=1 \
+    -DSQLITE_SOUNDEX=1 \
+    -DSQLITE_USE_URI=1 \
+    -DSQ_SUBLATIN=1 \
+    -DSQUSEDECIMAL64x=1 \
+    -DSQUSEDOUBLE=1 \
+    -DSSL_STATIC_LIBRARY=1 \
+    -DTHREADSAFE=1 \
+    -DUSE_AXTLS=1 \
+    -DUSE_AXTLS_ON_MEMORY=1 \
+    -DUSE_OPENSSL2=1 \
+    -DUSE_SIGNAL_HANDLER=1 \
+    -DWITH_DAD_EXTRAS=1 \
+    -DWITH_MPDECIMAL=1 \
+    -DWITH_MYSQL2=1 \
+    -DWITH_POSTGRESQL2=1 \
+    -DWITH_UUID=1
+
+RESINC = 
+#LIBDIR =  -Llib -L../myaxtls -L../mpdecimal -L../discount
+LIBDIR = -L$(MYDEVPREFIX)/lib -L$(MYDEVPREFIX)/lib/system -Llib -L../myaxtls -L../mpdecimal -L../discount -L../gumbo -L../minizip -L../unql
+LIB =  -lm
+#LDFLAGS =  -lpthread -lrt -ldl -laxtls -lmpdecimal -ldiscount -lz
+#LDFLAGS =  -lpthread -lrt -ldl -luuid -laxtls -lmpdecimal -ldiscount -lgumbo -lminizip -lz -lunql
+LDFLAGS =  -lpthread -ldl -laxtls -lmpdecimal -ldiscount -lgumbo -lminizip -lz -lunql
+CC = clang
+CXX = clang++ -std=c++11
+
+SOURCES= sq/sq.c  \
+    sqstdlib/sqstdaux.cpp  \
+    sqstdlib/sqstdblob.cpp  \
+    sqstdlib/sqstdio.cpp  \
+    sqstdlib/sqstdmath.cpp  \
+    sqstdlib/sqstdrex.cpp  \
+    sqstdlib/sqstdstream.cpp  \
+    sqstdlib/sqstdstring.cpp  \
+    sqstdlib/sqstdsystem.cpp  \
+    ../SquiLu-ext/dynamic_library.cpp  \
+    ../SquiLu-ext/fpdf.cpp  \
+    ../SquiLu-ext/lua_socket.cpp  \
+    ../SquiLu-ext/mongoose.c  \
+    ../SquiLu-ext/pdf-font.cpp  \
+    ../SquiLu-ext/sq_axtls.c  \
+    ../SquiLu-ext/sq_base64.cpp  \
+    ../SquiLu-ext/sq_fpdf.cpp  \
+    ../SquiLu-ext/sq_fs.c  \
+    ../SquiLu-ext/sq_gumbo.cpp  \
+    ../SquiLu-ext/sqlite3.c  \
+    ../SquiLu-ext/sq_unql.c  \
+    ../SquiLu-ext/sq_decimal.c  \
+    ../SquiLu-ext/sq_markdown.cpp  \
+    ../SquiLu-ext/sq_mix.c \
+    ../SquiLu-ext/sq_mongoose.cpp  \
+    ../SquiLu-ext/sq_mysql.cpp  \
+    ../SquiLu-ext/sq_postgresql.cpp  \
+    ../SquiLu-ext/sqratimport.cpp  \
+    ../SquiLu-ext/sq_rs232.c  \
+    ../SquiLu-ext/sq_slave_vm.cpp  \
+    ../SquiLu-ext/sq_socket.cpp  \
+    ../SquiLu-ext/sq_sqlite3.cpp  \
+    ../SquiLu-ext/sq_tinyxml2.cpp  \
+    ../SquiLu-ext/sq_zlib.cpp  \
+    ../SquiLu-ext/tinyxml2.cpp \
+    squirrel/lua-regex.c  \
+    squirrel/sqapi.cpp  \
+    squirrel/sqbaselib.cpp  \
+    squirrel/sqclass.cpp  \
+    squirrel/sqcompiler.cpp  \
+    squirrel/sqdebug.cpp  \
+    squirrel/sqfuncstate.cpp  \
+    squirrel/sqlexer.cpp  \
+    squirrel/sqmem.cpp  \
+    squirrel/sqobject.cpp  \
+    squirrel/sqstate.cpp  \
+    squirrel/sqtable.cpp  \
+    squirrel/sqvm.cpp  \
+    squirrel/sublatin.c
+
+	
+#SOURCES += ../SquiLu-ext/sq_fltk.cpp  ../SquiLu-ext/sq_parsecsv.cpp \
+#	../SquiLu-ext/sq_postgresql.cpp ../SquiLu-ext/sq_zmq3.cpp  
+
+OBJECTS = $(SOURCES:.c=.o)
+
+%.o: %.c
+	$(CC) -c -o $@ $< $(CFLAGS)
+	
+%.o: %.cpp
+	$(CXX) -c -o $@ $< $(CFLAGS)
+	
+squilu: $(OBJECTS)
+	$(CXX) $(CFLAGS) -o $@ $(OBJECTS) $(LIBDIR) $(LDFLAGS)
+

+ 286 - 0
SquiLu/Makefile-SquiLu-ios-through-linux

@@ -0,0 +1,286 @@
+MYSDKPREFIX=$(HOME)/local/theos/sdks/iPhoneOS5.1.sdk/usr
+
+INC = -Iinclude -Isqstdlib -I../SquiLu-ext -I../myaxtls -I../mpdecimal-ios -I../discount -I../gumbo -I.. -I../minizip -I../unql/src -I$(MYSDKPREFIX)/include -I$(MYSDKPREFIX)/include/c++/4.2.1 
+
+CFLAGS = $(INC) -O3 -Wall -fno-strict-aliasing  \
+    -D_DEBUG_DUMP33=1 \
+    -D_FILE_OFFSET_BITS=64 \
+    -DHAS_UNIX_DOMAIN_SOCKETS=1 \
+    -DHAVE_STDINT=1 \
+    -DNDEBUG=1 \
+    -DNEED_SUBLATIN_C2=1 \
+    -DNO_EXCEPTION_KEY_NOT_FOUND0=1 \
+    -DNO_GARBAGE_COLLECTOR00=1 \
+    -DNO_POPEN=1 \
+    -DNO_SSL_DL=1 \
+    -DONLY_ASCII=1 \
+    -DPDF_USING_ZLIB=1 \
+    -DPROFILE_SQVM0=1 \
+    -DRS232_STATIC=1 \
+    -D_SQ64x=1 \
+    -DSQ_JIT_LLVM44=1 \
+    -DSQLITE_DEFAULT_AUTOVACUUM=1 \
+    -DSQLITE_DEFAULT_FILE_FORMAT=4 \
+    -DSQLITE_DEFAULT_FOREIGN_KEYS=1 \
+    -DSQLITE_ENABLE_COLUMN_METADATA=1 \
+    -DSQLITE_ENABLE_EXTENSION_FUNCTIONS=1 \
+    -DSQLITE_ENABLE_FTS3_PARENTHESIS=1 \
+    -DSQLITE_ENABLE_FTS4=1 \
+    -DSQLITE_ENABLE_RTREE=1 \
+    -DSQLITE_ENABLE_STAT4=1 \
+    -DSQLITE_ENABLE_UNLOCK_NOTIFY=1 \
+    -DSQLITE_HAS_CODEC=1 \
+    -DSQLITE_OMIT_TCL_VARIABLE=1 \
+    -DSQLITE_SOUNDEX=1 \
+    -DSQLITE_USE_URI=1 \
+    -DSQ_SUBLATIN=1 \
+    -DSQUSEDECIMAL64x=1 \
+    -DSQUSEDOUBLE=1 \
+    -DSSL_STATIC_LIBRARY=1 \
+    -DTHREADSAFE=1 \
+    -DUSE_AXTLS=1 \
+    -DUSE_AXTLS_ON_MEMORY=1 \
+    -DUSE_OPENSSL2=1 \
+    -DUSE_SIGNAL_HANDLER=1 \
+    -DWITH_DAD_EXTRAS=1 \
+    -DWITH_MPDECIMAL=1 \
+    -DWITH_MYSQL2=1 \
+    -DWITH_POSTGRESQL2=1 \
+    -DWITH_UUID=1 \
+    -DSQLITE_ENABLE_JSON1=1 \
+    -DSQLITE_OMIT_PREPARED=1 \
+    -DTARGET_IOS=1
+
+RESINC = 
+LIBDIR = -L$(MYSDKPREFIX)/lib -L$(MYSDKPREFIX)/lib/system -Llib
+LIB =  -lm
+LDFLAGS =  -lpthread -ldl -lz
+
+CC = ios-clang
+CXX = ios-clang++ -std=c++11
+CFLAGS += -objc-arc
+CFLAGS += -fblocks
+CFLAGS += -g0 -O3 -mios-version-min=5.0.0  -stdlib=libc++ -stdlib=libstdc++
+
+CPPFLAGS += -objc-arc
+CPPFLAGS += -fblocks
+CPPFLAGS += -g0 -O3
+
+LDFLAGS += -framework Foundation -lstdc++ -lc++
+
+SOURCES= sq/sq.c  \
+    sqstdlib/sqstdaux.cpp  \
+    sqstdlib/sqstdblob.cpp  \
+    sqstdlib/sqstdio.cpp  \
+    sqstdlib/sqstdmath.cpp  \
+    sqstdlib/sqstdrex.cpp  \
+    sqstdlib/sqstdstream.cpp  \
+    sqstdlib/sqstdstring.cpp  \
+    sqstdlib/sqstdsystem.cpp  \
+    ../SquiLu-ext/dynamic_library.cpp  \
+    ../SquiLu-ext/fpdf.cpp  \
+    ../SquiLu-ext/lua_socket.cpp  \
+    ../SquiLu-ext/mongoose.c  \
+    ../SquiLu-ext/pdf-font.cpp  \
+    ../SquiLu-ext/sq_base64.cpp  \
+    ../SquiLu-ext/sq_fpdf.cpp  \
+    ../SquiLu-ext/sq_fs.c  \
+    ../SquiLu-ext/sqlite3.c  \
+    ../SquiLu-ext/sq_mix.cpp \
+    ../SquiLu-ext/sq_mongoose.cpp  \
+    ../SquiLu-ext/sq_mysql.cpp  \
+    ../SquiLu-ext/sq_postgresql.cpp  \
+    ../SquiLu-ext/sqratimport.cpp  \
+    ../SquiLu-ext/sq_rs232.c  \
+    ../SquiLu-ext/sq_slave_vm.cpp  \
+    ../SquiLu-ext/sq_socket.cpp  \
+    ../SquiLu-ext/sq_sqlite3.cpp  \
+    ../SquiLu-ext/sq_tinyxml2.cpp  \
+    ../SquiLu-ext/sq_zlib.cpp  \
+    ../SquiLu-ext/tinyxml2.cpp \
+    squirrel/lua-regex.c  \
+    squirrel/sqapi.cpp  \
+    squirrel/sqbaselib.cpp  \
+    squirrel/sqclass.cpp  \
+    squirrel/sqcompiler.cpp  \
+    squirrel/sqdebug.cpp  \
+    squirrel/sqfuncstate.cpp  \
+    squirrel/sqlexer.cpp  \
+    squirrel/sqmem.cpp  \
+    squirrel/sqobject.cpp  \
+    squirrel/sqstate.cpp  \
+    squirrel/sqtable.cpp  \
+    squirrel/sqvm.cpp  \
+    squirrel/sublatin.c
+
+AXTLS_PATH := ../myaxtls
+AXTLS_SRC_FILES := \
+	../SquiLu-ext/sq_axtls.c  \
+	$(AXTLS_PATH)/aes.c \
+	$(AXTLS_PATH)/asn1.c \
+	$(AXTLS_PATH)/bigint.c \
+	$(AXTLS_PATH)/crypto_misc.c \
+	$(AXTLS_PATH)/gen_cert.c \
+	$(AXTLS_PATH)/hmac.c \
+	$(AXTLS_PATH)/loader.c \
+	$(AXTLS_PATH)/md5.c \
+	$(AXTLS_PATH)/openssl.c \
+	$(AXTLS_PATH)/os_port.c \
+	$(AXTLS_PATH)/p12.c \
+	$(AXTLS_PATH)/rc4.c \
+	$(AXTLS_PATH)/rsa.c \
+	$(AXTLS_PATH)/sha1.c \
+	$(AXTLS_PATH)/sha256.c \
+	$(AXTLS_PATH)/tls1.c \
+	$(AXTLS_PATH)/tls1_clnt.c \
+	$(AXTLS_PATH)/tls1_svr.c \
+	$(AXTLS_PATH)/x509.c
+#	$(AXTLS_PATH)/sha384.c \
+#	$(AXTLS_PATH)/sha512.c \
+
+AXTLS_OPT_DEFINES := \
+	-DCONFIG_SSL_ENABLE_CLIENT2=1 \
+	-DSSL_STATIC_LIBRARY=1 \
+	-DAXTLS_LIBRARY=1 \
+	-DCONFIG_OPENSSL_COMPATIBLE=1 \
+	-DCONFIG_SSL_CTX_MUTEXING=1 \
+	-DCONFIG_SSL_USE_DEFAULT_KEY=1 \
+	-DHAVE_STDINT=1 \
+	-DNO_SSL_DL=1 \
+	-DUSE_AXTLS=1 \
+	-DUSE_AXTLS_ON_MEMORY=1 \
+	-DSSL_STATIC_LIBRARY=1 \
+	-DCONFIG_BIGINT_BARRETT=1
+
+AXTLS_INCLUDE_DIRS := -I$(AXTLS_PATH)
+SOURCES += $(AXTLS_SRC_FILES)
+CFLAGS += $(AXTLS_OPT_DEFINES)
+	
+GUMBO_PATH := ../gumbo
+GUMBO_SRC_FILES := \
+	../SquiLu-ext/sq_gumbo.cpp  \
+	$(GUMBO_PATH)/attribute.c \
+	$(GUMBO_PATH)/char_ref.c \
+	$(GUMBO_PATH)/error.c \
+	$(GUMBO_PATH)/parser.c \
+	$(GUMBO_PATH)/string_buffer.c \
+	$(GUMBO_PATH)/string_piece.c \
+	$(GUMBO_PATH)/tag.c \
+	$(GUMBO_PATH)/tokenizer.c \
+	$(GUMBO_PATH)/utf8.c \
+	$(GUMBO_PATH)/util.c \
+	$(GUMBO_PATH)/vector.c
+
+GUMBO_INCLUDE_DIRS := -I$(GUMBO_PATH)
+SOURCES += $(GUMBO_SRC_FILES)
+
+MINIZIP_PATH := ../minizip
+MINIZIP_SRC_FILES := \
+	$(MINIZIP_PATH)/ioapi.c \
+	$(MINIZIP_PATH)/mztools.c \
+	$(MINIZIP_PATH)/unzip.c \
+	$(MINIZIP_PATH)/zip.c
+#	../SquiLu-ext/sq_miniz.cpp \
+	
+MINIZIP_OPT_DEFINES := \
+	-DNOCRYPT
+
+MINIZIP_INCLUDE_DIRS := -I$(MINIZIP_PATH)
+SOURCES += $(MINIZIP_SRC_FILES)
+CFLAGS += $(MINIZIP_OPT_DEFINES)
+
+MPDECIMAL_PATH := ../mpdecimal-ios
+MPDECIMAL_SRC_FILES := \
+	../SquiLu-ext/sq_decimal.cpp  \
+	$(MPDECIMAL_PATH)/basearith.c \
+	$(MPDECIMAL_PATH)/context.c \
+	$(MPDECIMAL_PATH)/constants.c \
+	$(MPDECIMAL_PATH)/convolute.c \
+	$(MPDECIMAL_PATH)/crt.c \
+	$(MPDECIMAL_PATH)/mpdecimal.c \
+        $(MPDECIMAL_PATH)/mpsignal.c \
+	$(MPDECIMAL_PATH)/difradix2.c \
+	$(MPDECIMAL_PATH)/fnt.c \
+	$(MPDECIMAL_PATH)/fourstep.c \
+	$(MPDECIMAL_PATH)/io.c \
+	$(MPDECIMAL_PATH)/memory.c \
+	$(MPDECIMAL_PATH)/numbertheory.c \
+        $(MPDECIMAL_PATH)/sixstep.c \
+	$(MPDECIMAL_PATH)/transpose.c
+
+MPDECIMAL_OPT_DEFINES := \
+	-DMPD_PREC=9 \
+	-DMPD_DPREC=18 \
+	-DCONFIG_32=1 \
+	-DANSI=1 \
+	-DCOMPILING_FOR_IOS=1
+
+MPDECIMAL_INCLUDE_DIRS := -I$MPDECIMAL_PATH)
+SOURCES += $(MPDECIMAL_SRC_FILES)
+CFLAGS += $(MPDECIMAL_OPT_DEFINES)
+
+
+LIBDISCOUNT_PATH := ../discount
+LIBDISCOUNT_SRC_FILES= \
+	../SquiLu-ext/sq_markdown.cpp  \
+	$(LIBDISCOUNT_PATH)/mkdio.c \
+	$(LIBDISCOUNT_PATH)/markdown.c \
+	$(LIBDISCOUNT_PATH)/dumptree.c \
+	$(LIBDISCOUNT_PATH)/generate.c \
+	$(LIBDISCOUNT_PATH)/resource.c \
+	$(LIBDISCOUNT_PATH)/docheader.c \
+	$(LIBDISCOUNT_PATH)/version.c \
+	$(LIBDISCOUNT_PATH)/toc.c \
+	$(LIBDISCOUNT_PATH)/css.c \
+	$(LIBDISCOUNT_PATH)/xml.c \
+	$(LIBDISCOUNT_PATH)/Csio.c \
+	$(LIBDISCOUNT_PATH)/xmlpage.c \
+	$(LIBDISCOUNT_PATH)/basename.c \
+	$(LIBDISCOUNT_PATH)/emmatch.c \
+	$(LIBDISCOUNT_PATH)/setup.c \
+	$(LIBDISCOUNT_PATH)/tags.c \
+	$(LIBDISCOUNT_PATH)/html5.c \
+	$(LIBDISCOUNT_PATH)/flags.c
+	
+LIBDISCOUNT_INCLUDE_DIRS := -I$(LIBDISCOUNT_PATH)
+SOURCES += $(LIBDISCOUNT_SRC_FILES)
+
+UNQL_PATH := ../unql/src
+UNQL_SRC_FILES = \
+	../SquiLu-ext/sq_unql.cpp  \
+	$(UNQL_PATH)/update.c \
+	$(UNQL_PATH)/trace.c \
+	$(UNQL_PATH)/tokenize.c \
+	$(UNQL_PATH)/string.c \
+	$(UNQL_PATH)/stmt.c \
+	$(UNQL_PATH)/query.c \
+	$(UNQL_PATH)/pragma.c \
+	$(UNQL_PATH)/complete.c \
+	$(UNQL_PATH)/parse.c \
+	$(UNQL_PATH)/memory.c \
+	$(UNQL_PATH)/json.c \
+	$(UNQL_PATH)/func.c \
+	$(UNQL_PATH)/expr.c \
+	$(UNQL_PATH)/delete.c \
+	$(UNQL_PATH)/datasrc.c \
+	$(UNQL_PATH)/context.c \
+	$(UNQL_PATH)/conn.c
+
+UNQL_INCLUDE_DIRS := -I$(UNQL_PATH)
+SOURCES += $(UNQL_SRC_FILES)
+
+#SOURCES += ../SquiLu-ext/sq_fltk.cpp  ../SquiLu-ext/sq_parsecsv.cpp \
+#	../SquiLu-ext/sq_postgresql.cpp ../SquiLu-ext/sq_zmq3.cpp  
+
+#OBJECTS = $(SOURCES:.c=.o)
+
+%.o: %.c
+	$(CC) -c -o $@ $< $(CFLAGS)
+	
+%.o: %.cpp
+	$(CXX) -c -o $@ $< $(CFLAGS)
+	
+squilu-ios: $(OBJECTS)
+	$(CC) $(CFLAGS) -o $@ $(SOURCES) $(LIBDIR) $(LDFLAGS)
+	#$(CXX) $(CFLAGS) -o $@ $(OBJECTS) $(LIBDIR) $(LDFLAGS)
+

+ 57 - 0
SquiLu/Makefile-SquiLu-wince

@@ -0,0 +1,57 @@
+
+#INC =  -Iinclude -Isqstdlib -I../myaxtls -I../discount -I/usr/include/postgresql -I/usr/lib/jvm/default-java/include -I/usr/lib/llvm-3.1/include -I../SquiLu-ext/threadObject -I..
+INC =  -Iinclude -Isqstdlib -I../myaxtls -I../discount -I..
+#CFLAGS =  -Wall -fno-strict-aliasing -DSQ_JIT_LLVM44=1 -D_DEBUG_DUMP33=1 -DWITH_DAD_EXTRAS=1 -DSQ_SUBLATIN=1 -DNEED_SUBLATIN_C2=1 -DSQUSEDOUBLE=1 -DSQUSEDECIMAL642=1 -DNO_EXCEPTION_KEY_NOT_FOUND0=1 -D_SQ642=1 -DNO_GARBAGE_COLLECTOR00=1 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_DEFAULT_AUTOVACUUM=1 -DSQLITE_DEFAULT_FOREIGN_KEYS=1 -DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_ENABLE_EXTENSION_FUNCTIONS=1 -DSQLITE_ENABLE_FTS3=1 -DSQLITE_ENABLE_FTS3_PARENTHESIS=1 -DSQLITE_ENABLE_UNLOCK_NOTIFY=1 -DSQLITE_ENABLE_RTREE=1 -DSQLITE_ENABLE_STAT3=1 -DSQLITE_HAS_CODEC=1 -DSQLITE_OMIT_TCL_VARIABLE=1 -DSQLITE_USE_URI=1 -DSQLITE_SOUNDEX=1 -DNO_POPEN=1 -DNO_SSL_DL=1 -DHAVE_STDINT=1 -DUSE_AXTLS=1 -DUSE_AXTLS_ON_MEMORY=1 -D_FILE_OFFSET_BITS=64 -DSSL_STATIC_LIBRARY=1 -DPDF_USING_ZLIB=1 -DRS232_STATIC=1
+CFLAGS = $(INC) -O3 -Wall -fno-strict-aliasing -DNDEBUG -DWITH_DAD_EXTRAS=1 -DSQ_SUBLATIN=1 \
+	-DSQUSEDOUBLE=1  -D_SQ642=1 \
+	-DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_DEFAULT_AUTOVACUUM=1 \
+	-DSQLITE_DEFAULT_FOREIGN_KEYS=1 -DSQLITE_ENABLE_COLUMN_METADATA=1 \
+	-DSQLITE_ENABLE_EXTENSION_FUNCTIONS=1 -DSQLITE_ENABLE_FTS3=1 \
+	-DSQLITE_ENABLE_FTS3_PARENTHESIS=1 -DSQLITE_ENABLE_UNLOCK_NOTIFY=1 \
+	-DSQLITE_ENABLE_RTREE=1 -DSQLITE_ENABLE_STAT3=1 -DSQLITE_HAS_CODEC=1 \
+	-DSQLITE_OMIT_TCL_VARIABLE=1 -DSQLITE_USE_URI=1 -DSQLITE_SOUNDEX=1 \
+	-DNO_POPEN=1 -DNO_SSL_DL=1 -DHAVE_STDINT=1 -DUSE_AXTLS=1 \
+	-DUSE_AXTLS_ON_MEMORY=1 -D_FILE_OFFSET_BITS=64 \
+	-DSSL_STATIC_LIBRARY=1 -DPDF_USING_ZLIB=1 -DRS232_STATIC=1 \
+	-DSQLITE_OS_WINCE=1
+
+RESINC = 
+LIBDIR =  -Llib -L../myaxtls -L../mpdecimal -L../discount
+LIB =  -lm
+LDFLAGS =  -lpthread -lrt -ldl -laxtls -lmpdecimal -ldiscount -lz
+CC = gcc
+CXX = g++
+
+SOURCES=  sq/sq.c  sqstdlib/sqstdaux.cpp  sqstdlib/sqstdblob.cpp  sqstdlib/sqstdio.cpp  \
+	sqstdlib/sqstdmath.cpp  sqstdlib/sqstdrex.cpp  sqstdlib/sqstdstream.cpp  \
+	sqstdlib/sqstdstring.cpp  sqstdlib/sqstdsystem.cpp  \
+	../SquiLu-ext/dynamic_library.cpp  ../SquiLu-ext/fpdf.cpp  ../SquiLu-ext/lua_socket.cpp  \
+	../SquiLu-ext/mongoose.c  ../SquiLu-ext/pdf-font.cpp  ../SquiLu-ext/sq_axtls.c  \
+	../SquiLu-ext/sq_base64.cpp  ../SquiLu-ext/sq_decimal.cpp  \
+	../SquiLu-ext/sq_fpdf.cpp  ../SquiLu-ext/sq_fs.c  \
+	../SquiLu-ext/sqlite3.c  ../SquiLu-ext/sq_markdown.cpp  ../SquiLu-ext/sq_mix.cpp  \
+	../SquiLu-ext/sq_mongoose.cpp  ../SquiLu-ext/sqratimport.cpp  \
+	../SquiLu-ext/sq_rs232.c  ../SquiLu-ext/sq_slave_vm.cpp  \
+	../SquiLu-ext/sq_socket.cpp  ../SquiLu-ext/sq_sqlite3.cpp  \
+	../SquiLu-ext/sq_tinyxml2.cpp  ../SquiLu-ext/sq_zlib.cpp  \
+	../SquiLu-ext/tinyxml2.cpp  \
+	squirrel/lua-regex.c  squirrel/sqdebug.cpp  squirrel/sqapi.cpp  \
+	squirrel/sqbaselib.cpp  squirrel/sqclass.cpp  squirrel/sqcompiler.cpp  \
+	squirrel/sqfuncstate.cpp  squirrel/sqlexer.cpp  squirrel/sqmem.cpp  \
+	squirrel/sqobject.cpp  squirrel/sqstate.cpp  squirrel/sqtable.cpp  \
+	squirrel/sqvm.cpp  squirrel/sublatin.c
+	
+#SOURCES += ../SquiLu-ext/sq_fltk.cpp  ../SquiLu-ext/sq_parsecsv.cpp \
+#	../SquiLu-ext/sq_postgresql.cpp ../SquiLu-ext/sq_zmq3.cpp  
+
+OBJECTS = $(SOURCES:.c=.o)
+
+%.o: %.c
+	$(CC) -c -o $@ $< $(CFLAGS)
+	
+%.o: %.cpp
+	$(CXX) -c -o $@ $< $(CFLAGS)
+	
+squilu: $(OBJECTS)
+	$(CXX) $(CFLAGS) -o $@ $(OBJECTS) $(LIBDIR) $(LDFLAGS)
+

+ 12 - 0
SquiLu/do-mk-ios

@@ -0,0 +1,12 @@
+CLANG_HOME=$HOME/local/clang-3.6
+MYCCTOOLS=$HOME/local/cctools
+
+export PATH=$MYCCTOOLS/bin:$CLANG_HOME/bin:$PATH
+export LD_LIBRARY_PATH=$CLANG_HOME/lib:$LD_LIBRARY_PATH
+export CFLAGS=-I$CLANG_HOME/include
+export CXXFLAGS=$CFLAGS
+export LDLAGS=-L$CLANG_HOME/lib
+export CC=clang
+export CXX=clang++
+
+make -f Makefile-SquiLu-ios-through-linux $* > make.log 2>&1

+ 98 - 4
SquiLu/squilu.cbp

@@ -363,7 +363,7 @@
 			</Target>
 			<Target title="Release 64bits">
 				<Option output="bin/squilu-no-gui" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj/Release/" />
+				<Option object_output="obj/Release-no-gui/" />
 				<Option type="1" />
 				<Option compiler="gcc" />
 				<Compiler>
@@ -611,14 +611,70 @@
 			</Target>
 			<Target title="Debug FLTK 64bits">
 				<Option output="bin/squilu-dbg" prefix_auto="1" extension_auto="1" />
+				<Option working_dir="../db-api/tools" />
 				<Option object_output="obj/Debug/" />
 				<Option type="1" />
 				<Option compiler="gcc" />
+				<Option parameters="check-function-calls.nut" />
+				<Compiler>
+					<Add option="-Wall" />
+					<Add option="-g" />
+					<Add option="-DWITH_FLTK=1" />
+					<Add option="-DNDEBUG=1" />
+					<Add option="-DWITH_FULL_DAD_EXTRAS=1" />
+					<Add option="-DPROFILE_SQVM22=1" />
+					<Add option="-D_SQ64=1" />
+					<Add option="-DCONFIG_64=1" />
+					<Add option="-DHAS_UNIX_DOMAIN_SOCKETS=1" />
+					<Add option="-DUSE_SIGNAL_HANDLER=1" />
+					<Add option="-DWITH_MYSQL=1" />
+					<Add option="-DWITH_POSTGRESQL=1" />
+					<Add option="-DWITH_DNS_SD2=1" />
+					<Add option="-DSQLITE_DEBUG=1" />
+					<Add option="-DSQLITE_ENABLE_EXPLAIN_COMMENTS=1" />
+					<Add directory="../../zeromq-3.2.2/include" />
+					<Add directory="../fltk" />
+					<Add directory="../libharu/include" />
+					<Add directory="../flu" />
+				</Compiler>
+				<Linker>
+					<Add library="pthread" />
+					<Add library="rt" />
+					<Add library="dl" />
+					<Add library="fltkutils" />
+					<Add library="fltk_images" />
+					<Add library="fltk_png" />
+					<Add library="fltk_jpeg" />
+					<Add library="fltk_z" />
+					<Add library="fltk" />
+					<Add library="Xext" />
+					<Add library="Xft" />
+					<Add library="Xinerama" />
+					<Add library="mpdecimal" />
+					<Add library="hpdfs" />
+					<Add library="discount" />
+					<Add library="X11" />
+					<Add library="fontconfig" />
+					<Add library="axtls" />
+					<Add library="Xcursor" />
+					<Add library="Xfixes" />
+					<Add directory="../../zeromq-3.2.2" />
+					<Add directory="../fltk/lib" />
+					<Add directory="../flu" />
+					<Add directory="../libharu/src" />
+				</Linker>
+			</Target>
+			<Target title="Debug FLTK 64bits asan">
+				<Option output="bin/squilu-dbg-asan" prefix_auto="1" extension_auto="1" />
+				<Option working_dir="../db-api/tools" />
+				<Option object_output="obj/Debug-asan/" />
+				<Option type="1" />
+				<Option compiler="gcc" />
+				<Option parameters="check-function-calls.nut" />
 				<Compiler>
-					<Add option="-fomit-frame-pointer" />
-					<Add option="-O2" />
 					<Add option="-Wall" />
 					<Add option="-g" />
+					<Add option="-fsanitize=address" />
 					<Add option="-DWITH_FLTK=1" />
 					<Add option="-DNDEBUG=1" />
 					<Add option="-DWITH_FULL_DAD_EXTRAS=1" />
@@ -638,6 +694,7 @@
 					<Add directory="../flu" />
 				</Compiler>
 				<Linker>
+					<Add option="-lasan" />
 					<Add library="pthread" />
 					<Add library="rt" />
 					<Add library="dl" />
@@ -695,6 +752,8 @@
 			<Add option="-DSQLITE_OMIT_TCL_VARIABLE=1" />
 			<Add option="-DSQLITE_USE_URI=1" />
 			<Add option="-DSQLITE_SOUNDEX=1" />
+			<Add option="-DSQLITE_OMIT_PREPARED=1" />
+			<Add option="-DSQLITE_ENABLE_JSON1=1" />
 			<Add option="-DNO_POPEN=1" />
 			<Add option="-DNO_SSL_DL=1" />
 			<Add option="-DHAVE_STDINT=1" />
@@ -712,7 +771,7 @@
 			<Add directory="sqstdlib" />
 			<Add directory="../myaxtls" />
 			<Add directory="../discount" />
-			<Add directory="/usr/include/postgresql" />
+			<Add directory="../../../local/postgresql/include" />
 			<Add directory="/usr/lib/jvm/default-java/include" />
 			<Add directory="/usr/lib/llvm-3.1/include" />
 			<Add directory="../SquiLu-ext/threadObject" />
@@ -768,6 +827,7 @@
 			<Option target="Release FLTK 64bits Computed Gotos" />
 			<Option target="Release 64bits static Library" />
 			<Option target="Debug FLTK 64bits" />
+			<Option target="Debug FLTK 64bits asan" />
 		</Unit>
 		<Unit filename="../SquiLu-ext/dynamic_library.h">
 			<Option target="Debug" />
@@ -786,6 +846,7 @@
 			<Option target="Release FLTK 64bits Computed Gotos" />
 			<Option target="Release 64bits static Library" />
 			<Option target="Debug FLTK 64bits" />
+			<Option target="Debug FLTK 64bits asan" />
 		</Unit>
 		<Unit filename="../SquiLu-ext/fpdf.cpp">
 			<Option target="Debug" />
@@ -804,6 +865,7 @@
 			<Option target="Release FLTK 64bits Computed Gotos" />
 			<Option target="Release 64bits static Library" />
 			<Option target="Debug FLTK 64bits" />
+			<Option target="Debug FLTK 64bits asan" />
 		</Unit>
 		<Unit filename="../SquiLu-ext/fpdf.h">
 			<Option target="Debug" />
@@ -822,6 +884,7 @@
 			<Option target="Release FLTK 64bits Computed Gotos" />
 			<Option target="Release 64bits static Library" />
 			<Option target="Debug FLTK 64bits" />
+			<Option target="Debug FLTK 64bits asan" />
 		</Unit>
 		<Unit filename="../SquiLu-ext/lua_socket.cpp">
 			<Option target="Debug" />
@@ -840,6 +903,7 @@
 			<Option target="Release FLTK 64bits Computed Gotos" />
 			<Option target="Release 64bits static Library" />
 			<Option target="Debug FLTK 64bits" />
+			<Option target="Debug FLTK 64bits asan" />
 		</Unit>
 		<Unit filename="../SquiLu-ext/lua_socket.h">
 			<Option target="Debug" />
@@ -858,6 +922,7 @@
 			<Option target="Release FLTK 64bits Computed Gotos" />
 			<Option target="Release 64bits static Library" />
 			<Option target="Debug FLTK 64bits" />
+			<Option target="Debug FLTK 64bits asan" />
 		</Unit>
 		<Unit filename="../SquiLu-ext/mongoose.c">
 			<Option compilerVar="CC" />
@@ -877,6 +942,7 @@
 			<Option target="Release FLTK 64bits Computed Gotos" />
 			<Option target="Release 64bits static Library" />
 			<Option target="Debug FLTK 64bits" />
+			<Option target="Debug FLTK 64bits asan" />
 		</Unit>
 		<Unit filename="../SquiLu-ext/mongoose.h">
 			<Option target="Debug" />
@@ -895,6 +961,7 @@
 			<Option target="Release FLTK 64bits Computed Gotos" />
 			<Option target="Release 64bits static Library" />
 			<Option target="Debug FLTK 64bits" />
+			<Option target="Debug FLTK 64bits asan" />
 		</Unit>
 		<Unit filename="../SquiLu-ext/pdf-font.cpp">
 			<Option target="Debug" />
@@ -913,6 +980,7 @@
 			<Option target="Release FLTK 64bits Computed Gotos" />
 			<Option target="Release 64bits static Library" />
 			<Option target="Debug FLTK 64bits" />
+			<Option target="Debug FLTK 64bits asan" />
 		</Unit>
 		<Unit filename="../SquiLu-ext/pdf-font.h">
 			<Option target="Debug" />
@@ -931,6 +999,7 @@
 			<Option target="Release FLTK 64bits Computed Gotos" />
 			<Option target="Release 64bits static Library" />
 			<Option target="Debug FLTK 64bits" />
+			<Option target="Debug FLTK 64bits asan" />
 		</Unit>
 		<Unit filename="../SquiLu-ext/sq_axtls.c">
 			<Option compilerVar="CC" />
@@ -950,6 +1019,7 @@
 			<Option target="Release FLTK 64bits Computed Gotos" />
 			<Option target="Release 64bits static Library" />
 			<Option target="Debug FLTK 64bits" />
+			<Option target="Debug FLTK 64bits asan" />
 		</Unit>
 		<Unit filename="../SquiLu-ext/sq_base64.cpp">
 			<Option target="Debug" />
@@ -968,6 +1038,7 @@
 			<Option target="Release FLTK 64bits Computed Gotos" />
 			<Option target="Release 64bits static Library" />
 			<Option target="Debug FLTK 64bits" />
+			<Option target="Debug FLTK 64bits asan" />
 		</Unit>
 		<Unit filename="../SquiLu-ext/sq_decimal.cpp">
 			<Option target="Debug" />
@@ -985,6 +1056,7 @@
 			<Option target="Release FLTK 64bits Computed Gotos" />
 			<Option target="Release 64bits static Library" />
 			<Option target="Debug FLTK 64bits" />
+			<Option target="Debug FLTK 64bits asan" />
 		</Unit>
 		<Unit filename="../SquiLu-ext/sq_dns_sd.cpp" />
 		<Unit filename="../SquiLu-ext/sq_fastcgi.cpp">
@@ -1008,6 +1080,7 @@
 			<Option target="Release FLTK 64bits Computed Gotos" />
 			<Option target="Release 64bits static Library" />
 			<Option target="Debug FLTK 64bits" />
+			<Option target="Debug FLTK 64bits asan" />
 		</Unit>
 		<Unit filename="../SquiLu-ext/sq_fpdf.cpp">
 			<Option target="Debug" />
@@ -1026,6 +1099,7 @@
 			<Option target="Release FLTK 64bits Computed Gotos" />
 			<Option target="Release 64bits static Library" />
 			<Option target="Debug FLTK 64bits" />
+			<Option target="Debug FLTK 64bits asan" />
 		</Unit>
 		<Unit filename="../SquiLu-ext/sq_fs.c">
 			<Option compilerVar="CC" />
@@ -1045,6 +1119,7 @@
 			<Option target="Release FLTK 64bits Computed Gotos" />
 			<Option target="Release 64bits static Library" />
 			<Option target="Debug FLTK 64bits" />
+			<Option target="Debug FLTK 64bits asan" />
 		</Unit>
 		<Unit filename="../SquiLu-ext/sq_gumbo.cpp" />
 		<Unit filename="../SquiLu-ext/sq_markdown.cpp">
@@ -1063,6 +1138,7 @@
 			<Option target="Release FLTK 64bits Computed Gotos" />
 			<Option target="Release 64bits static Library" />
 			<Option target="Debug FLTK 64bits" />
+			<Option target="Debug FLTK 64bits asan" />
 		</Unit>
 		<Unit filename="../SquiLu-ext/sq_mix.cpp">
 			<Option target="Debug" />
@@ -1081,6 +1157,7 @@
 			<Option target="Release FLTK 64bits Computed Gotos" />
 			<Option target="Release 64bits static Library" />
 			<Option target="Debug FLTK 64bits" />
+			<Option target="Debug FLTK 64bits asan" />
 		</Unit>
 		<Unit filename="../SquiLu-ext/sq_mongoose.cpp">
 			<Option target="Debug" />
@@ -1099,6 +1176,7 @@
 			<Option target="Release FLTK 64bits Computed Gotos" />
 			<Option target="Release 64bits static Library" />
 			<Option target="Debug FLTK 64bits" />
+			<Option target="Debug FLTK 64bits asan" />
 		</Unit>
 		<Unit filename="../SquiLu-ext/sq_mysql.cpp" />
 		<Unit filename="../SquiLu-ext/sq_openssl.cpp">
@@ -1120,6 +1198,7 @@
 			<Option target="Release FLTK 64bits Computed Gotos" />
 			<Option target="Release 64bits static Library" />
 			<Option target="Debug FLTK 64bits" />
+			<Option target="Debug FLTK 64bits asan" />
 		</Unit>
 		<Unit filename="../SquiLu-ext/sq_postgresql.cpp">
 			<Option target="Debug" />
@@ -1137,6 +1216,7 @@
 			<Option target="Release FLTK 64bits Computed Gotos" />
 			<Option target="Release 64bits static Library" />
 			<Option target="Debug FLTK 64bits" />
+			<Option target="Debug FLTK 64bits asan" />
 		</Unit>
 		<Unit filename="../SquiLu-ext/sq_rs232.c">
 			<Option compilerVar="CC" />
@@ -1156,6 +1236,7 @@
 			<Option target="Release FLTK 64bits Computed Gotos" />
 			<Option target="Release 64bits static Library" />
 			<Option target="Debug FLTK 64bits" />
+			<Option target="Debug FLTK 64bits asan" />
 		</Unit>
 		<Unit filename="../SquiLu-ext/sq_slave_vm.cpp">
 			<Option target="Debug" />
@@ -1174,6 +1255,7 @@
 			<Option target="Release FLTK 64bits Computed Gotos" />
 			<Option target="Release 64bits static Library" />
 			<Option target="Debug FLTK 64bits" />
+			<Option target="Debug FLTK 64bits asan" />
 		</Unit>
 		<Unit filename="../SquiLu-ext/sq_socket.cpp">
 			<Option target="Debug" />
@@ -1192,6 +1274,7 @@
 			<Option target="Release FLTK 64bits Computed Gotos" />
 			<Option target="Release 64bits static Library" />
 			<Option target="Debug FLTK 64bits" />
+			<Option target="Debug FLTK 64bits asan" />
 		</Unit>
 		<Unit filename="../SquiLu-ext/sq_sqlite3.cpp">
 			<Option target="Debug" />
@@ -1210,6 +1293,7 @@
 			<Option target="Release FLTK 64bits Computed Gotos" />
 			<Option target="Release 64bits static Library" />
 			<Option target="Debug FLTK 64bits" />
+			<Option target="Debug FLTK 64bits asan" />
 		</Unit>
 		<Unit filename="../SquiLu-ext/sq_sqlite3.h" />
 		<Unit filename="../SquiLu-ext/sq_sys.cpp">
@@ -1232,6 +1316,7 @@
 			<Option target="Release FLTK 64bits Computed Gotos" />
 			<Option target="Release 64bits static Library" />
 			<Option target="Debug FLTK 64bits" />
+			<Option target="Debug FLTK 64bits asan" />
 		</Unit>
 		<Unit filename="../SquiLu-ext/sq_unql.cpp" />
 		<Unit filename="../SquiLu-ext/sq_zlib.cpp">
@@ -1251,6 +1336,7 @@
 			<Option target="Release FLTK 64bits Computed Gotos" />
 			<Option target="Release 64bits static Library" />
 			<Option target="Debug FLTK 64bits" />
+			<Option target="Debug FLTK 64bits asan" />
 		</Unit>
 		<Unit filename="../SquiLu-ext/sqlite3.c">
 			<Option compilerVar="CC" />
@@ -1270,6 +1356,7 @@
 			<Option target="Release FLTK 64bits Computed Gotos" />
 			<Option target="Release 64bits static Library" />
 			<Option target="Debug FLTK 64bits" />
+			<Option target="Debug FLTK 64bits asan" />
 		</Unit>
 		<Unit filename="../SquiLu-ext/sqlite3.h">
 			<Option target="Debug" />
@@ -1288,6 +1375,7 @@
 			<Option target="Release FLTK 64bits Computed Gotos" />
 			<Option target="Release 64bits static Library" />
 			<Option target="Debug FLTK 64bits" />
+			<Option target="Debug FLTK 64bits asan" />
 		</Unit>
 		<Unit filename="../SquiLu-ext/sqmodule.h">
 			<Option target="Debug" />
@@ -1306,6 +1394,7 @@
 			<Option target="Release FLTK 64bits Computed Gotos" />
 			<Option target="Release 64bits static Library" />
 			<Option target="Debug FLTK 64bits" />
+			<Option target="Debug FLTK 64bits asan" />
 		</Unit>
 		<Unit filename="../SquiLu-ext/sqratimport.cpp">
 			<Option target="Debug" />
@@ -1324,6 +1413,7 @@
 			<Option target="Release FLTK 64bits Computed Gotos" />
 			<Option target="Release 64bits static Library" />
 			<Option target="Debug FLTK 64bits" />
+			<Option target="Debug FLTK 64bits asan" />
 		</Unit>
 		<Unit filename="../SquiLu-ext/sqratimport.h">
 			<Option target="Debug" />
@@ -1342,6 +1432,7 @@
 			<Option target="Release FLTK 64bits Computed Gotos" />
 			<Option target="Release 64bits static Library" />
 			<Option target="Debug FLTK 64bits" />
+			<Option target="Debug FLTK 64bits asan" />
 		</Unit>
 		<Unit filename="../SquiLu-ext/tinyxml2.cpp">
 			<Option target="Debug" />
@@ -1360,6 +1451,7 @@
 			<Option target="Release FLTK 64bits Computed Gotos" />
 			<Option target="Release 64bits static Library" />
 			<Option target="Debug FLTK 64bits" />
+			<Option target="Debug FLTK 64bits asan" />
 		</Unit>
 		<Unit filename="../SquiLu-ext/tinyxml2.h">
 			<Option target="Debug" />
@@ -1378,6 +1470,7 @@
 			<Option target="Release FLTK 64bits Computed Gotos" />
 			<Option target="Release 64bits static Library" />
 			<Option target="Debug FLTK 64bits" />
+			<Option target="Debug FLTK 64bits asan" />
 		</Unit>
 		<Unit filename="dadbiz.rc">
 			<Option compilerVar="WINDRES" />
@@ -1410,6 +1503,7 @@
 			<Option target="Debug 64bits" />
 			<Option target="Release FLTK 64bits Computed Gotos" />
 			<Option target="Debug FLTK 64bits" />
+			<Option target="Debug FLTK 64bits asan" />
 		</Unit>
 		<Unit filename="sqstdlib/sqstdaux.cpp" />
 		<Unit filename="sqstdlib/sqstdblob.cpp" />