test

ocgcore @ 4be87483

-Subproject commit c9181e46566718367ef453e81cb60830fed9194c
+Subproject commit 4be874830de6e0c286f62fddf682e606756ab475

premake/irrlicht/irrlicht.patch

-diff --git a/irrlicht/include/IOSOperator.h b/irrlicht/include/IOSOperator.h
-index b5c6236..b2e864a 100644
---- a/irrlicht/include/IOSOperator.h
-+++ b/irrlicht/include/IOSOperator.h
-@@ -26,11 +26,11 @@ public:
+diff -ur --strip-trailing-cr irrlicht/include/IOSOperator.h irrlicht-fixed/include/IOSOperator.h
+--- irrlicht/include/IOSOperator.h	2012-11-03 19:08:34.000000000 +0800
++++ irrlicht-fixed/include/IOSOperator.h	2017-09-09 18:50:04.693119800 +0800
+@@ -26,11 +26,11 @@
  	}
  
  	//! Copies text to the clipboard
@@ -16,11 +15,10 @@ index b5c6236..b2e864a 100644
  
  	//! Get the processor speed in megahertz
  	/** \param MHz The integer variable to store the speed in.
-diff --git a/irrlicht/include/IrrCompileConfig.h b/irrlicht/include/IrrCompileConfig.h
-index c2c5d12..7c44f0c 100644
---- a/irrlicht/include/IrrCompileConfig.h
-+++ b/irrlicht/include/IrrCompileConfig.h
-@@ -233,7 +233,9 @@ you will not be able to use anything provided by the GUI Environment, including
+diff -ur --strip-trailing-cr irrlicht/include/IrrCompileConfig.h irrlicht-fixed/include/IrrCompileConfig.h
+--- irrlicht/include/IrrCompileConfig.h	2016-07-09 13:02:32.000000000 +0800
++++ irrlicht-fixed/include/IrrCompileConfig.h	2017-09-09 18:50:04.695119900 +0800
+@@ -233,7 +233,9 @@
  disable this feature, the engine behave as before (ansi). This is currently only supported
  for Windows based systems. You also have to set #define UNICODE for this to compile.
  */
@@ -31,39 +29,23 @@ index c2c5d12..7c44f0c 100644
  #ifdef NO_IRR_WCHAR_FILESYSTEM
  #undef _IRR_WCHAR_FILESYSTEM
  #endif
-diff --git a/irrlicht/include/Keycodes.h b/irrlicht/include/Keycodes.h
-index e56eca1..57ab312 100644
---- a/irrlicht/include/Keycodes.h
-+++ b/irrlicht/include/Keycodes.h
-@@ -89,7 +89,7 @@ namespace irr
- 		KEY_KEY_X            = 0x58,  // X key
- 		KEY_KEY_Y            = 0x59,  // Y key
- 		KEY_KEY_Z            = 0x5A,  // Z key
--		KEY_LWIN             = 0x5B,  // Left Windows key (Microsoft Natural keyboard)
-+		KEY_LWIN             = 0x5B,  // Left Windows key (Microsoft® Natural® keyboard)
- 		KEY_RWIN             = 0x5C,  // Right Windows key (Natural keyboard)
- 		KEY_APPS             = 0x5D,  // Applications key (Natural keyboard)
- 		KEY_SLEEP            = 0x5F,  // Computer Sleep key
-diff --git a/irrlicht/include/irrTypes.h b/irrlicht/include/irrTypes.h
-index cfeaf84..a656631 100644
---- a/irrlicht/include/irrTypes.h
-+++ b/irrlicht/include/irrTypes.h
-@@ -48,7 +48,9 @@ typedef __int16			s16;
+diff -ur --strip-trailing-cr irrlicht/include/irrTypes.h irrlicht-fixed/include/irrTypes.h
+--- irrlicht/include/irrTypes.h	2012-11-19 18:20:40.000000000 +0800
++++ irrlicht-fixed/include/irrTypes.h	2017-09-09 18:54:19.126672600 +0800
+@@ -48,6 +48,9 @@
  typedef signed short		s16;
  #endif
  
--
 +//! 16 bit character variable.
 +/** This is a typedef for wchar_t, it ensures portability of the engine. */
 +typedef wchar_t			c16;
  
+ 
  //! 32 bit unsigned variable.
