mirror of
https://github.com/panda3d/panda3d.git
synced 2025-10-01 01:07:51 -04:00
fix multiproc build break
This commit is contained in:
parent
3d1495a572
commit
81b27b0b27
@ -1,5 +1,6 @@
|
||||
#include "config_dxgsg7.cxx"
|
||||
#include "dxgsg7base.h"
|
||||
#include "dxgsg7base.cxx"
|
||||
#include "config_dxgsg7.cxx"
|
||||
#include "dxSavedFrameBuffer7.cxx"
|
||||
#include "dxTextureContext7.cxx"
|
||||
#include "dxGeomNodeContext7.cxx"
|
||||
|
@ -19,11 +19,9 @@
|
||||
#ifndef DXGSGBASE_H
|
||||
#define DXGSGBASE_H
|
||||
|
||||
#include <pandabase.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 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
|
||||
#ifndef STRICT
|
||||
@ -42,6 +40,8 @@
|
||||
#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)
|
||||
|
||||
|
@ -1,8 +1,8 @@
|
||||
#include "wdxGraphicsWindow8.cxx"
|
||||
#include "dxgsg8base.h"
|
||||
#include "config_dxgsg8.cxx"
|
||||
#include "dxSavedFrameBuffer8.cxx"
|
||||
#include "dxTextureContext8.cxx"
|
||||
#include "dxGeomNodeContext8.cxx"
|
||||
#include "d3dfont8.cxx"
|
||||
#include "wdxGraphicsPipe8.cxx"
|
||||
|
||||
#include "wdxGraphicsWindow8.cxx"
|
||||
|
@ -22,10 +22,10 @@
|
||||
#include <pandabase.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
|
||||
// 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
|
||||
#ifndef STRICT
|
||||
|
@ -19,10 +19,10 @@
|
||||
#ifndef 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
|
||||
// newer fns
|
||||
#define _WIN32_WINNT 0x0501
|
||||
#define _WIN32_WINNT 0x0502
|
||||
|
||||
#define WINDOWS_LEAN_AND_MEAN
|
||||
#include <windows.h>
|
||||
|
Loading…
x
Reference in New Issue
Block a user