RomanNum3ral
/
open_toontown_panda3d
mirror of https://github.com/open-toontown/panda3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

make the platform sdk thing pretty

This commit is contained in:
David Rose 2001-10-10 22:15:23 +00:00
parent e61f3d4615
commit d3aaf82193
6 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dtool/pptempl/Global.gmsvc.pp
View File

@ -160,7 +160,7 @@
#defer extra_cflags /EHsc /Zm250 /DWIN32_VC /DWIN32 $[WARNING_LEVEL_FLAG] $[END_CFLAGS]
#defer MAIN_C_COMPILE_ARGS /nologo /c $[decygwin %,/I"%",$[EXTRA_INCPATH] $[ipath]] $[flags] $[extra_cflags] $[source]
#defer MAIN_C_COMPILE_ARGS /nologo /c $[decygwin %,/I"%",$[EXTRA_INCPATH] $[ipath] $[WIN32_PLATFORMSDK_INCPATH]] $[flags] $[extra_cflags] $[source]
#defer COMPILE_C $[COMPILER] /Fo"$[osfilename $[target]]" $[MAIN_C_COMPILE_ARGS]
#defer COMPILE_C++ $[COMPILE_C]

2
dtool/pptempl/Global.msvc.pp
View File

@ -136,7 +136,7 @@
#defer extra_cflags /EHsc /Zm250 /DWIN32_VC /DWIN32 $[WARNING_LEVEL_FLAG] $[END_CFLAGS]
#defer MAIN_C_COMPILE_ARGS /nologo /c $[decygwin %,/I"%",$[EXTRA_INCPATH] $[ipath]] $[flags] $[extra_cflags] $[source]
#defer MAIN_C_COMPILE_ARGS /nologo /c $[decygwin %,/I"%",$[EXTRA_INCPATH] $[ipath] $[WIN32_PLATFORMSDK_INCPATH]] $[flags] $[extra_cflags] $[source]
#defer COMPILE_C $[COMPILER] /Fo"$[osfilename $[target]]" $[MAIN_C_COMPILE_ARGS]
#defer COMPILE_C++ $[COMPILE_C]

8
dtool/pptempl/Global.pp
View File

@ -742,11 +742,15 @@ Warning: Variable $[upcase $[tree]]_INSTALL is not set!
#endif
// Set up the correct interrogate options.
// Caution! interrogate_ipath might be redefined in the
// Global.platform.pp file.
#defer interrogate_ipath $[target_ipath:%=-I%]
#defer interrogate_spath $[install_parser_inc_dir:%=-S%]
#defer interrogate_options $[interrogate_ipath] \
#defer interrogate_options \
-DCPPPARSER -D__cplusplus $[SYSTEM_IGATE_FLAGS] \
$[interrogate_spath] \
$[interrogate_spath] $[interrogate_ipath] \
$[CDEFINES_OPT$[OPTIMIZE]:%=-D%] \
$[filter -D%,$[C++FLAGS]] \
$[INTERROGATE_OPTIONS] \

8
dtool/pptempl/Template.gmsvc.pp
View File

@ -145,8 +145,7 @@
// $[target_ipath] is the proper ipath to put on the command line,
// from the context of a particular target.
// platsdk must be on end since it has filename collisions with panda stuff (buffer.h)
#defer target_ipath $[TOPDIR] $[sort $[complete_ipath]] $[other_trees:%=%\include] $[get_ipath] $[WIN32_PLATFORMSDK_INCPATH]
#defer target_ipath $[TOPDIR] $[sort $[complete_ipath]] $[other_trees:%=%\include] $[get_ipath]
// $[file_ipath] is the ipath from the context of a particular source
// file, given in $[file]. It uses the all_sources map to look up
@ -492,12 +491,9 @@ $[TAB] cp -f $[so_dir]/$[local] $[dest]
// parallel make.
$[so_dir]/$[igatedb] : $[so_dir]/$[igateoutput]
// have to filter out plat-sdk inc dir, since interrogate is currently too buggy to parse stuff there
#define filtered_interrogate_options $[filter-out -I"C:\Program Files\Microsoft Platform Sdk\Include", $[interrogate_options]]
lib$[TARGET]_igatescan = $[igatescan]
$[so_dir]/$[igateoutput] : $[sort $[patsubst %.h,%.h,%.I,%.I,%.T,%.T,%,,$[dependencies $[igatescan]] $[igatescan:%=./%]]] $[so_dir]/stamp
$[TAB] interrogate -od $[so_dir]/$[igatedb] -oc $[so_dir]/$[igateoutput] $[filtered_interrogate_options] -module "$[igatemod]" -library "$[igatelib]" $(lib$[TARGET]_igatescan)
$[TAB] interrogate -od $[so_dir]/$[igatedb] -oc $[so_dir]/$[igateoutput] $[interrogate_options] -module "$[igatemod]" -library "$[igatelib]" $(lib$[TARGET]_igatescan)
#define target $[igateoutput:%.cxx=$[so_dir]/%.obj]
#define source $[so_dir]/$[igateoutput]

7
dtool/pptempl/Template.msvc.pp
View File

@ -150,8 +150,7 @@
// $[target_ipath] is the proper ipath to put on the command line,
// from the context of a particular target.
// (Note: platform sdk must be on end since it has filename collisions with panda stuff (buffer.h))
#defer target_ipath $[TOPDIR] $[sort $[complete_ipath]] $[other_trees:%=%\include] $[get_ipath] $[WIN32_PLATFORMSDK_INCPATH]
#defer target_ipath $[TOPDIR] $[sort $[complete_ipath]] $[other_trees:%=%\include] $[get_ipath]
// $[file_ipath] is the ipath from the context of a particular source
// file, given in $[file]. It uses the all_sources map to look up
@ -459,14 +458,12 @@ $[TAB] $[NT_COPYCMD] $[so_dir]\$[local] $[dest]
$[install_igatedb_dir]\$[igatedb] : $[so_dir]\$[igatedb]
#define local $[igatedb]
#define dest $[install_igatedb_dir]
// have to filter out plat-sdk inc dir, since interrogate is currently too buggy to parse stuff there
#define filtered_interrogate_options $[filter-out -I"C:\Program Files\Microsoft Platform Sdk\Include", $[interrogate_options]]
$[TAB] $[NT_COPYCMD] $[so_dir]\$[local] $[dest]
lib$[TARGET]_igatescan = $[osfilename $[igatescan]]
$[so_dir]\$[igatedb] $[so_dir]\$[igateoutput] : $[sort $[patsubst %.h,%.h,%.I,%.I,%.T,%.T,%,,$[dependencies $[igatescan]] $[igatescan:%=./%]]]
// We use forward slash for interrogate because it prefers those.
$[TAB] interrogate -od $[so_dir]/$[igatedb] -oc $[so_dir]/$[igateoutput] $[filtered_interrogate_options] -module "$[igatemod]" -library "$[igatelib]" $(lib$[TARGET]_igatescan)
$[TAB] interrogate -od $[so_dir]/$[igatedb] -oc $[so_dir]/$[igateoutput] $[interrogate_options] -module "$[igatemod]" -library "$[igatelib]" $(lib$[TARGET]_igatescan)
#define target $[igateoutput:%.cxx=$[so_dir]\%.obj]
#define source $[so_dir]\$[igateoutput]

2
dtool/pptempl/compilerSettings.pp
View File

@ -88,5 +88,3 @@
#if $[PREPROCESSOR_OUTPUT]
#define END_CFLAGS $[END_CFLAGS] /E
#endif