- /** This is a typedef for unsigned int, it ensures portability of the engine. */
-diff --git a/irrlicht/src/CGUIEditBox.cpp b/irrlicht/src/CGUIEditBox.cpp
-index f33b5a2..8375444 100644
---- a/irrlicht/src/CGUIEditBox.cpp
-+++ b/irrlicht/src/CGUIEditBox.cpp
-@@ -287,7 +287,7 @@ bool CGUIEditBox::processKey(const SEvent& event)
+diff -ur --strip-trailing-cr irrlicht/src/CGUIEditBox.cpp irrlicht-fixed/src/CGUIEditBox.cpp
+--- irrlicht/src/CGUIEditBox.cpp	2014-09-17 20:23:10.000000000 +0800
++++ irrlicht-fixed/src/CGUIEditBox.cpp	2017-09-09 18:50:04.709120800 +0800
+@@ -287,7 +287,7 @@
  				const s32 realmbgn = MarkBegin < MarkEnd ? MarkBegin : MarkEnd;
  				const s32 realmend = MarkBegin < MarkEnd ? MarkEnd : MarkBegin;
  
@@ -72,7 +54,7 @@ index f33b5a2..8375444 100644
  				s = Text.subString(realmbgn, realmend - realmbgn).c_str();
  				Operator->copyToClipboard(s.c_str());
  			}
-@@ -300,7 +300,7 @@ bool CGUIEditBox::processKey(const SEvent& event)
+@@ -300,7 +300,7 @@
  				const s32 realmend = MarkBegin < MarkEnd ? MarkEnd : MarkBegin;
  
  				// copy
@@ -81,7 +63,7 @@ index f33b5a2..8375444 100644
  				sc = Text.subString(realmbgn, realmend - realmbgn).c_str();
  				Operator->copyToClipboard(sc.c_str());
  
-@@ -330,16 +330,10 @@ bool CGUIEditBox::processKey(const SEvent& event)
+@@ -330,16 +330,10 @@
  				const s32 realmend = MarkBegin < MarkEnd ? MarkEnd : MarkBegin;
  
  				// add new character
