use composite build

panda/src/wdxdisplay/Sources.pp

@@ -9,14 +9,16 @@
   #define LOCAL_LIBS \
     dxgsg
     
+  #define COMBINED_SOURCES $[TARGET]_composite1.cxx 
+    
   #define SOURCES \
-    config_wdxdisplay.cxx config_wdxdisplay.h wdxGraphicsPipe.cxx \
-    wdxGraphicsPipe.h wdxGraphicsWindow.cxx wdxGraphicsWindow.h
-
+    config_wdxdisplay.h wdxGraphicsPipe.h wdxGraphicsWindow.cxx wdxGraphicsWindow.h
+    
+  #define INCLUDED_SOURCES \
+    config_wdxdisplay.cxx wdxGraphicsPipe.cxx 
+    
   #define INSTALL_HEADERS \
     config_wdxdisplay.h wdxGraphicsPipe.h wdxGraphicsWindow.h
     
-//  #define PRECOMPILED_HEADER wdxdisplay_headers.h 
-
 #end lib_target
 

panda/src/wdxdisplay/config_wdxdisplay.cxx

@@ -16,8 +16,11 @@
 //
 ////////////////////////////////////////////////////////////////////
 
-#include "wdxdisplay_headers.h"
-#pragma hdrstop
+#include "config_wdxdisplay.h"
+#include "wdxGraphicsPipe.h"
+#include "wdxGraphicsWindow.h"
+
+#include <dconfig.h>
 
 Configure(config_wdxdisplay);
 NotifyCategoryDef(wdxdisplay, "display");

panda/src/wdxdisplay/wdxGraphicsPipe.cxx

@@ -16,8 +16,11 @@
 //
 ////////////////////////////////////////////////////////////////////
 
-#include "wdxdisplay_headers.h"
-#pragma hdrstop
+#include "wdxGraphicsPipe.h"
+#include "config_wdxdisplay.h"
+#include <mouseButton.h>
+#include <keyboardButton.h>
+#include <dxfile.h>
 
 ////////////////////////////////////////////////////////////////////
 // Static variables

panda/src/wdxdisplay/wdxGraphicsWindow.cxx

@@ -16,8 +16,24 @@
 //
 ////////////////////////////////////////////////////////////////////
 
-#include "wdxdisplay_headers.h"
-#pragma hdrstop
+#include <errno.h>
+#include <time.h>
+#include <math.h>
+#include "wdxGraphicsWindow.h"
+#include "wdxGraphicsPipe.h"
+#include "dxGraphicsStateGuardian.h"
+#include "config_wdxdisplay.h"
+
+#include <keyboardButton.h>
+#include <mouseButton.h>
+
+#ifdef DO_PSTATS
+#include <pStatTimer.h>
+#endif
+
+#define D3D_OVERLOADS
+//#define  INITGUID  dont need this if linking w/dxguid.lib
+#include <d3d.h>
 
 ////////////////////////////////////////////////////////////////////
 // Static variables

panda/src/wdxdisplay/wdxdisplay_composite1.cxx

@@ -0,0 +1,4 @@
+
+#include "config_wdxdisplay.cxx"
+#include "wdxGraphicsPipe.cxx"
+

panda/src/wdxdisplay/wdxdisplay_headers.h

@@ -1,41 +0,0 @@
-// Filename: wdxdisplay-headers.h
-// Created by:  georges 30May01
-//
-////////////////////////////////////////////////////////////////////
-//
-// PANDA 3D SOFTWARE
-// Copyright (c) 2001, Disney Enterprises, Inc.  All rights reserved
-//
-// All use of this software is subject to the terms of the Panda 3d
-// Software license.  You should have received a copy of this license
-// along with this source code; you will also find a current copy of
-// the license at http://www.panda3d.org/license.txt .
-//
-// To contact the maintainers of this program write to
-// [email protected] .
-//
-////////////////////////////////////////////////////////////////////
-
-
-#include <errno.h>
-#include <time.h>
-#include <math.h>
-
-#include <keyboardButton.h>
-#include <mouseButton.h>
-#include <dconfig.h>
-#ifdef DO_PSTATS
-#include <pStatTimer.h>
-#endif
-
-//#define  INITGUID  dont need this if linking w/dxguid.lib
-
-#include "dxGraphicsStateGuardian.h"
-#include "wdxGraphicsWindow.h"
-#include "wdxGraphicsPipe.h"
-#include "config_wdxdisplay.h"
-
-#include <dxfile.h>
-
-#pragma hdrstop
-