Browse Source

Updated binaries.

Mark Sibly 9 years ago
parent
commit
86e13ec3ba
6 changed files with 45 additions and 119 deletions
  1. BIN
      LICENSE.TXT
  2. 0 2
      README.TXT
  3. 14 38
      bin/env_linux.txt
  4. 13 41
      bin/env_macos.txt
  5. 18 38
      bin/env_windows.txt
  6. BIN
      bin/mx2cc_windows.exe

BIN
LICENSE.TXT


+ 0 - 2
README.TXT

@@ -4,8 +4,6 @@
 
 WARNING: The master branch is super-volatile. Grabbing the most recently tagged branch is recommended if you just want to monkey2 a try.
 
-iOS support currently MIA but on the way.
-
 
 ***** Building monkey2 on Windows *****
 

+ 14 - 38
bin/env_linux.txt

@@ -1,63 +1,39 @@
 
-'***** COMMON *****
-
-MX2_VERSION=002
-MX2_BUILDV=002
-
-MX2_BUILD_VERBOSE=0
-
-MX2_MODULES_VERSION=003
-MX2_PRODUCT_VERSION=003
-
-'***** DESKTOP *****
-
-'LD options
-MX2_LD_OPTS_DESKTOP=
-MX2_LD_OPTS_DESKTOP_DEBUG=-O0 '-g
-MX2_LD_OPTS_DESKTOP_RELEASE=-O3 -s
-
-'C compiler options
-MX2_CC_OPTS_DESKTOP=-std=gnu99
-MX2_CC_OPTS_DESKTOP_DEBUG=-O0 '-g
-MX2_CC_OPTS_DESKTOP_RELEASE=-O3 -DNDEBUG
-
-'C++ compiler options
-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_DEBUG=
 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_DEBUG=
 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_DEBUG=
 MX2_CPP_OPTS_LINUX_RELEASE=-O3 -DNDEBUG
 
+
 '***** EMSCRIPTEN *****
 
+'For emscripten builds, you need emcc, em++ and emar in your PATH.
+'To run emscripten apps, you'll need MonkeyXFree86c in your devtools dir.
 MX2_MSERVER="${MX2_HOME}/devtools/MonkeyXFree86c/bin/mserver_linux"
 
-MX2_BUILD_DIR_EMSCRIPTEN_DEBUG=emscripten_debug
-MX2_BUILD_DIR_EMSCRIPTEN_RELEASE=emscripten_release
-
+'LD options
 MX2_LD_OPTS_EMSCRIPTEN=-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
-MX2_LD_OPTS_EMSCRIPTEN_DEBUG=-O2
+MX2_LD_OPTS_EMSCRIPTEN_DEBUG=
 MX2_LD_OPTS_EMSCRIPTEN_RELEASE=-O3
 
+'C compiler options
 MX2_CC_OPTS_EMSCRIPTEN=-std=gnu99 -I. -s USE_SDL=2 -s FULL_ES2=1 -s TOTAL_MEMORY=67108864 -s DISABLE_EXCEPTION_CATCHING=1 -Wno-warn-absolute-paths ' -s USE_PTHREADS=1 -s PTHREAD_POOL_SIZE=1 -Wno-undefined-bool-conversion -Wno-inconsistent-missing-override -Wno-logical-op-parentheses -Wno-warn-absolute-paths 
-MX2_CC_OPTS_EMSCRIPTEN_DEBUG=-O2
-MX2_CC_OPTS_EMSCRIPTEN_RELEASE=-O3
+MX2_CC_OPTS_EMSCRIPTEN_DEBUG=
+MX2_CC_OPTS_EMSCRIPTEN_RELEASE=-O3 -DNDEBUG
 
+'C++ compiler options
 MX2_CPP_OPTS_EMSCRIPTEN=-std=c++11 -I. -s USE_SDL=2 -s FULL_ES2=1 -s TOTAL_MEMORY=67108864 -s DISABLE_EXCEPTION_CATCHING=1 -Wno-warn-absolute-paths ' -s USE_PTHREADS=1 -s PTHREAD_POOL_SIZE=1 -Wno-undefined-bool-conversion
