Browse Source

move _WIN32_WINNT definition into dtoolbase_cc.h

David Rose 22 years ago
parent
commit
c6dea19887

+ 6 - 0
dtool/src/dtoolbase/dtoolbase_cc.h

@@ -108,6 +108,12 @@ typedef ios::iostate ios_iostate;
 typedef ios::seekdir ios_seekdir;
 #endif
 
+#ifdef WIN32_VC
+// include win32 defns for everything up to WinServer2003, and assume I'm smart
+// enough to use GetProcAddress for backward compat on w95/w98 for
+// newer fns
+#define _WIN32_WINNT 0x0502
+#endif  // WIN32_VC
 
 #if defined(WIN32_VC) && defined(FORCE_INLINING)
 // If FORCE_INLINING is defined, we use the keyword __forceinline,

+ 1 - 5
panda/src/dxgsg7/dxgsg7base.h

@@ -19,9 +19,7 @@
 #ifndef DXGSGBASE_H
 #define DXGSGBASE_H
 
-// include win32 defns for everything up to WinServer2003, and assume I'm smart enough to
-// use GetProcAddress for backward compat on w95/w98 for newer fns
-#define _WIN32_WINNT 0x0502
+#include "pandabase.h"
 
 #define WIN32_LEAN_AND_MEAN   // get rid of mfc win32 hdr stuff
 #ifndef STRICT
@@ -40,8 +38,6 @@
 #error DX7 headers not available, you need to install MS Platform SDK or DirectX 8+ SDK!
 #endif
 
-#include "pandabase.h"
-
 // disable nameless struct 'warning'
 #pragma warning (disable : 4201)
 

+ 2 - 7
panda/src/dxgsg8/dxgsg8base.h

@@ -19,10 +19,8 @@
 #ifndef DXGSG8BASE_H
 #define DXGSG8BASE_H
 
-// include win32 defns for everything up to WinServer2003, and assume I'm smart enough to
-// use GetProcAddress for backward compat on newer fns
-// Note DX8 cannot be installed on w95, so OK to assume base of win98
-#define _WIN32_WINNT 0x0502
+#include "pandabase.h"
+#include "graphicsWindow.h"
 
 #define WIN32_LEAN_AND_MEAN   // get rid of mfc win32 hdr stuff
 #ifndef STRICT
@@ -38,9 +36,6 @@
 #include <dxerr8.h>
 #undef WIN32_LEAN_AND_MEAN
 
-#include "pandabase.h"
-#include "graphicsWindow.h"
-
 #if D3D_SDK_VERSION != 220
 #error you have DX 8.0 headers, not DX 8.1, you need to install DX 8.1 SDK!
 #endif

+ 2 - 7
panda/src/windisplay/winGraphicsWindow.h

@@ -19,10 +19,8 @@
 #ifndef WINGRAPHICSWINDOW_H
 #define WINGRAPHICSWINDOW_H
 
-// include win32 defns for everything up to WinServer2003, and assume I'm smart
-// enough to use GetProcAddress for backward compat on w95/w98 for
-// newer fns
-#define _WIN32_WINNT 0x0502
+#include "pandabase.h"
+#include "graphicsWindow.h"
 
 // Jesse thinks that this is supposed to say WIN32_LEAN_AND_MEAN, but he
 // doesn't want to fix what isn't broken.
@@ -30,9 +28,6 @@
 #include <windows.h>
 #undef WINDOWS_LEAN_AND_MEAN
 
-#include "pandabase.h"
-#include "graphicsWindow.h"
-
 class WinGraphicsPipe;
 
 ////////////////////////////////////////////////////////////////////