new interrogate rules

This commit is contained in:
David Rose 2007-06-28 03:36:06 +00:00
parent 96d5b27bb7
commit d8f9b61896
6 changed files with 29 additions and 10 deletions

View File

@ -115,8 +115,7 @@
$[if $[ne $[DONT_USE_PANDA_DLL_NAMING],], $[dll_basename], lib$[dll_basename]$[dllext]] $[if $[ne $[DONT_USE_PANDA_DLL_NAMING],], $[dll_basename], lib$[dll_basename]$[dllext]]
#end get_dllname #end get_dllname
#defer interrogate_ipath $[decygwin %,-I"%",$[install_parser_inc_dir]] $[decygwin %,-I"%",$[target_ipath]] #defer interrogate_ipath $[decygwin %,-S"%",$[install_parser_inc_dir]] $[decygwin %,-I"%",$[target_ipath]]
#defer interrogate_spath
// '#defer extra_cflags $[extra_cflags] /STUFF' will never work because extra_cflags hasnt been // '#defer extra_cflags $[extra_cflags] /STUFF' will never work because extra_cflags hasnt been
// defined yet, so this just evaluates the reference to null and removes the reference and the // defined yet, so this just evaluates the reference to null and removes the reference and the

View File

@ -129,8 +129,7 @@
// Additional compiler flags. // Additional compiler flags.
#defer extra_cflags /EHsc /Zm500 $[WARNING_LEVEL_FLAG] $[END_CFLAGS] #defer extra_cflags /EHsc /Zm500 $[WARNING_LEVEL_FLAG] $[END_CFLAGS]
#defer interrogate_ipath $[decygwin %,-I"%",$[install_parser_inc_dir]] $[decygwin %,-I"%",$[target_ipath]] #defer interrogate_ipath $[decygwin %,-S"%",$[install_parser_inc_dir]] $[decygwin %,-I"%",$[target_ipath]]
#defer interrogate_spath
#defer DECYGWINED_INC_PATHLIST_ARGS $[decygwin %,/I"%",$[EXTRA_INCPATH] $[ipath] $[WIN32_PLATFORMSDK_INCPATH]] #defer DECYGWINED_INC_PATHLIST_ARGS $[decygwin %,/I"%",$[EXTRA_INCPATH] $[ipath] $[WIN32_PLATFORMSDK_INCPATH]]
#defer MAIN_C_COMPILE_ARGS /nologo /c $[DECYGWINED_INC_PATHLIST_ARGS] $[flags] $[extra_cflags] "$[osfilename $[source]]" #defer MAIN_C_COMPILE_ARGS /nologo /c $[DECYGWINED_INC_PATHLIST_ARGS] $[flags] $[extra_cflags] "$[osfilename $[source]]"

View File

@ -119,8 +119,7 @@
$[if $[ne $[DONT_USE_PANDA_DLL_NAMING],], $[dll_basename], lib$[dll_basename]$[dllext]] $[if $[ne $[DONT_USE_PANDA_DLL_NAMING],], $[dll_basename], lib$[dll_basename]$[dllext]]
#end get_dllname #end get_dllname
#defer interrogate_ipath $[decygwin %,-I"%",$[install_parser_inc_dir]] $[decygwin %,-I"%",$[target_ipath]] #defer interrogate_ipath $[decygwin %,-S"%",$[install_parser_inc_dir]] $[decygwin %,-I"%",$[target_ipath]]
#defer interrogate_spath
// '#defer extra_cflags $[extra_cflags] /STUFF' will never work because extra_cflags hasnt been // '#defer extra_cflags $[extra_cflags] /STUFF' will never work because extra_cflags hasnt been
// defined yet, so this just evaluates the reference to null and removes the reference and the // defined yet, so this just evaluates the reference to null and removes the reference and the

View File

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

View File

@ -14,5 +14,7 @@
intfloat_readwrite.h mathematics.h rational.h rtp.h \ intfloat_readwrite.h mathematics.h rational.h rtp.h \
rtsp.h rtspcodes.h setjmp.h winsock2.h \ rtsp.h rtspcodes.h setjmp.h winsock2.h \
ode/config.h ode/common.h collision_trimesh.h \ ode/config.h ode/common.h collision_trimesh.h \
netinet/tcp.h netinet/ip.h netinet/tcp.h netinet/ip.h \
rfftw.h

21
dtool/src/parser-inc/rfftw.h Executable file
View File

@ -0,0 +1,21 @@
// Filename: rfftw.h
// Created by: drose (27Jun07)
//
////////////////////////////////////////////////////////////////////
//
// 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
// panda3d-general@lists.sourceforge.net .
//
////////////////////////////////////////////////////////////////////
typedef struct _rfftw_plan rfftw_plan;