Browse Source

move stuff to wintools Config.pp

cxgeorge 24 years ago
parent
commit
80cb8b32ca
2 changed files with 3 additions and 12 deletions
  1. 3 0
      dtool/Config.Win32.pp
  2. 0 12
      dtool/Config.pp

+ 3 - 0
dtool/Config.Win32.pp

@@ -104,5 +104,8 @@
 // this indicates OLD_STYLE_ALLOCATOR is NOT used (defined as the empty string)
 // this indicates OLD_STYLE_ALLOCATOR is NOT used (defined as the empty string)
 #define OLD_STYLE_ALLOCATOR
 #define OLD_STYLE_ALLOCATOR
 
 
+// this is reqd for msvc 7.0 to build (beta-only, havent tested final)
+// #define UNKNOWN_ALLOCATOR 1
+
 // can Intel C++ build this directory successfully (if not, change CC to msvc)
 // can Intel C++ build this directory successfully (if not, change CC to msvc)
 #define NOT_INTEL_BUILDABLE false
 #define NOT_INTEL_BUILDABLE false

+ 0 - 12
dtool/Config.pp

@@ -254,18 +254,6 @@
 // Should we try to build the SGI-specific glxdisplay?
 // Should we try to build the SGI-specific glxdisplay?
 #define HAVE_SGIGL $[eq $[PLATFORM],Irix]
 #define HAVE_SGIGL $[eq $[PLATFORM],Irix]
 
 
-#define WIN32_PLATFORMSDK_INCPATH /mspsdk/Include
-#define WIN32_PLATFORMSDK_LIBPATH /mspsdk/Lib
-
-// Should we try to build the DirectX interface?  What additional
-// libraries do we need?
-#define DX_IPATH $[WIN32_PLATFORMSDK_INCPATH]
-#define DX_LPATH $[WIN32_PLATFORMSDK_LIBPATH] $[WINTOOLS]/lib
-#define DX_LIBS \
-  dxguid.lib winmm.lib kernel32.lib gdi32.lib comdlg32.lib winspool.lib \
-  user32.lib advapi32.lib ddraw.lib d3dim.lib
-#defer HAVE_DX $[libtest $[DX_LPATH],$[DX_LIBS]]
-
 // Do you want to build the Renderman interface?
 // Do you want to build the Renderman interface?
 #define HAVE_RIB
 #define HAVE_RIB