@@ -100,7 +82,7 @@ index f33b5a2..8375444 100644
  
  					if (MarkBegin == MarkEnd)
  					{
-@@ -664,6 +658,16 @@ bool CGUIEditBox::processKey(const SEvent& event)
+@@ -664,6 +658,16 @@
  	case KEY_ESCAPE:
  	case KEY_TAB:
  	case KEY_SHIFT:
@@ -117,10 +99,21 @@ index f33b5a2..8375444 100644
  	case KEY_F1:
  	case KEY_F2:
  	case KEY_F3:
-diff --git a/irrlicht/src/CIrrDeviceWin32.cpp b/irrlicht/src/CIrrDeviceWin32.cpp
-index f96c178..2e7a9ee 100644
---- a/irrlicht/src/CIrrDeviceWin32.cpp
-+++ b/irrlicht/src/CIrrDeviceWin32.cpp
+diff -ur --strip-trailing-cr irrlicht/src/CGUIListBox.cpp irrlicht-fixed/src/CGUIListBox.cpp
+--- irrlicht/src/CGUIListBox.cpp	2016-05-26 12:09:34.000000000 +0800
++++ irrlicht-fixed/src/CGUIListBox.cpp	2017-09-09 18:50:04.720121400 +0800
+@@ -425,7 +425,7 @@
+ 				}
+ 
+ 				case EMIE_MOUSE_MOVED:
+-					if (Selecting || MoveOverSelect)
++					if (MoveOverSelect)
+ 					{
+ 						if (isPointInside(p))
+ 						{
+diff -ur --strip-trailing-cr irrlicht/src/CIrrDeviceWin32.cpp irrlicht-fixed/src/CIrrDeviceWin32.cpp
+--- irrlicht/src/CIrrDeviceWin32.cpp	2016-05-26 12:09:34.000000000 +0800
++++ irrlicht-fixed/src/CIrrDeviceWin32.cpp	2017-09-09 18:56:09.679995900 +0800
 @@ -20,6 +20,8 @@
  #include "COSOperator.h"
  #include "dimension2d.h"
@@ -130,7 +123,7 @@ index f96c178..2e7a9ee 100644
  #include <winuser.h>
  #if defined(_IRR_COMPILE_WITH_JOYSTICK_EVENTS_)
  #ifdef _IRR_COMPILE_WITH_DIRECTINPUT_JOYSTICK_
-@@ -749,6 +751,26 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
+@@ -749,6 +751,26 @@
  		return 0;
  	}
  
@@ -157,33 +150,19 @@ index f96c178..2e7a9ee 100644
  	switch (message)
  	{
  	case WM_PAINT:
-@@ -773,22 +795,21 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
+@@ -773,7 +795,11 @@
  			event.KeyInput.Key = (irr::EKEY_CODE)wParam;
  			event.KeyInput.PressedDown = (message==WM_KEYDOWN || message == WM_SYSKEYDOWN);
  
--			const UINT MY_MAPVK_VSC_TO_VK_EX = 3; // MAPVK_VSC_TO_VK_EX should be in SDK according to MSDN, but isn't in mine.
++#ifdef MAPVK_VSC_TO_VK_EX
++			const UINT MY_MAPVK_VSC_TO_VK_EX = MAPVK_VSC_TO_VK_EX;
++#else
+ 			const UINT MY_MAPVK_VSC_TO_VK_EX = 3; // MAPVK_VSC_TO_VK_EX should be in SDK according to MSDN, but isn't in mine.
++#endif
  			if ( event.KeyInput.Key == irr::KEY_SHIFT )
  			{
  				// this will fail on systems before windows NT/2000/XP, not sure _what_ will return there instead.
--				event.KeyInput.Key = (irr::EKEY_CODE)MapVirtualKey( ((lParam>>16) & 255), MY_MAPVK_VSC_TO_VK_EX );
-+				event.KeyInput.Key = (irr::EKEY_CODE)MapVirtualKey( ((lParam>>16) & 255), MAPVK_VSC_TO_VK_EX );
- 			}
- 			if ( event.KeyInput.Key == irr::KEY_CONTROL )
- 			{
--				event.KeyInput.Key = (irr::EKEY_CODE)MapVirtualKey( ((lParam>>16) & 255), MY_MAPVK_VSC_TO_VK_EX );
-+				event.KeyInput.Key = (irr::EKEY_CODE)MapVirtualKey( ((lParam>>16) & 255), MAPVK_VSC_TO_VK_EX );
- 				// some keyboards will just return LEFT for both - left and right keys. So also check extend bit.
- 				if (lParam & 0x1000000)
- 					event.KeyInput.Key = irr::KEY_RCONTROL;
- 			}
- 			if ( event.KeyInput.Key == irr::KEY_MENU )
- 			{
--				event.KeyInput.Key = (irr::EKEY_CODE)MapVirtualKey( ((lParam>>16) & 255), MY_MAPVK_VSC_TO_VK_EX );
-+				event.KeyInput.Key = (irr::EKEY_CODE)MapVirtualKey( ((lParam>>16) & 255), MAPVK_VSC_TO_VK_EX );
- 				if (lParam & 0x1000000)
- 					event.KeyInput.Key = irr::KEY_RMENU;
- 			}
-@@ -904,6 +925,53 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
+@@ -904,6 +930,53 @@
  		KEYBOARD_INPUT_HKL = GetKeyboardLayout(0);
  		KEYBOARD_INPUT_CODEPAGE = LocaleIdToCodepage( LOWORD(KEYBOARD_INPUT_HKL) );
  		return 0;
@@ -209,7 +188,7 @@ index f96c178..2e7a9ee 100644
 +		event.KeyInput.Char = wParam;
 +#else
 +		BYTE ch[3];
-+		if(wParam >> 8) {
++		if (wParam >> 8) {
 +			ch[0] = wParam >> 8;
 +			ch[1] = wParam & 0xff;
 +			ch[2] = 0;
@@ -237,7 +216,7 @@ index f96c178..2e7a9ee 100644
  	}
  	return DefWindowProc(hWnd, message, wParam, lParam);
  }
-@@ -1797,8 +1865,8 @@ void CIrrDeviceWin32::handleSystemMessages()
+@@ -1797,8 +1870,8 @@
  
  	while (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE))
  	{
@@ -248,11 +227,10 @@ index f96c178..2e7a9ee 100644
  
  		if (ExternalWindow && msg.hwnd == HWnd)
  			WndProc(HWnd, msg.message, msg.wParam, msg.lParam);
-diff --git a/irrlicht/src/COSOperator.cpp b/irrlicht/src/COSOperator.cpp
-index 90e644d..1856c04 100644
---- a/irrlicht/src/COSOperator.cpp
-+++ b/irrlicht/src/COSOperator.cpp
-@@ -52,9 +52,9 @@ const core::stringc& COSOperator::getOperatingSystemVersion() const
+diff -ur --strip-trailing-cr irrlicht/src/COSOperator.cpp irrlicht-fixed/src/COSOperator.cpp
+--- irrlicht/src/COSOperator.cpp	2012-11-03 19:07:52.000000000 +0800
++++ irrlicht-fixed/src/COSOperator.cpp	2017-09-09 18:50:04.715121100 +0800
+@@ -52,9 +52,9 @@
  
  
  //! copies text to the clipboard
@@ -264,7 +242,7 @@ index 90e644d..1856c04 100644
  		return;
  
  // Windows version
-@@ -66,15 +66,15 @@ void COSOperator::copyToClipboard(const c8* text) const
+@@ -66,15 +66,15 @@
  	EmptyClipboard();
  
  	HGLOBAL clipbuffer;
@@ -285,7 +263,7 @@ index 90e644d..1856c04 100644
  	CloseClipboard();
  
  // MacOSX version
-@@ -93,7 +93,7 @@ void COSOperator::copyToClipboard(const c8* text) const
+@@ -93,7 +93,7 @@
  
  //! gets text from the clipboard
  //! \return Returns 0 if no string is in there.
@@ -294,7 +272,7 @@ index 90e644d..1856c04 100644
  {
  #if defined(_IRR_XBOX_PLATFORM_)
  		return 0;
-@@ -101,10 +101,10 @@ const c8* COSOperator::getTextFromClipboard() const
+@@ -101,10 +101,10 @@
  	if (!OpenClipboard(NULL))
  		return 0;
  
@@ -308,11 +286,10 @@ index 90e644d..1856c04 100644
  	GlobalUnlock( hData );
  	CloseClipboard();
  	return buffer;
-diff --git a/irrlicht/src/COSOperator.h b/irrlicht/src/COSOperator.h
-index 3f633da..c0712df 100644
---- a/irrlicht/src/COSOperator.h
-+++ b/irrlicht/src/COSOperator.h
-@@ -27,11 +27,11 @@ public:
+diff -ur --strip-trailing-cr irrlicht/src/COSOperator.h irrlicht-fixed/src/COSOperator.h
+--- irrlicht/src/COSOperator.h	2012-11-03 19:08:00.000000000 +0800
++++ irrlicht-fixed/src/COSOperator.h	2017-09-09 18:50:04.717121200 +0800
+@@ -27,11 +27,11 @@
  	virtual const core::stringc& getOperatingSystemVersion() const;
  
  	//! copies text to the clipboard
@@ -326,15 +303,3 @@ index 3f633da..c0712df 100644
  
  	//! gets the processor speed in megahertz
  	//! \param Mhz:
-diff --git a/irrlicht/src/CGUIListBox.old.cpp b/irrlicht/src/CGUIListBox.cpp
---- a/irrlicht/src/CGUIListBox.old.cpp	2017-09-05 04:20:28.619271300 +0800
-+++ b/irrlicht/src/CGUIListBox.cpp	2017-09-05 04:11:37.367885500 +0800
-@@ -425,7 +425,7 @@
- 				}
- 
- 				case EMIE_MOUSE_MOVED:
--					if (Selecting || MoveOverSelect)
-+					if (MoveOverSelect)
- 					{
- 						if (isPointInside(p))
- 						{

premake5.lua

@@ -7,7 +7,10 @@ solution "ygo"
 
     configuration "windows"
         defines { "WIN32", "_WIN32", "WINVER=0x0501" }
+        libdirs { "$(DXSDK_DIR)Lib/x86" }
         entrypoint "mainCRTStartup"
+        toolset "v140_xp"
+        startproject "ygopro"
 
     configuration "bsd"
         defines { "LUA_USE_POSIX" }
@@ -44,6 +47,7 @@ solution "ygo"
 
     configuration { "Debug", "vs*" }
         defines { "_ITERATOR_DEBUG_LEVEL=0" }
+        disablewarnings { "4819" }
 
     configuration "vs*"
         vectorextensions "SSE2"
@@ -55,8 +59,6 @@ solution "ygo"
     configuration {"not vs*", "windows"}
         buildoptions { "-static-libgcc" }
 
-    startproject "ygopro"
-
     include "ocgcore"
     include "gframe"
     if os.ishost("windows") then