diff --git a/dtool/pptempl/Global.gmsvc.pp b/dtool/pptempl/Global.gmsvc.pp index 33c4f463c4..29b3a06d88 100644 --- a/dtool/pptempl/Global.gmsvc.pp +++ b/dtool/pptempl/Global.gmsvc.pp @@ -72,11 +72,18 @@ #defer CFLAGS_OPT3 $[CDEFINES_OPT3:%=/D%] /MD /Gi- #defer CFLAGS_OPT4 $[CDEFINES_OPT4:%=/D%] /MD /Gi- +#if $[ENABLE_PROFILING] +// note according to docs, this should force /PDB:none /DEBUGTYPE:cv, so no pdb file is generated for debug?? (doesnt seem to be true) +#define PROFILE_FLAG /PROFILE +#else +#define PROFILE_FLAG +#endif + // NODEFAULTLIB ensures static libs linked in will connect to the correct msvcrt, so no debug/release mixing occurs -#defer LDFLAGS_OPT1 /debug /incremental:no /NODEFAULTLIB:MSVCRT.LIB /WARN:3 -#defer LDFLAGS_OPT2 /debug /incremental:no /NODEFAULTLIB:MSVCRT.LIB /WARN:3 -#defer LDFLAGS_OPT3 /fixed:no /NODEFAULTLIB:MSVCRTD.LIB /WARN:3 -#defer LDFLAGS_OPT4 /fixed:no /NODEFAULTLIB:MSVCRTD.LIB +#defer LDFLAGS_OPT1 /debug /incremental:no /NODEFAULTLIB:MSVCRT.LIB /WARN:3 $[PROFILE_FLAG] +#defer LDFLAGS_OPT2 /debug /incremental:no /NODEFAULTLIB:MSVCRT.LIB /WARN:3 $[PROFILE_FLAG] +#defer LDFLAGS_OPT3 /fixed:no /NODEFAULTLIB:MSVCRTD.LIB /WARN:3 $[PROFILE_FLAG] +#defer LDFLAGS_OPT4 /fixed:no /NODEFAULTLIB:MSVCRTD.LIB $[PROFILE_FLAG] // $[dllext] will be "_d" for debug builds, and empty for non-debug // builds. This is the extra bit of stuff we tack on to the end of a diff --git a/dtool/pptempl/Template.gmsvc.pp b/dtool/pptempl/Template.gmsvc.pp index fe2685df8f..70328068fb 100644 --- a/dtool/pptempl/Template.gmsvc.pp +++ b/dtool/pptempl/Template.gmsvc.pp @@ -34,14 +34,11 @@ #end decygwin // cant use DTOOL_INSTALL since may not be attached -//#define dtool_ver_dir_cyg $[DTOOL_INSTALL]/src/dtoolbase -//#define dtool_ver_dir $[decygwin %,%,$[dtool_ver_dir_cyg]] - -#define dtool_ver_dir_cyg ../../../dtool/src/dtoolbase +#define dtool_ver_dir_cyg $[DTOOL_INSTALL]/src/dtoolbase #define dtool_ver_dir $[decygwin %,%,$[dtool_ver_dir_cyg]] - - +//#define dtool_ver_dir_cyg ../../../dtool/src/dtoolbase +//#define dtool_ver_dir $[decygwin %,%,$[dtool_ver_dir_cyg]] ////////////////////////////////////////////////////////////////////// #if $[or $[eq $[DIR_TYPE], src],$[eq $[DIR_TYPE], metalib]]