diff options
author | Piotr Dziwinski <piotrdz@gmail.com> | 2012-04-15 00:50:13 +0200 |
---|---|---|
committer | Piotr Dziwinski <piotrdz@gmail.com> | 2012-04-15 00:50:13 +0200 |
commit | 011d86ed668cbbff5c7bfc5f7e88086acb849921 (patch) | |
tree | a47f2a0d1f61f33455c5b53f9ef63741ca9b35d8 /src/d3dapp.cpp | |
parent | a0303105b616331778b61db06f9012f5c8970609 (diff) | |
download | colobot-011d86ed668cbbff5c7bfc5f7e88086acb849921.tar.gz colobot-011d86ed668cbbff5c7bfc5f7e88086acb849921.tar.bz2 colobot-011d86ed668cbbff5c7bfc5f7e88086acb849921.zip |
Pulled changes from test mingw branch
* include fixes
* syntax fixes for MinGW
* fixed encoding of restext.cpp
* temporary fix for MinGW in joystick.cpp
Successfully compiles under MinGW :)
Diffstat (limited to 'src/d3dapp.cpp')
-rw-r--r-- | src/d3dapp.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/d3dapp.cpp b/src/d3dapp.cpp index 568cf1a..a1d5c6a 100644 --- a/src/d3dapp.cpp +++ b/src/d3dapp.cpp @@ -40,7 +40,12 @@ #include "sound.h"
#include "d3dapp.h"
-
+// fix for "MSH_MOUSEWHEEL undefined" error
+#ifdef UNICODE
+#define MSH_MOUSEWHEEL L"MSWHEEL_ROLLMSG"
+#else
+#define MSH_MOUSEWHEEL "MSWHEEL_ROLLMSG"
+#endif
#define AUDIO_TRACK 13 // total number of audio tracks on the CD
|