Updated binaries.

.gitignore

@@ -13,11 +13,16 @@
 !/devtools/.gitignore
 
 /docs/modules.html
+/docs/manuals.html
+
 __PAGES__/
+__MANPAGES__/
 
 /tmp/*
 !/tmp/.gitignore
 
 **/assets/mojo
 
+/modules/module-manager/downloads/*.zip
+
 Monkey2 (Windows).exe

README.TXT

@@ -1,4 +1,5 @@
 
+
 ***** Welcome to Monkey2! *****
 
 Emscripten support is currently WIP.
@@ -15,7 +16,7 @@ Sublime Text 3 is available here: http://monkey2.monkey-x.com/forums/forum/gener
 
 https://sourceforge.net/projects/mingw-w64/
 
-When installing, you should select 'i686' for 'architecture'; 'posix' for 'threads'; and 'dwarf' for 'exception'. 
+When installing, you should select 'i686' for 'architecture', 'posix' for 'threads' and 'dwarf' for 'exception'.
 
 There is also a self-extracting archive of mingw-64 that has been tested with monkey2 here:
 
@@ -30,12 +31,12 @@ If you install this to the monkey2 'devtools' directory, the following steps sho
 4) If all went well, you should end up with a 'Monkey2 (Windows)' exe in the monkey2 directory.
 
 5) You should now be able to build and run monkey2 apps. There is a simple 'hello-world.monkey2' test in the monkey2 
-directory, and some simple demos in the '/bananas' directory. Docs can be found at 'docs/index.html'.
+directory, and some simple demos in the '/bananas' directory.
 
 
 ***** Building monkey2 on MacOS/Linux *****
 
-1) Install the xcode command line tools. You can do this by entering 'xcode-select --install' in a shell.
+1) On MacoS, install the xcode command line tools. You can do this by entering 'xcode-select --install' in a shell.
 
 2) Open a shell and change to the 'monkey2/scripts' directory.
 
@@ -44,7 +45,7 @@ directory, and some simple demos in the '/bananas' directory. Docs can be found
 4) If all went well, you should end up with a 'Monkey2 (...)' app in the monkey2 directory.
 
 5) You should now be able to build and run monkey2 apps. There is a simple 'hello-world.monkey2' test in the monkey2
-directory, and some simple demos in the '/bananas' directory. Docs can be found at 'docs/index.html'.
+directory, and some simple demos in the '/bananas' directory.
 
 
 ***** More information *****
@@ -56,4 +57,3 @@ Monkey2 development blog: http://monkey2.monkey-x.com/
 Monkey2 development forums: http://monkey2.monkey-x.com/forums
 
 Monkey2 xmas 2015 demo: http://monkey2.monkey-x.com/2015/12/23/xmas-demo-2015/
-

bin/env_windows.txt

@@ -19,7 +19,7 @@ PATH=${MX2_HOME}\devtools\i686-5.3.0-posix-dwarf-rt_v4-rev0\mingw32\bin;${PATH}
 MX2_BUILD_DIR_DESKTOP_DEBUG=desktop_debug_windows
 MX2_BUILD_DIR_DESKTOP_RELEASE=desktop_release_windows
 
-MX2_LD_OPTS_DESKTOP=-m32 -static
+MX2_LD_OPTS_DESKTOP=-static -m32
 MX2_LD_OPTS_DESKTOP_DEBUG=
 MX2_LD_OPTS_DESKTOP_RELEASE=-s ' -Wl,--gc-sections 
 
@@ -31,6 +31,27 @@ MX2_CPP_OPTS_DESKTOP=-std=c++11 -m32
 MX2_CPP_OPTS_DESKTOP_DEBUG=
 MX2_CPP_OPTS_DESKTOP_RELEASE=-O3 -DNDEBUG ' -fvtable-gc -fdata-sections -ffunction-sections
 
+
+'***** ANDROID *****
+
+PATH=${MX2_HOME}\devtools\android-ndk-arm-12\bin;${PATH}
+
+MX2_BUILD_DIR_ANDROID_DEBUG=android_debug_windows
+MX2_BUILD_DIR_ANDROID_RELEASE=android_release_windows
+
+MX2_LD_OPTS_ANDROID=-shared -march=armv7-a -Wl,--fix-cortex-a8
+MX2_LD_OPTS_ANDROID_DEBUG=
+MX2_LD_OPTS_ANDROID_RELEASE=
+
+MX2_CC_OPTS_ANDROID=-std=gnu99 -march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16
+MX2_CC_OPTS_ANDROID_DEBUG=
+MX2_CC_OPTS_ANDROID_RELEASE=-O3 -DNDEBUG
+
+MX2_CPP_OPTS_ANDROID=-std=c++11 -march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16
+MX2_CPP_OPTS_ANDROID_DEBUG=
+MX2_CPP_OPTS_ANDROID_RELEASE=-O3 -DNDEBUG
+
+
 '***** EMSCRIPTEN *****
 
 'EM_CONFIG=C:\Users\Mark Sibly\.emscripten

scripts/common.bat

@@ -1,9 +1,9 @@
 
 set mx2cc=..\bin\mx2cc_windows.exe
-set mx2cc_new=..\src\mx2cc\mx2cc.buildv1.0.2\desktop_release_windows\mx2cc.exe
+set mx2cc_new=..\src\mx2cc\mx2cc.buildv1.0.3\desktop_release_windows\mx2cc.exe
 
 set ted2=..\bin\ted2_windows
-set ted2_new=..\src\ted2\ted2.buildv1.0.2\desktop_release_windows
+set ted2_new=..\src\ted2\ted2.buildv1.0.3\desktop_release_windows
 
 set launcher="..\Monkey2 (Windows).exe"
-set launcher_new=..\src\launcher\launcher.buildv1.0.2\desktop_release_windows\launcher.exe
+set launcher_new=..\src\launcher\launcher.buildv1.0.3\desktop_release_windows\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.2/desktop_release_linux/mx2cc"
+	mx2cc_new="../src/mx2cc/mx2cc.buildv1.0.3/desktop_release_linux/mx2cc"
 	
 	ted2="../bin/ted2_linux"
-	ted2_new="../src/ted2/ted2.buildv1.0.2/desktop_release_linux"
+	ted2_new="../src/ted2/ted2.buildv1.0.3/desktop_release_linux"
 	
 	launcher="../Monkey2 (Linux)"
-	launcher_new="../src/launcher/launcher.buildv1.0.2/desktop_release_linux/launcher"
+	launcher_new="../src/launcher/launcher.buildv1.0.3/desktop_release_linux/launcher"
 	
 else
 
 	mx2cc="../bin/mx2cc_macos"
-	mx2cc_new="../src/mx2cc/mx2cc.buildv1.0.2/desktop_release_macos/mx2cc"
+	mx2cc_new="../src/mx2cc/mx2cc.buildv1.0.3/desktop_release_macos/mx2cc"
 	
 	ted2="../bin/ted2_macos.app"
-	ted2_new="../src/ted2/ted2.buildv1.0.2/desktop_release_macos/ted2.app"
+	ted2_new="../src/ted2/ted2.buildv1.0.3/desktop_release_macos/ted2.app"
 	
 	launcher="../Monkey2 (Macos).app"
-	launcher_new="../src/launcher/launcher.buildv1.0.2/desktop_release_macos/launcher.app"
+	launcher_new="../src/launcher/launcher.buildv1.0.3/desktop_release_macos/launcher.app"
 fi

scripts/makedocs.bat

@@ -1,4 +1,4 @@
 
 echo off
 
-..\bin\mx2cc_windows makedocs monkey std mojo
+..\bin\mx2cc_windows makedocs 

scripts/makedocs.sh

@@ -1,5 +1,5 @@
 
 source common.sh
 
-$mx2cc makedocs monkey std mojo
+$mx2cc makedocs