Files
MINGW-packages/mingw-w64-irrlicht/001-compile-fixes.patch
T
2021-11-06 03:22:20 +08:00

30 lines
2.0 KiB
Diff

diff -urN irrlicht-1.8.5-orig/source/Irrlicht/COpenGLDriver.cpp irrlicht-1.8.5/source/Irrlicht/COpenGLDriver.cpp
--- irrlicht-1.8.5-orig/source/Irrlicht/COpenGLDriver.cpp 2019-09-06 03:22:25 +0800
+++ irrlicht-1.8.5/source/Irrlicht/COpenGLDriver.cpp 2021-11-05 18:09:06 +0800
@@ -143,7 +143,7 @@
PIXELFORMATDESCRIPTOR pfd = {
sizeof(PIXELFORMATDESCRIPTOR), // Size Of This Pixel Format Descriptor
1, // Version Number
- PFD_DRAW_TO_WINDOW | // Format Must Support Window
+ (DWORD)PFD_DRAW_TO_WINDOW | // Format Must Support Window
PFD_SUPPORT_OPENGL | // Format Must Support OpenGL
(Params.Doublebuffer?PFD_DOUBLEBUFFER:0) | // Must Support Double Buffering
(Params.Stereobuffer?PFD_STEREO:0), // Must Support Stereo Buffer
diff -urN irrlicht-1.8.5-orig/source/Irrlicht/Makefile irrlicht-1.8.5/source/Irrlicht/Makefile
--- irrlicht-1.8.5-orig/source/Irrlicht/Makefile 2021-11-01 19:19:12 +0800
+++ irrlicht-1.8.5/source/Irrlicht/Makefile 2021-11-05 18:08:08 +0800
@@ -106,11 +106,11 @@
#Windows specific options
IRRLICHT_DLL := ../../bin/Win32-gcc/Irrlicht.dll
sharedlib_win32 staticlib_win32: SYSTEM = Win32-gcc
-sharedlib_win32: LDFLAGS += -lgdi32 -lopengl32 -ld3dx9d -lwinmm -Wl,--add-stdcall-alias
+sharedlib_win32: LDFLAGS += -lgdi32 -lopengl32 -lwinmm
#choose either -DIRR_COMPILE_WITH_DX9_DEV_PACK or -DNO_IRR_COMPILE_WITH_DIRECT3D_9_ depending if you need dx9
#sharedlib_win32 staticlib_win32: CPPFLAGS += -DIRR_COMPILE_WITH_DX9_DEV_PACK
sharedlib_win32 staticlib_win32: CPPFLAGS += -DNO_IRR_COMPILE_WITH_DIRECTINPUT_JOYSTICK_ -DNO_IRR_COMPILE_WITH_DIRECT3D_9_
-sharedlib_win32 staticlib_win32: CPPFLAGS += -DIRR_COMPILE_WITH_DX9_DEV_PACK -D__GNUWIN32__ -D_WIN32 -DWIN32 -D_WINDOWS -D_MBCS -D_USRDLL
+sharedlib_win32 staticlib_win32: CPPFLAGS += -D__GNUWIN32__ -D_WIN32 -DWIN32 -D_WINDOWS -D_MBCS -D_USRDLL
staticlib_win32: CPPFLAGS += -D_IRR_STATIC_LIB_
VERSION = $(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_RELEASE)