diff --git a/CHANGES b/CHANGES index 0075b1d6..3049ad41 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,4 @@ -2010-??-?? : 1.8.2 +2011-09-10 : 1.8.2 vm : use 15 digits (instead of 10) for float display std : allow up to 512MB array/string size in serialize (instead of 1MB) std : bugfix in utf8 (with 4 bytes codes) diff --git a/Makefile b/Makefile index 0960e393..adee5296 100644 --- a/Makefile +++ b/Makefile @@ -53,12 +53,12 @@ OSX_UNIVERSAL=1 endif ifeq (${MACOSX}, 1) -export MACOSX_DEPLOYMENT_TARGET=10.3 +export MACOSX_DEPLOYMENT_TARGET=10.4 EXTFLAGS = MAKESO = ${CC} LIBNEKO_NAME = libneko.dylib LIBNEKO_INSTALL = -install_name @executable_path/${LIBNEKO_NAME} -LIBNEKO_LIBS = -ldl -lgc -lm -dynamiclib -single_module ${LIBNEKO_INSTALL} +LIBNEKO_LIBS = -ldl /opt/local/lib/libgc.a -lm -dynamiclib -single_module ${LIBNEKO_INSTALL} NEKOVM_FLAGS = -L${PWD}/bin -lneko STD_NDLL_FLAGS = -bundle -undefined dynamic_lookup ${NEKOVM_FLAGS} CFLAGS += -L/usr/local/lib -L/opt/local/lib -I/opt/local/include diff --git a/bin/release.neko b/bin/release.neko index a33a1631..3bd2db3f 100644 --- a/bin/release.neko +++ b/bin/release.neko @@ -62,7 +62,7 @@ if( $loader.args[0] == "-src" ) { cmd("rm -rf */*.o */*/*.o"); cmd("rm -rf src/*.n src/*/*.n src/*.neko src/neko/*.neko src/nekoml/*.neko"); cmd("rm -rf src/nekoc.exe src/nekoml.exe src/nekotools.exe"); - cmd("rm -rf */debug */release */*/debug */*/release"); + cmd("rm -rf */debug */release */*/debug */*/release */.svn */*/.svn */*/*/.svn"); cmd("rm -rf libs/include libs/mod_neko/debug2 libs/mod_neko/release2 libs/std/std2.sln"); cmd("rm -rf libs/mysql/debug5 libs/mysql/release5"); cmd("rm -rf libs/mod_tora/debug2 libs/mod_tora/release2 libs/mod_tora/server/CVS libs/mod_tora/server/.cvsignore libs/mod_tora/server/*.n"); diff --git a/src/tools/install.neko b/src/tools/install.neko index 9fee2227..77dc73c5 100644 --- a/src/tools/install.neko +++ b/src/tools/install.neko @@ -147,6 +147,7 @@ search_includes = function(isap2) { "/usr/include/gtk-2.0", "/opt/local/include", "/opt/local/include/mysql", + "/opt/local/include/mysql5/mysql", "/Developer/Headers/FlatCarbon", ); var inc2; @@ -171,6 +172,7 @@ search_includes = function(isap2) { "/usr/include/apache-1.3", "/usr/include/httpd", "/opt/local/include/apache", + "/opt/local/include/httpd", "/usr/local/apache/include" ); return $aconcat($array(inc1,inc2)); @@ -186,6 +188,7 @@ libraries = $array( "/usr/local/lib/mysql", "/opt/local/lib", "/opt/local/lib/mysql", + "/opt/local/lib/mysql5/mysql", ); exec = function(cmd) { diff --git a/vm/main.c b/vm/main.c index b2e029e4..23c42cfa 100644 --- a/vm/main.c +++ b/vm/main.c @@ -239,7 +239,7 @@ int main( int argc, char *argv[] ) { # ifdef NEKO_STANDALONE report(vm,alloc_string("No embedded module in this executable"),0); # else - printf("NekoVM %d.%d.%d (c)2005-2009 Motion-Twin\n Usage : neko \n",NEKO_VERSION/100,(NEKO_VERSION/10)%10,NEKO_VERSION%10); + printf("NekoVM %d.%d.%d (c)2005-2011 Motion-Twin\n Usage : neko \n",NEKO_VERSION/100,(NEKO_VERSION/10)%10,NEKO_VERSION%10); # endif mload = NULL; r = 1; diff --git a/vm/neko.h b/vm/neko.h index aae28c31..78b9ad90 100644 --- a/vm/neko.h +++ b/vm/neko.h @@ -81,7 +81,7 @@ # include #endif -#define NEKO_VERSION 181 +#define NEKO_VERSION 182 typedef intptr_t int_val;