TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-03 18:31:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

build on optimize 1

Browse Source
This commit is contained in:
David Rose 2009-07-29 23:37:56 +00:00
parent 81bdd7146e
commit ed15b2bec3
3 changed files with 27 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -57,7 +57,7 @@
#if $[eq $[module $[TARGET],$[TARGET]],] #if $[eq $[module $[TARGET],$[TARGET]],]
// This library is not on a metalib, so we can build it. // This library is not on a metalib, so we can build it.
#set real_lib_targets $[real_lib_targets] $[TARGET] #set real_lib_targets $[real_lib_targets] $[TARGET]
#set real_lib_target_libs $[real_lib_target_libs] $[ODIR]/$[lib_prefix]$[TARGET]$[lib_ext] #set real_lib_target_libs $[real_lib_target_libs] $[ODIR]/$[lib_prefix]$[TARGET]$[dllext]$[lib_ext]
#else #else
// This library is on a metalib, so we can't build it, but we // This library is on a metalib, so we can't build it, but we
// should build all the obj's that go into it. // should build all the obj's that go into it.
@ -73,14 +73,14 @@
// the list of binaries that are to be built only when specifically // the list of binaries that are to be built only when specifically
// asked for. // asked for.
#define lib_targets $[forscopes metalib_target noinst_lib_target test_lib_target static_lib_target dynamic_lib_target ss_lib_target,$[if $[build_target],$[ODIR]/$[lib_prefix]$[TARGET]$[lib_ext]]] $[real_lib_target_libs] #define lib_targets $[forscopes metalib_target noinst_lib_target test_lib_target static_lib_target dynamic_lib_target ss_lib_target,$[if $[build_target],$[ODIR]/$[lib_prefix]$[TARGET]$[dllext]$[lib_ext]]] $[real_lib_target_libs]
#define bin_targets \ #define bin_targets \
$[active_target(bin_target noinst_bin_target):%=$[ODIR]/%.exe] \ $[active_target(bin_target noinst_bin_target):%=$[ODIR]/%.exe] \
$[active_target(sed_bin_target):%=$[ODIR]/%] $[active_target(sed_bin_target):%=$[ODIR]/%]
#define test_bin_targets $[active_target(test_bin_target):%=$[ODIR]/%.exe] #define test_bin_targets $[active_target(test_bin_target):%=$[ODIR]/%.exe]
#defer test_lib_targets $[active_target(test_lib_target):%=$[if $[TEST_ODIR],$[TEST_ODIR],$[ODIR]]/%$[lib_ext]] #defer test_lib_targets $[active_target(test_lib_target):%=$[if $[TEST_ODIR],$[TEST_ODIR],$[ODIR]]/%$[dllext]$[lib_ext]]
// And these variables will define the various things we need to // And these variables will define the various things we need to
// install. // install.
@ -368,9 +368,9 @@ igate : $[get_igatedb(metalib_target lib_target ss_lib_target)]
$[components $[patsubst %,$[RELDIR]/$[%_obj],$[compile_sources]],$[active_component_libs]] $[components $[patsubst %,$[RELDIR]/$[%_obj],$[compile_sources]],$[active_component_libs]]
#endif #endif
#define varname $[subst -,_,.,_,$[lib_prefix]$[TARGET]$[lib_ext]] #define varname $[subst -,_,.,_,$[lib_prefix]$[TARGET]$[dllext]$[lib_ext]]
$[varname] = $[sources] $[varname] = $[sources]
#define target $[ODIR]/$[lib_prefix]$[TARGET]$[lib_ext] #define target $[ODIR]/$[lib_prefix]$[TARGET]$[dllext]$[lib_ext]
#define sources $($[varname]) #define sources $($[varname])
#define flags $[get_cflags] $[C++FLAGS] $[CFLAGS_OPT$[OPTIMIZE]] $[CFLAGS_SHARED] $[building_var:%=/D%] #define flags $[get_cflags] $[C++FLAGS] $[CFLAGS_OPT$[OPTIMIZE]] $[CFLAGS_SHARED] $[building_var:%=/D%]
@ -402,10 +402,10 @@ $[TAB] $[link_lib_c]
// Additional dependency rules for the implicit files that get built // Additional dependency rules for the implicit files that get built
// along with a .dll. // along with a .dll.
#if $[not $[lib_is_static]] #if $[not $[lib_is_static]]
$[ODIR]/$[lib_prefix]$[TARGET].lib : $[ODIR]/$[lib_prefix]$[TARGET]$[lib_ext] $[ODIR]/$[lib_prefix]$[TARGET]$[dllext].lib : $[ODIR]/$[lib_prefix]$[TARGET]$[dllext]$[lib_ext]
#endif #endif
#if $[has_pdb] #if $[has_pdb]
$[ODIR]/$[lib_prefix]$[TARGET].pdb : $[ODIR]/$[lib_prefix]$[TARGET]$[lib_ext] $[ODIR]/$[lib_prefix]$[TARGET]$[dllext].pdb : $[ODIR]/$[lib_prefix]$[TARGET]$[dllext]$[lib_ext]
#endif #endif
#endif #endif
@ -414,9 +414,9 @@ $[ODIR]/$[lib_prefix]$[TARGET].pdb : $[ODIR]/$[lib_prefix]$[TARGET]$[lib_ext]
// everything that goes along with it. // everything that goes along with it.
#define installed_files \ #define installed_files \
$[if $[build_lib], \ $[if $[build_lib], \
$[install_lib_dir]/$[lib_prefix]$[TARGET]$[lib_ext] \ $[install_lib_dir]/$[lib_prefix]$[TARGET]$[dllext]$[lib_ext] \
$[if $[not $[lib_is_static]],$[install_lib_dir]/$[lib_prefix]$[TARGET].lib] \ $[if $[not $[lib_is_static]],$[install_lib_dir]/$[lib_prefix]$[TARGET]$[dllext].lib] \
$[if $[has_pdb],$[install_lib_dir]/$[lib_prefix]$[TARGET].pdb] \ $[if $[has_pdb],$[install_lib_dir]/$[lib_prefix]$[TARGET]$[dllext].pdb] \
] \ ] \
$[INSTALL_SCRIPTS:%=$[install_bin_dir]/%] \ $[INSTALL_SCRIPTS:%=$[install_bin_dir]/%] \
$[INSTALL_HEADERS:%=$[install_headers_dir]/%] \ $[INSTALL_HEADERS:%=$[install_headers_dir]/%] \
@ -431,8 +431,8 @@ uninstall-lib$[TARGET] :
$[TAB] rm -f $[sort $[installed_files]] $[TAB] rm -f $[sort $[installed_files]]
#endif #endif
$[install_lib_dir]/$[lib_prefix]$[TARGET]$[lib_ext] : $[ODIR]/$[lib_prefix]$[TARGET]$[lib_ext] $[install_lib_dir]/$[lib_prefix]$[TARGET]$[dllext]$[lib_ext] : $[ODIR]/$[lib_prefix]$[TARGET]$[dllext]$[lib_ext]
#define local $[lib_prefix]$[TARGET]$[lib_ext] #define local $[lib_prefix]$[TARGET]$[dllext]$[lib_ext]
#define dest $[install_lib_dir] #define dest $[install_lib_dir]
#if $[eq $[USE_COMPILER], MSVC8] #if $[eq $[USE_COMPILER], MSVC8]
$[TAB] mt -manifest $[ODIR]/$[local].manifest -outputresource:$[ODIR]/$[local]\;2 $[TAB] mt -manifest $[ODIR]/$[local].manifest -outputresource:$[ODIR]/$[local]\;2
@ -442,16 +442,16 @@ $[TAB] cp $[install_dash_p] -f $[ODIR]/$[local] $[dest]/
// Install the .lib associated with a .dll. // Install the .lib associated with a .dll.
#if $[not $[lib_is_static]] #if $[not $[lib_is_static]]
$[install_lib_dir]/$[lib_prefix]$[TARGET].lib : $[ODIR]/$[lib_prefix]$[TARGET].lib $[install_lib_dir]/$[lib_prefix]$[TARGET]$[dllext].lib : $[ODIR]/$[lib_prefix]$[TARGET]$[dllext].lib
#define local $[lib_prefix]$[TARGET].lib #define local $[lib_prefix]$[TARGET]$[dllext].lib
#define dest $[install_lib_dir] #define dest $[install_lib_dir]
$[TAB] cp $[install_dash_p] -f $[ODIR]/$[local] $[dest]/ $[TAB] cp $[install_dash_p] -f $[ODIR]/$[local] $[dest]/
#endif #endif
#if $[has_pdb] #if $[has_pdb]
$[install_lib_dir]/$[lib_prefix]$[TARGET].pdb : $[ODIR]/$[lib_prefix]$[TARGET].pdb $[install_lib_dir]/$[lib_prefix]$[TARGET]$[dllext].pdb : $[ODIR]/$[lib_prefix]$[TARGET]$[dllext].pdb
#define local $[lib_prefix]$[TARGET].pdb #define local $[lib_prefix]$[TARGET]$[dllext].pdb
#define dest $[install_lib_dir] #define dest $[install_lib_dir]
$[TAB] cp $[install_dash_p] -f $[ODIR]/$[local] $[dest]/ $[TAB] cp $[install_dash_p] -f $[ODIR]/$[local] $[dest]/
#endif #endif
@ -514,9 +514,9 @@ $[TAB] $[INTERROGATE_MODULE] -oc $[target] -module "$[igatemod]" -library "$[iga
///////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////
#forscopes noinst_lib_target test_lib_target #forscopes noinst_lib_target test_lib_target
#define varname $[subst -,_,.,_,$[lib_prefix]$[TARGET]$[lib_ext]] #define varname $[subst -,_,.,_,$[lib_prefix]$[TARGET]$[dllext]$[lib_ext]]
$[varname] = $[patsubst %,$[%_obj],$[compile_sources]] $[varname] = $[patsubst %,$[%_obj],$[compile_sources]]
#define target $[ODIR]/$[lib_prefix]$[TARGET]$[lib_ext] #define target $[ODIR]/$[lib_prefix]$[TARGET]$[dllext]$[lib_ext]
#define sources $($[varname]) #define sources $($[varname])
#define $[VER_RESOURCE] $[COMPILED_RESOURCES] #define $[VER_RESOURCE] $[COMPILED_RESOURCES]
$[target] : $[sources] $[static_lib_dependencies] $[GENERATED_SOURCES] $[target] : $[sources] $[static_lib_dependencies] $[GENERATED_SOURCES]
@ -526,9 +526,9 @@ $[TAB] $[link_lib_c++]
$[TAB] $[link_lib_c] $[TAB] $[link_lib_c]
#endif #endif
$[ODIR]/$[lib_prefix]$[TARGET]$[lib_ext] : $[ODIR]/$[lib_prefix]$[TARGET]$[lib_ext] $[ODIR]/$[lib_prefix]$[TARGET]$[dllext]$[lib_ext] : $[ODIR]/$[lib_prefix]$[TARGET]$[dllext]$[lib_ext]
#if $[has_pdb] #if $[has_pdb]
$[ODIR]/$[lib_prefix]$[TARGET].pdb : $[ODIR]/$[lib_prefix]$[TARGET]$[lib_ext] $[ODIR]/$[lib_prefix]$[TARGET]$[dllext].pdb : $[ODIR]/$[lib_prefix]$[TARGET]$[dllext]$[lib_ext]
#endif #endif
// this section is all very clunky and not generalized enough // this section is all very clunky and not generalized enough

