浏览代码

Merged branch develop into master

Mark Sibly 8 年之前
父节点
当前提交
5b0c0f7b6b
共有 3 个文件被更改,包括 6 次插入5 次删除
  1. 3 3
      bin/env_windows.txt
  2. 2 2
      modules/mojox/action.monkey2
  3. 1 0
      src/createrelease/createrelease.monkey2

+ 3 - 3
bin/env_windows.txt

@@ -26,17 +26,17 @@ MX2_GCC_TOOLS_WINDOWS=${MX2_HOME}\devtools\i686-5.3.0-posix-dwarf-rt_v4-rev0\min
 'Linker options
 MX2_LD_OPTS_WINDOWS=-static -m32
 MX2_LD_OPTS_WINDOWS_DEBUG=
-MX2_LD_OPTS_WINDOWS_RELEASE=-O3 ' -Wl,--gc-sections 
+MX2_LD_OPTS_WINDOWS_RELEASE=-s -O3 '-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
+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
+MX2_CPP_OPTS_WINDOWS_RELEASE=-O3 -DNDEBUG '-fvtable-gc -fdata-sections -ffunction-sections
 
 
 '***** EMSCRIPTEN/WASM *****

+ 2 - 2
modules/mojox/action.monkey2

@@ -188,9 +188,9 @@ Class Action
 				Local actions:=_hotKeys[event.Key]
 				If Not actions Return
 
-				Local mods:=event.Modifiers
+				Local mods:=event.Modifiers & (Modifier.Shift|Modifier.Alt|Modifier.Control|Modifier.Gui)
 				mods|=Cast<Modifier>( (Int(mods) & $541) Shl 1 | (Int(mods) & $a82) Shr 1 )
-
+				
 				For Local action:=Eachin actions
 					If event.Key<>action._hotKey Continue
 					If mods<>action._hotKeyMods Continue

+ 1 - 0
src/createrelease/createrelease.monkey2

@@ -103,6 +103,7 @@ Function CopyRelease()
 
 	DeleteDir( output+"/src/c2mx2",True )
 	DeleteDir( output+"/src/mx23d",True )
+	DeleteDir( output+"/modules/linq",True )
 	DeleteDir( output+"/modules/bullet",True )
 	DeleteDir( output+"/modules/gles30",True )