Browse Source

more interrogate changes

David Rose 18 years ago
parent
commit
5d7e726ba2
3 changed files with 21 additions and 2 deletions
  1. 1 1
      dtool/pptempl/Global.pp
  2. 2 1
      dtool/src/parser-inc/Sources.pp
  3. 18 0
      dtool/src/parser-inc/malloc.h

+ 1 - 1
dtool/pptempl/Global.pp

@@ -732,7 +732,7 @@ Warning: Variable $[upcase $[tree]]_INSTALL is not set!
 
 // Caution!  interrogate_ipath might be redefined in the
 // Global.platform.pp file.
-#defer interrogate_ipath -S/usr/include $[install_parser_inc_dir:%=-S%] $[target_ipath:%=-I%]
+#defer interrogate_ipath $[install_parser_inc_dir:%=-S%] $[target_ipath:%=-I%] -S/usr/include
 
 #defer interrogate_options \
     -DCPPPARSER -D__STDC__=1 -D__cplusplus $[SYSTEM_IGATE_FLAGS] \

+ 2 - 1
dtool/src/parser-inc/Sources.pp

@@ -15,6 +15,7 @@
     rtsp.h rtspcodes.h setjmp.h winsock2.h \
     ode/ode.h collision_trimesh.h  \
     netinet/tcp.h netinet/ip.h \
-    rfftw.h libtar.h
+    rfftw.h libtar.h malloc.h
+
 
 

+ 18 - 0
dtool/src/parser-inc/malloc.h

@@ -0,0 +1,18 @@
+// Filename: malloc.h
+// Created by:  drose (28Jun07)
+//
+////////////////////////////////////////////////////////////////////
+//
+// PANDA 3D SOFTWARE
+// Copyright (c) 2001 - 2004, 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://etc.cmu.edu/panda3d/docs/license/ .
+//
+// To contact the maintainers of this program write to
+// [email protected] .
+//
+////////////////////////////////////////////////////////////////////
+