diff options
| author | Oliver Schinagl <oliver@schinagl.nl> | 2008-05-27 10:14:57 (GMT) |
|---|---|---|
| committer | Oliver Schinagl <oliver@schinagl.nl> | 2008-05-27 10:14:57 (GMT) |
| commit | ea1ff55ac332ec38068f63e71e5fa6187fa37a57 (patch) | |
| tree | 5e12af9cb6b9951b43b0e4cb4a15329ad904ff9f | |
| parent | e2b5d9764888e0f307ebcdf9c20835b197a0f63c (diff) | |
| download | 2iv55-ea1ff55ac332ec38068f63e71e5fa6187fa37a57.zip 2iv55-ea1ff55ac332ec38068f63e71e5fa6187fa37a57.tar.gz 2iv55-ea1ff55ac332ec38068f63e71e5fa6187fa37a57.tar.bz2 | |
G_OS_WIN32 properly declared
| -rw-r--r-- | matchblox/main.cpp | 2 | ||||
| -rw-r--r-- | matchblox/matchblox.vcproj | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/matchblox/main.cpp b/matchblox/main.cpp index 310df03..ce16470 100644 --- a/matchblox/main.cpp +++ b/matchblox/main.cpp @@ -1,9 +1,11 @@ #ifdef G_OS_WIN32
#define WIN32_LEAN_AND_MEAN 1
#include <windows.h>
+ #define sleep Sleep
#else
#define FALSE 0
#define TRUE !FALSE
+ #include <unistd.h>
#endif
#include <GL/glew.h>
diff --git a/matchblox/matchblox.vcproj b/matchblox/matchblox.vcproj index c72b1f3..2c741d1 100644 --- a/matchblox/matchblox.vcproj +++ b/matchblox/matchblox.vcproj @@ -43,7 +43,7 @@ Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="include;common;menu;engine;lib"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;USE_WIIYOURSELF"
+ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;USE_WIIYOURSELF;G_OS_WIN32"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@@ -122,7 +122,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="include;common;menu;engine;lib"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;E;USE_WIIYOURSELF"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;E;USE_WIIYOURSELF;G_OS_WIN32"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
WarningLevel="3"
|