-MX2_CPP_OPTS_EMSCRIPTEN_DEBUG=-O2
-MX2_CPP_OPTS_EMSCRIPTEN_RELEASE=-O3
+MX2_CPP_OPTS_EMSCRIPTEN_DEBUG=
+MX2_CPP_OPTS_EMSCRIPTEN_RELEASE=-O3 -DNDEBUG

+ 13 - 41
bin/env_macos.txt

@@ -1,42 +1,10 @@
 
-'***** IMPORTANT ******
-
 'If you change anything in this file, you should rebuild all!
 
-
-'***** COMMON *****
-
-MX2_VERSION=002
-MX2_BUILDV=002
-
-MX2_BUILD_VERBOSE=0
-
-MX2_MODULES_VERSION=003
-MX2_PRODUCT_VERSION=003
-
-'These relative to app exe
+'Hacks for dylibs in app
 MX2_APP_DIR_DYLIB=						'ie: dylibs go in app Contents/MacOS dir
 MX2_APP_DIR_FRAMEWORK=../Frameworks		'ie: frameworks go in app Contents/Frameworks dir
 
-'***** DESKTOP *****
-
-'LD options
-MX2_LD_OPTS_DESKTOP=-Wl,-rpath,@executable_path -Wl,-rpath,@executable_path/../Frameworks
-MX2_LD_OPTS_DESKTOP_DEBUG=-O0 '-g
-MX2_LD_OPTS_DESKTOP_RELEASE=-O3
-
-'C compiler options
-MX2_CC_OPTS_DESKTOP=-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_DESKTOP_DEBUG=-O0 '-g
-MX2_CC_OPTS_DESKTOP_RELEASE=-O3 -DNDEBUG
-
-'C++ compiler options
-MX2_CPP_OPTS_DESKTOP=-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_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
@@ -55,36 +23,40 @@ MX2_CPP_OPTS_MACOS_RELEASE=-O3 -DNDEBUG
 
 '***** EMSCRIPTEN *****
 
-' For emscripten builds, you need emcc, em++ and emar in your PATH.
-'
-' To run emscripten apps, you need 'MonkeyXFree86c' in your devtools dir.
-
-'Need this 'coz Mac is getting seriously locked down...
+'For emscripten builds, you need emcc, em++ and emar in your PATH.
 '
+'Alas, modern macos apps no longer inherit PATH settings so we need to harccode in some in.
+'These may need to be changed depending on where you install emscripten.
 EMSCRIPTEN=${HOME}/emsdk/emscripten/1.35.0
 PATH=${HOME}/emsdk:${HOME}/emsdk/clang/e1.35.0_64bit:${HOME}/emsdk/node/0.12.2_64bit/bin:${HOME}/emsdk/emscripten/1.35.0:${PATH}
 
 'El Capitan broke my python...
-'
 PATH=/usr/local/bin:${PATH}
 
-MX2_BUILD_DIR_EMSCRIPTEN_DEBUG=emscripten_debug
-MX2_BUILD_DIR_EMSCRIPTEN_RELEASE=emscripten_release
+'To run emscripten apps, you'll need MonkeyXFree86c in your devtools dir.
+MX2_MSERVER=open "${MX2_HOME}/devtools/mserver-v86c/mserver_macos.app" --args
 
+'LD options
 MX2_LD_OPTS_EMSCRIPTEN=-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
 MX2_LD_OPTS_EMSCRIPTEN_DEBUG=-O0	'-O2
 MX2_LD_OPTS_EMSCRIPTEN_RELEASE=-O3
 
+'C compiler options
 MX2_CC_OPTS_EMSCRIPTEN=-std=gnu99 -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 -Wno-inconsistent-missing-override -Wno-logical-op-parentheses -Wno-warn-absolute-paths 
 MX2_CC_OPTS_EMSCRIPTEN_DEBUG=-O0	'-O2
 MX2_CC_OPTS_EMSCRIPTEN_RELEASE=-O3
 
+'C++ compiler options
 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 *****
 