2
dtool/src/dtoolutil/executionEnvironment.cxx
View File

@ -220,7 +220,7 @@ ns_get_environment_variable(const string &var) const {
Filename main_dir (PyString_AsString(PyList_GetItem(obj, 0))); Filename main_dir (PyString_AsString(PyList_GetItem(obj, 0)));
if (main_dir.empty()) { if (main_dir.empty()) {
// We must be running in the Python interpreter directly, so return the CWD. // We must be running in the Python interpreter directly, so return the CWD.
return get_cwd(); return get_cwd().to_os_specific();
} }
main_dir.make_absolute(); main_dir.make_absolute();
return Filename(main_dir.get_dirname()).to_os_specific(); return Filename(main_dir.get_dirname()).to_os_specific();

13
dtool/src/interrogatedb/config_interrogatedb.cxx
View File

@ -14,7 +14,8 @@
#include "config_interrogatedb.h" #include "config_interrogatedb.h"
#include "interrogate_request.h" #include "interrogate_request.h"
#include "configVariableString.h" #include "configVariableBool.h"
#include "configVariableSearchPath.h"
#include "dconfig.h" #include "dconfig.h"
#if defined(WIN32_VC) && defined(_DEBUG) #if defined(WIN32_VC) && defined(_DEBUG)
@ -30,12 +31,12 @@ ConfigureFn(config_interrogatedb) {
// interrogate_request_library("types"); // interrogate_request_library("types");
#ifdef USE_WIN32_DBGHEAP #ifdef USE_WIN32_DBGHEAP
string use_win32_dbgheap_str = config_interrogatedb.GetString("use-win32-dbgheap", ""); ConfigVariableBool use_win32_dbgheap("use-win32-dbgheap", false);
bool win32_report_leaks = config_interrogatedb.GetBool("win32-report-leaks", false); ConfigVariableBool win32_report_leaks("win32-report-leaks", false);
int dbg_flags = _CrtSetDbgFlag( _CRTDBG_REPORT_FLAG ); int dbg_flags = _CrtSetDbgFlag( _CRTDBG_REPORT_FLAG );
if (use_win32_dbgheap_str == "full") { if (use_win32_dbgheap.get_string_value() == "full") {
// "full" means check the heap after *every* alloc/dealloc. // "full" means check the heap after *every* alloc/dealloc.
// Expensive. // Expensive.
dbg_flags |= (_CRTDBG_ALLOC_MEM_DF | _CRTDBG_CHECK_ALWAYS_DF | dbg_flags |= (_CRTDBG_ALLOC_MEM_DF | _CRTDBG_CHECK_ALWAYS_DF |
@ -44,9 +45,7 @@ ConfigureFn(config_interrogatedb) {
} else { } else {
// Otherwise, it's a bool flag. true means check the heap // Otherwise, it's a bool flag. true means check the heap
// normally, false means don't do any debug checking. // normally, false means don't do any debug checking.
bool use_win32_dbgheap_bool = config_interrogatedb.GetBool("use-win32-dbgheap", false); if (!use_win32_dbgheap) {
if (!use_win32_dbgheap_bool) {
// deflt disable complete heap verify every 1024 allocations (VC7 deflt). // deflt disable complete heap verify every 1024 allocations (VC7 deflt).
// With vc7 stl small-string-optimization causing more allocs, // With vc7 stl small-string-optimization causing more allocs,
// this can cause order-of-magnitude slowdowns in dbg builds // this can cause order-of-magnitude slowdowns in dbg builds