TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-01 17:35:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix multiproc build break

Browse Source
This commit is contained in:
cxgeorge 2003-01-19 03:24:56 +00:00
parent 3d1495a572
commit 81b27b0b27
5 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
panda/src/dxgsg7/dxgsg7_composite1.cxx
View File

@ -1,5 +1,6 @@
#include "config_dxgsg7.cxx" #include "dxgsg7base.h"
#include "dxgsg7base.cxx" #include "dxgsg7base.cxx"
#include "config_dxgsg7.cxx"
#include "dxSavedFrameBuffer7.cxx" #include "dxSavedFrameBuffer7.cxx"
#include "dxTextureContext7.cxx" #include "dxTextureContext7.cxx"
#include "dxGeomNodeContext7.cxx" #include "dxGeomNodeContext7.cxx"

8
panda/src/dxgsg7/dxgsg7base.h
View File

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

4
panda/src/dxgsg8/dxgsg8_composite1.cxx
View File

@ -1,8 +1,8 @@
#include "wdxGraphicsWindow8.cxx" #include "dxgsg8base.h"
#include "config_dxgsg8.cxx" #include "config_dxgsg8.cxx"
#include "dxSavedFrameBuffer8.cxx" #include "dxSavedFrameBuffer8.cxx"
#include "dxTextureContext8.cxx" #include "dxTextureContext8.cxx"
#include "dxGeomNodeContext8.cxx" #include "dxGeomNodeContext8.cxx"
#include "d3dfont8.cxx" #include "d3dfont8.cxx"
#include "wdxGraphicsPipe8.cxx" #include "wdxGraphicsPipe8.cxx"
#include "wdxGraphicsWindow8.cxx"

4
panda/src/dxgsg8/dxgsg8base.h
View File

@ -22,10 +22,10 @@
#include <pandabase.h> #include <pandabase.h>
#include <graphicsWindow.h> #include <graphicsWindow.h>
// include win32 defns for everything up to XP, and assume I'm smart enough to // include win32 defns for everything up to WinServer2003, and assume I'm smart enough to
// use GetProcAddress for backward compat on newer fns // use GetProcAddress for backward compat on newer fns
// Note DX8 cannot be installed on w95, so OK to assume base of win98 // Note DX8 cannot be installed on w95, so OK to assume base of win98
#define _WIN32_WINNT 0x0501 #define _WIN32_WINNT 0x0502
#define WIN32_LEAN_AND_MEAN // get rid of mfc win32 hdr stuff #define WIN32_LEAN_AND_MEAN // get rid of mfc win32 hdr stuff
#ifndef STRICT #ifndef STRICT

4
panda/src/windisplay/winGraphicsWindow.h
View File

@ -19,10 +19,10 @@
#ifndef WINGRAPHICSWINDOW_H #ifndef WINGRAPHICSWINDOW_H
#define WINGRAPHICSWINDOW_H #define WINGRAPHICSWINDOW_H
// include win32 defns for everything up to XP, and assume I'm smart // include win32 defns for everything up to WinServer2003, and assume I'm smart
// enough to use GetProcAddress for backward compat on w95/w98 for // enough to use GetProcAddress for backward compat on w95/w98 for
// newer fns // newer fns
#define _WIN32_WINNT 0x0501 #define _WIN32_WINNT 0x0502
#define WINDOWS_LEAN_AND_MEAN #define WINDOWS_LEAN_AND_MEAN
#include <windows.h> #include <windows.h>