+PATH=${HOME}/Library/Android/sdk/ndk-bundle:${PATH}
+
+
 '***** IOS *****
 
 MX2_SDKROOT=/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS9.3.sdk

+ 18 - 38
bin/env_windows.txt

@@ -1,73 +1,55 @@
 
-'***** COMMON *****
+'If you change anything in this file, you should rebuild all!
 
-MX2_BUILD_VERBOSE=0
 
+'***** WINDOWS TARGET *****
 
-'***** DESKTOP *****
+'(Note: Don't use TDM GCC, as it uses SJLJ exceptions which are very slow)
 
+'Need this to override installed mingws.
 GCC_EXEC_PREFIX=
 
-'for TDM gcc, but don't use 'coz SJLJ exceptions suck.
-'PATH=${MX2_HOME}\devtools\TDM-GCC-64-4.9.2\bin;${PATH}
-
-'for 32 bit apps
+'Mingw-64 for 32 bit apps.
 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...
+'Mingw-64 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}
 
-'windows target
-'
+'Linker options
 MX2_LD_OPTS_WINDOWS=-static -m32
 MX2_LD_OPTS_WINDOWS_DEBUG=
 MX2_LD_OPTS_WINDOWS_RELEASE=-s ' -Wl,--gc-sections 
 
+'C Compiler options
 MX2_CC_OPTS_WINDOWS=-std=gnu99 -m32
 MX2_CC_OPTS_WINDOWS_DEBUG=
 MX2_CC_OPTS_WINDOWS_RELEASE=-O3 -DNDEBUG ' -fdata-sections -ffunction-sections
 
+'C++ Compiler options
 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 
-
-MX2_CC_OPTS_DESKTOP=-std=gnu99 -m32
-MX2_CC_OPTS_DESKTOP_DEBUG=
-MX2_CC_OPTS_DESKTOP_RELEASE=-O3 -DNDEBUG ' -fdata-sections -ffunction-sections
-
-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
-
 
 '***** EMSCRIPTEN *****
 
-'Note:
+'Forbuild emscripten apps, you'll need to download and install emscripten.
 '
-' For emscripten builds, you'll need to ensure emcc, em++ and emar are usable from the command line.
-'
-' To run emscripten apps, you need to set MX2_SERVER
-'
-
-MX2_MSERVER="${MX2_HOME}\devtools\MonkeyXFree86c\bin\mserver_winnt"
+'To run emscripten apps, you'll need MonkeyXFree86c in your devtools directory.
 
-MX2_BUILD_DIR_EMSCRIPTEN_DEBUG=emscripten_debug
-MX2_BUILD_DIR_EMSCRIPTEN_RELEASE=emscripten_release
+MX2_MSERVER="${MX2_HOME}\devtools\mserver-v86c\mserver_winnt.exe"
 
+'Linker options
 MX2_LD_OPTS_EMSCRIPTEN=-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
 MX2_LD_OPTS_EMSCRIPTEN_DEBUG=-O0	'-O2
 MX2_LD_OPTS_EMSCRIPTEN_RELEASE=-O3
 
+'C Compiler options
 MX2_CC_OPTS_EMSCRIPTEN=-std=gnu99 -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 -Wno-inconsistent-missing-override -Wno-logical-op-parentheses -Wno-warn-absolute-paths 
 MX2_CC_OPTS_EMSCRIPTEN_DEBUG=-O0	'-O2
 MX2_CC_OPTS_EMSCRIPTEN_RELEASE=-O3
 
+'C++ Compiler options
 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
@@ -75,10 +57,8 @@ MX2_CPP_OPTS_EMSCRIPTEN_RELEASE=-O3
 
 '***** ANDROID *****
 
-'Notes:
-'
-' This is where *my* ndk-bundle is located - yours is probably somewhere else!
-'
-' For android builds, you need to either set this correctly or make sure 'ndk-build' is in your system PATH.
+'This is where *my* ndk-bundle is located - yours is probably somewhere else!
 '
+'For android builds, you need to either set this correctly or make sure 'ndk-build' is in your system PATH.
+
 PATH=D:\devtools\Android\sdk\ndk-bundle;${PATH}

BIN
bin/mx2cc_windows.exe