소스 검색

Cleanups.

Mark Sibly 7 년 전
부모
커밋
3c3ffc9454
3개의 변경된 파일14개의 추가작업 그리고 5개의 파일을 삭제
  1. 1 1
      ABOUT.HTML
  2. 5 1
      bin/env_windows.txt
  3. 8 3
      modules/monkey/newdocs/sdks.md

+ 1 - 1
ABOUT.HTML

@@ -45,7 +45,7 @@ a:hover{
 
 <body>
 
-<h1>Monkey2 v1.1.10</h1>
+<h1>Monkey2 v1.1.11</h1>
 
 <p>Welcome to monkey2, an open source, user friendly, cross platform programming language by Mark Sibly.
 

+ 5 - 1
bin/env_windows.txt

@@ -116,7 +116,11 @@ PATH=${EMSDK}\emscripten\1.37.35;${PATH}
 
 'Add mserver_winnt emscripten mini-server/launcher.
 '
-MX2_MSERVER="${EMSDK}\mserver-v86c\mserver_winnt.exe"
+MX2_MSERVER="${MX2_HOME}\devtools\mserver-v86c\mserver_winnt.exe"
+
+'If you have installed the emsdk download from monkeycoder, you can use this one instead...
+'
+'MX2_MSERVER="${EMSDK}\mserver-v86c\mserver_winnt.exe"
 
 'Linker options
 MX2_LD_OPTS_EMSCRIPTEN=-s USE_SDL=2 -s TOTAL_MEMORY=536870912 -s DISABLE_EXCEPTION_CATCHING=1

+ 8 - 3
modules/monkey/newdocs/sdks.md

@@ -5,6 +5,7 @@
 
 Monkey2 target SDKs.
 
+
 @#### The Windows Desktop Target
 
 Monkey2 can use either the mingw or msvc express 2015 compilers to build desktop apps.
@@ -42,11 +43,15 @@ sudo apt-get install g++-multilib libglu1-mesa-dev libopenal-dev libxi-dev libxr
 ```
 
 
-@#### The Emscripten and Wasm Targets
+@#### The Emscripten Target
+
+Monkey2 uses the emscripten sdk compilers and tools to build wasm and asm.js apps.
+
+For 64 bit windows, there is an experimental emscripten sdk download available from [[http://monkeycoder.co.nz/monkey2-files/]].
 
-Monkey2 uses the emscripten sdk compilers and tools to build emscripten and wasm apps.
+For all other desktop targets, you will need to install emscripten yourself. More info here: [[https://github.com/juj/emsdk/blob/master/README.md]].
 
-To install the emscripten sdk, please see this page: [[https://github.com/juj/emsdk/blob/master/README.md]].
+You will also need the mserver ('mini server') app if you want to be able to launch emscripten apps from Ted2 or Ted2go. This can also be downloaded from [[http://monkeycoder.co.nz/monkey2-files/]].
 
 
 @#### The Android Target