Updated binaries.

.gitignore

@@ -12,6 +12,8 @@
 /devtools/*
 !/devtools/.gitignore
 
+*.products/
+
 /docs/modules.html
 /docs/manuals.html
 
@@ -23,7 +25,11 @@ __MANPAGES__/
 
 /modules/module-manager/downloads/*.zip
 
+/modules/cmark
+/modules/lua
 /modules/wdw-game2d
 /modules/portmidi
 
+/modules/module-manager/backups
+
 Monkey2 (Windows).exe

README.TXT

@@ -2,9 +2,7 @@
 
 ***** Welcome to Monkey2! *****
 
-Emscripten support is currently WIP.
-
-Android and iOS support are currently MIA (but on the way).
+iOS support are currently MIA (but on the way).
 
 The Ted2 IDE is currently very minimal. If you find it a little *too* minimal, a package for integrating monkey2 with 
 Sublime Text 3 is available here: http://monkey2.monkey-x.com/forums/forum/general-programming-discussion/

bin/env_linux.txt

@@ -11,9 +11,6 @@ MX2_PRODUCT_VERSION=003
 
 '***** DESKTOP *****
 
-MX2_BUILD_DIR_DESKTOP_DEBUG=desktop_debug_linux
-MX2_BUILD_DIR_DESKTOP_RELEASE=desktop_release_linux
-
 'LD options
 MX2_LD_OPTS_DESKTOP=
 MX2_LD_OPTS_DESKTOP_DEBUG=-O0 '-g
@@ -29,6 +26,23 @@ MX2_CPP_OPTS_DESKTOP=-std=c++11
 MX2_CPP_OPTS_DESKTOP_DEBUG=-O0 '-g
 MX2_CPP_OPTS_DESKTOP_RELEASE=-O3 -DNDEBUG
 
+'***** LINUX *****
+
+'LD options
+MX2_LD_OPTS_LINUX=
+MX2_LD_OPTS_LINUX_DEBUG=-O0 '-g
+MX2_LD_OPTS_LINUX_RELEASE=-O3 -s
+
+'C compiler options
+MX2_CC_OPTS_LINUX=-std=gnu99
+MX2_CC_OPTS_LINUX_DEBUG=-O0 '-g
+MX2_CC_OPTS_LINUX_RELEASE=-O3 -DNDEBUG
+
+'C++ compiler options
+MX2_CPP_OPTS_LINUX=-std=c++11
+MX2_CPP_OPTS_LINUX_DEBUG=-O0 '-g
+MX2_CPP_OPTS_LINUX_RELEASE=-O3 -DNDEBUG
+
 '***** EMSCRIPTEN *****
 
 MX2_MSERVER="${MX2_HOME}/devtools/MonkeyXFree86c/bin/mserver_linux"

bin/env_macos.txt

@@ -20,9 +20,6 @@ MX2_APP_DIR_FRAMEWORK=../Frameworks		'ie: frameworks go in app Contents/Framewor
 
 '***** DESKTOP *****
 
-MX2_BUILD_DIR_DESKTOP_DEBUG=desktop_debug_macos
-MX2_BUILD_DIR_DESKTOP_RELEASE=desktop_release_macos
-
 'LD options
 MX2_LD_OPTS_DESKTOP=-Wl,-rpath,@executable_path -Wl,-rpath,@executable_path/../Frameworks
 MX2_LD_OPTS_DESKTOP_DEBUG=-O0 '-g
@@ -38,6 +35,23 @@ MX2_CPP_OPTS_DESKTOP=-std=c++11 -Wno-deprecated-declarations -Wno-tautological-p
 MX2_CPP_OPTS_DESKTOP_DEBUG=-O0 '-g
 MX2_CPP_OPTS_DESKTOP_RELEASE=-O3 -DNDEBUG
 
+'***** MACOS *****
+
+'LD options
+MX2_LD_OPTS_MACOS=-Wl,-rpath,@executable_path -Wl,-rpath,@executable_path/../Frameworks
+MX2_LD_OPTS_MACOS_DEBUG=-O0 '-g
+MX2_LD_OPTS_MACOS_RELEASE=-O3
+
+'C compiler options
+MX2_CC_OPTS_MACOS=-std=gnu99 -Wno-deprecated-declarations -Wno-tautological-pointer-compare -Wno-undefined-bool-conversion -Wno-int-to-void-pointer-cast -Wno-inconsistent-missing-override -Wno-logical-op-parentheses -Wno-parentheses-equality
+MX2_CC_OPTS_MACOS_DEBUG=-O0 '-g
+MX2_CC_OPTS_MACOS_RELEASE=-O3 -DNDEBUG
+
+'C++ compiler options
+MX2_CPP_OPTS_MACOS=-std=c++11 -Wno-deprecated-declarations -Wno-tautological-pointer-compare -Wno-undefined-bool-conversion -Wno-int-to-void-pointer-cast -Wno-inconsistent-missing-override -Wno-logical-op-parentheses -Wno-parentheses-equality
+MX2_CPP_OPTS_MACOS_DEBUG=-O0 '-g
+MX2_CPP_OPTS_MACOS_RELEASE=-O3 -DNDEBUG
+
 
 '***** EMSCRIPTEN *****
 
@@ -68,3 +82,24 @@ MX2_CC_OPTS_EMSCRIPTEN_RELEASE=-O3
 MX2_CPP_OPTS_EMSCRIPTEN=-std=c++11 -s USE_SDL=2 -s FULL_ES2=1 -s TOTAL_MEMORY=67108864 -s DISABLE_EXCEPTION_CATCHING=1 ' -s USE_PTHREADS=1 -s PTHREAD_POOL_SIZE=1 -Wno-undefined-bool-conversion
 MX2_CPP_OPTS_EMSCRIPTEN_DEBUG=-O0	'-O2
 MX2_CPP_OPTS_EMSCRIPTEN_RELEASE=-O3
+
+'***** ANDROID *****
+
+'***** IOS *****
+
+MX2_SDKROOT=/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS9.3.sdk
+
+'LD options
+MX2_LD_OPTS_IOS=-arch armv7 -isysroot ${MX2_SDKROOT}
+MX2_LD_OPTS_IOS_DEBUG=-O0 -g
+MX2_LD_OPTS_IOS_RELEASE=-O3
+
+'C compiler options
+MX2_CC_OPTS_IOS=-std=gnu99 -arch armv7 -isysroot ${MX2_SDKROOT} -Wno-deprecated-declarations -Wno-tautological-pointer-compare -Wno-undefined-bool-conversion -Wno-int-to-void-pointer-cast -Wno-inconsistent-missing-override -Wno-logical-op-parentheses -Wno-parentheses-equality
+MX2_CC_OPTS_IOS_DEBUG=-O0 -g
+MX2_CC_OPTS_IOS_RELEASE=-O3 -DNDEBUG
+
+'C++ compiler options
+MX2_CPP_OPTS_IOS=-std=c++11 -arch armv7 -isysroot ${MX2_SDKROOT} -Wno-deprecated-declarations -Wno-tautological-pointer-compare -Wno-undefined-bool-conversion -Wno-int-to-void-pointer-cast -Wno-inconsistent-missing-override -Wno-logical-op-parentheses -Wno-parentheses-equality
+MX2_CPP_OPTS_IOS_DEBUG=-O0 -g
+MX2_CPP_OPTS_IOS_RELEASE=-O3 -DNDEBUG

bin/env_windows.txt

@@ -3,6 +3,7 @@
 
 MX2_BUILD_VERBOSE=0
 
+
 '***** DESKTOP *****
 
 GCC_EXEC_PREFIX=
@@ -16,9 +17,22 @@ PATH=${MX2_HOME}\devtools\i686-5.3.0-posix-dwarf-rt_v4-rev0\mingw32\bin;${PATH}
 'for 64 bit apps, but don't use 'coz no 64 bit angle lib yet...
 'PATH=${MX2_HOME}\devtools\x86_64-5.3.0-posix-seh-rt_v4-rev0\mingw64\bin;${PATH}
 
-MX2_BUILD_DIR_DESKTOP_DEBUG=desktop_debug_windows
-MX2_BUILD_DIR_DESKTOP_RELEASE=desktop_release_windows
+'windows target
+'
+MX2_LD_OPTS_WINDOWS=-static -m32
+MX2_LD_OPTS_WINDOWS_DEBUG=
+MX2_LD_OPTS_WINDOWS_RELEASE=-s ' -Wl,--gc-sections 
+
+MX2_CC_OPTS_WINDOWS=-std=gnu99 -m32
+MX2_CC_OPTS_WINDOWS_DEBUG=
+MX2_CC_OPTS_WINDOWS_RELEASE=-O3 -DNDEBUG ' -fdata-sections -ffunction-sections
 
+MX2_CPP_OPTS_WINDOWS=-std=c++11 -m32
+MX2_CPP_OPTS_WINDOWS_DEBUG=
+MX2_CPP_OPTS_WINDOWS_RELEASE=-O3 -DNDEBUG ' -fvtable-gc -fdata-sections -ffunction-sections
+
+'desktop target
+'
 MX2_LD_OPTS_DESKTOP=-static -m32
 MX2_LD_OPTS_DESKTOP_DEBUG=
 MX2_LD_OPTS_DESKTOP_RELEASE=-s ' -Wl,--gc-sections 

scripts/common.bat

@@ -1,9 +1,9 @@
 
 set mx2cc=..\bin\mx2cc_windows.exe
-set mx2cc_new=..\src\mx2cc\mx2cc.buildv1.0.4\windows_release\mx2cc.exe
+set mx2cc_new=..\src\mx2cc\mx2cc.buildv1.0.5\windows_release\mx2cc.exe
 
 set ted2=..\bin\ted2_windows
-set ted2_new=..\src\ted2\ted2.buildv1.0.4\windows_release
+set ted2_new=..\src\ted2\ted2.buildv1.0.5\windows_release
 
 set launcher="..\Monkey2 (Windows).exe"
-set launcher_new=..\src\launcher\launcher.buildv1.0.4\windows_release\launcher.exe
+set launcher_new=..\src\launcher\launcher.buildv1.0.5\windows_release\launcher.exe

scripts/common.sh

@@ -10,22 +10,22 @@ if [ "$OSTYPE" = "linux-gnu" ]
 then
 
 	mx2cc="../bin/mx2cc_linux"
-	mx2cc_new="../src/mx2cc/mx2cc.buildv1.0.4/linux_release/mx2cc"
+	mx2cc_new="../src/mx2cc/mx2cc.buildv1.0.5/linux_release/mx2cc"
 	
 	ted2="../bin/ted2_linux"
-	ted2_new="../src/ted2/ted2.buildv1.0.4/linux_release"
+	ted2_new="../src/ted2/ted2.buildv1.0.5/linux_release"
 	
 	launcher="../Monkey2 (Linux)"
-	launcher_new="../src/launcher/launcher.buildv1.0.4/linux_release/launcher"
+	launcher_new="../src/launcher/launcher.buildv1.0.5/linux_release/launcher"
 	
 else
 
 	mx2cc="../bin/mx2cc_macos"
-	mx2cc_new="../src/mx2cc/mx2cc.buildv1.0.4/macos_release/mx2cc"
+	mx2cc_new="../src/mx2cc/mx2cc.buildv1.0.5/macos_release/mx2cc"
 	
 	ted2="../bin/ted2_macos.app"
-	ted2_new="../src/ted2/ted2.buildv1.0.4/macos_release/ted2.app"
+	ted2_new="../src/ted2/ted2.buildv1.0.5/macos_release/ted2.app"
 	
 	launcher="../Monkey2 (Macos).app"
-	launcher_new="../src/launcher/launcher.buildv1.0.4/macos_release/launcher.app"
+	launcher_new="../src/launcher/launcher.buildv1.0.5/macos_release/launcher.app"
 fi

scripts/rebuildted2.bat

@@ -8,7 +8,9 @@ echo ***** Rebuilding ted2 *****
 echo.
 
 %mx2cc% makeapp -clean -apptype=gui -build -config=release -target=desktop ../src/ted2/ted2.monkey2
-xcopy %ted2_new% %ted2% /I /S /Y
+xcopy %ted2_new%\assets %ted2%\assets /Q /I /S /Y
+xcopy %ted2_new%\*.dll %ted2% /Q /I /S /Y
+xcopy %ted2_new%\*.exe %ted2% /Q /I /S /Y
 
 %mx2cc% makeapp -clean -apptype=gui -build -config=release -target=desktop ../src/launcher/launcher.monkey2
 copy %launcher_new% %launcher%

scripts/rebuildted2.sh

@@ -13,9 +13,11 @@ if [ "$OSTYPE" = "linux-gnu" ]
 then
 
 	rm -r -f "$ted2"
-	cp -R "$ted2_new" "$ted2"
+	mkdir "$ted2"
+	cp -R "$ted2_new/assets" "$ted2/assets"
+	cp "$ted2_new/ted2" "$ted2/ted2"
 	rm -r -f "$launcher"
-	cp -R "$launcher_new" "$launcher"
+	cp "$launcher_new" "$launcher"
 
 else
 

scripts/updateted2.bat

@@ -8,7 +8,9 @@ echo ***** Updating ted2 *****
 echo.
 
 %mx2cc% makeapp -apptype=gui -build -config=release -target=desktop ../src/ted2/ted2.monkey2
-xcopy %ted2_new% %ted2% /I /S /Y
+xcopy %ted2_new%\assets %ted2%\assets /Q /I /S /Y
+xcopy %ted2_new%\*.dll %ted2% /Q /I /S /Y
+xcopy %ted2_new%\*.exe %ted2% /Q /I /S /Y
 
 %mx2cc% makeapp -apptype=gui -build -config=release -target=desktop ../src/launcher/launcher.monkey2
 copy %launcher_new% %launcher%

scripts/updateted2.sh

@@ -13,9 +13,11 @@ if [ "$OSTYPE" = "linux-gnu" ]
 then
 
 	rm -r -f "$ted2"
-	cp -R "$ted2_new" "$ted2"
+	mkdir "$ted2"
+	cp -R "$ted2_new/assets" "$ted2/assets"
+	cp "$ted2_new/ted2" "$ted2/ted2"
 	rm -r -f "$launcher"
-	cp -R "$launcher_new" "$launcher"
+	cp "$launcher_new" "$launcher"
 
 else