소스 검색

Updated env_windows.txt

Mark Sibly 8 년 전
부모
커밋
e216974b90
3개의 변경된 파일12개의 추가작업 그리고 5개의 파일을 삭제
  1. 6 2
      bin/env_windows.txt
  2. 3 3
      modules/mojo3d/graphics/entity.monkey2
  3. 3 0
      modules/sdl2/makefile_windows.monkey2

+ 6 - 2
bin/env_windows.txt

@@ -37,11 +37,15 @@ MX2_CPP_OPTS_WINDOWS_RELEASE=-O3 -DNDEBUG
 
 
 MX2_USE_MSVC=0
 MX2_USE_MSVC=0
 
 
+'https://en.wikipedia.org/wiki/Microsoft_Windows_SDK
+'
+MX2_WINDOWS_KIT=10.0.15063.0
+
 PATH=${ProgramFiles(x86)}\Microsoft Visual Studio 14.0\VC\bin;${PATH}
 PATH=${ProgramFiles(x86)}\Microsoft Visual Studio 14.0\VC\bin;${PATH}
 
 
-INCLUDE=${ProgramFiles(x86)}\Microsoft Visual Studio 14.0\VC\INCLUDE;${ProgramFiles(x86)}\Windows Kits\10\include\10.0.10586.0\ucrt;${ProgramFiles(x86)}\Windows Kits\10\include\10.0.10586.0\um;${ProgramFiles(x86)}\Windows Kits\10\include\10.0.10586.0\shared;
+INCLUDE=${ProgramFiles(x86)}\Microsoft Visual Studio 14.0\VC\INCLUDE;${ProgramFiles(x86)}\Windows Kits\10\include\${MX2_WINDOWS_KIT}\ucrt;${ProgramFiles(x86)}\Windows Kits\10\include\${MX2_WINDOWS_KIT}\um;${ProgramFiles(x86)}\Windows Kits\10\include\${MX2_WINDOWS_KIT}\shared;
 
 
-LIB=${ProgramFiles(x86)}\Microsoft Visual Studio 14.0\VC\LIB;${ProgramFiles(x86)}\Windows Kits\10\lib\10.0.10586.0\ucrt\x86;${ProgramFiles(x86)}\Windows Kits\10\lib\10.0.10586.0\um\x86;
+LIB=${ProgramFiles(x86)}\Microsoft Visual Studio 14.0\VC\LIB;${ProgramFiles(x86)}\Windows Kits\10\lib\${MX2_WINDOWS_KIT}\ucrt\x86;${ProgramFiles(x86)}\Windows Kits\10\lib\${MX2_WINDOWS_KIT}\um\x86;
 
 
 'Linker options
 'Linker options
 MX2_LD_OPTS_MSVC=
 MX2_LD_OPTS_MSVC=

+ 3 - 3
modules/mojo3d/graphics/entity.monkey2

@@ -137,7 +137,7 @@ Class Entity
 	
 	
 	Setter( visible:Bool )
 	Setter( visible:Bool )
 		
 		
-		If _visible Show() Else Hide()
+		If visible Show() Else Hide()
 	End
 	End
 
 
 	#rem monkeydoc Entity animator.
 	#rem monkeydoc Entity animator.
@@ -301,7 +301,7 @@ Class Entity
 		Next
 		Next
 	End
 	End
 	
 	
-	#rem monkeydoc Hides the entity and all of its children
+	#rem monkeydoc Shows the entity and all of its children
 	#end
 	#end
 	Method Show()
 	Method Show()
 		
 		
@@ -324,8 +324,8 @@ Class Entity
 		Wend
 		Wend
 		
 		
 		If _visible 
 		If _visible 
-			OnHide()
 			_visible=False
 			_visible=False
+			OnHide()
 		Endif
 		Endif
 
 
 		If _parent
 		If _parent

+ 3 - 0
modules/sdl2/makefile_windows.monkey2

@@ -1,10 +1,13 @@
 
 
 Namespace sdl2
 Namespace sdl2
 
 
+
+
 #import "<libdsound.a>"
 #import "<libdsound.a>"
 #import "<libxinput.a>"
 #import "<libxinput.a>"
 #import "<libdinput8.a>"
 #import "<libdinput8.a>"
 
 
+#import "<libadvapi32.a>"
 #import "<libole32.a>"
 #import "<libole32.a>"
 #Import "<libshell32.a>"
 #Import "<libshell32.a>"
 #import "<liboleaut32.a>"
 #import "<liboleaut32.a>"