TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-04 02:42:49 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix my screwups that broke non-precomp dirs

Browse Source
This commit is contained in:
cxgeorge 2001-06-01 03:31:54 +00:00
parent 77c9863819
commit 21933936d5
4 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -90,7 +90,7 @@
#defer DEBUG_TYPE_FLAGS /Zi /Fd"$[osfilename $[target:%.obj=%.pdb]]"
#elif $[eq $[NUMBER_OF_PROCESSORS],1]
// no multi-proc, so can use same .pdb file for each compile
#defer DEBUG_TYPE_FLAGS /Zi /Fd"$[osfilename $[target_dirname].pdb]"
#defer DEBUG_TYPE_FLAGS /Zi /Fd"$[osfilename $[pdb_filename].pdb]"
#else
// puts dbg info inside first .obj
#defer DEBUG_TYPE_FLAGS /Z7

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

@ -87,7 +87,7 @@
#defer DEBUG_TYPE_FLAGS /Zi /Fd"$[osfilename $[target:%.obj=%.pdb]]"
#else
// for pch, .pdb file name must be the same for obj and pch header obj
#defer DEBUG_TYPE_FLAGS /Zi /Fd"$[osfilename $[target_dirname].pdb]"
#defer DEBUG_TYPE_FLAGS /Zi /Fd"$[osfilename $[pdb_filename].pdb]"
#endif
#include $[THISDIRPREFIX]compilerSettings.pp

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

@ -772,12 +772,12 @@ $[TAB] $[COMPILE_C++]
#define source $[file]
#define ipath $[file_ipath]
#define pdb_filename $[st_dir]/$[TARGET(lib_target)]
#if $[DO_PCH]
// best way to find out if file use pch (and needs /Yu) is to check dependencies
// these must be defined before flags (or could defer them)
#define target_pch $[subst /./,/,$[patsubst %.h,$[st_dir]/%.pch,$[filter %_headers.h, $[dependencies $[file]]]]]
#define target_dirname $[patsubst %_headers.pch,%,$[target_pch]]
#endif
#define flags $[c++flags] $[all_sources $[building_var:%=/D%],$[file]]
@ -798,12 +798,13 @@ $[TAB] $[COMPILE_LINE]
#foreach file $[pch_header_source]
#define target_pch $[patsubst %.h,$[st_dir]/%.pch,$[file]]
#define target_obj $[patsubst %.h,$[st_dir]/%.obj,$[file]]
#define target_dirname $[patsubst %_headers.pch,%,$[target_pch]]
#define pdb_filename $[st_dir]/$[TARGET(lib_target)]
#define target $[target_obj]
#define source $[file]
#define ipath $[file_ipath]
#define flags $[c++flags] $[CFLAGS_SHARED] $[all_sources $[building_var:%=/D%],$[file]]
// Yacc must run before some files can be compiled, so all files
// depend on yacc having run.
$[target_obj] : $[source] $[dependencies $[file]] $[st_dir]/stamp

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

@ -728,11 +728,12 @@ $[TAB] $[COMPILE_C]
#define source $[file]
#define ipath $[file_ipath]
#define pdb_filename $[st_dir]/$[TARGET(lib_target)]
#if $[DO_PCH]
// best way to find out if file use pch (and needs /Yu) is to check dependencies
// these must be defined before flags (or could defer them)
#define target_pch $[subst \./,\,$[patsubst %.h,$[so_dir]\%.pch,$[filter %_headers.h, $[dependencies $[file]]]]]
#define target_dirname $[patsubst %_headers.pch,%,$[target_pch]]
#endif
#define flags $[c++flags] $[CFLAGS_SHARED] $[all_sources $[building_var:%=/D%],$[file]]
@ -753,15 +754,17 @@ $[TAB] $[COMPILE_LINE]
// Rules to compile C++ files that appear on a static library or in an
// executable.
#foreach file $[sort $[cxx_st_sources]]
#define target $[patsubst %.cxx,$[st_dir]\%.obj,$[file]]
#define source $[file]
#define ipath $[file_ipath]
#define pdb_filename $[st_dir]/$[TARGET(lib_target)]
#if $[DO_PCH]
// best way to find out if file use pch (and needs /Yu) is to check dependencies
// these must be defined before flags (or could defer them)
#define target_pch $[subst \./,\,$[patsubst %.h,$[st_dir]\%.pch,$[filter %_headers.h, $[dependencies $[file]]]]]
#define target_dirname $[patsubst %_headers.pch,%,$[target_pch]]
#endif
#define flags $[c++flags] $[all_sources $[building_var:%=/D%],$[file]]
@ -784,7 +787,7 @@ $[TAB] $[COMPILE_LINE]
#foreach file $[pch_header_source]
#define target_pch $[patsubst %.h,$[st_dir]\%.pch,$[file]]
#define target_obj $[patsubst %.h,$[st_dir]\%.obj,$[file]]
#define target_dirname $[patsubst %_headers.pch,%,$[target_pch]]
#define pdb_filename $[st_dir]/$[TARGET(lib_target)]
#define target $[target_obj]
#define source $[file]
#define ipath $[file_ipath]