mirror/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2026-04-30 03:31:04 -05:00
Code Issues Packages Projects Releases Wiki Activity

o fix early evaluation problem with LDFLAGS_OPT3/4 not allowing selection of static or dynamic library linking

Browse Source 
o support cdefs with MIDL_COMMAND through new IDL_CDEFS
This commit is contained in:
Joseph Lee
2008-06-20 01:18:36 +00:00
parent b8c77b1ac9
commit d571f24a62
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dtool/pptempl/Template.gmsvc.pp
+13 -1
View File
@@ -28,6 +28,18 @@
#define dtool_ver_dir $[osfilename $[dtool_ver_dir_cyg]]
#endif
//
// Correct LDFLAGS_OPT 3,4 here to get around early evaluation of, even
// if deferred
//
#defer nodefaultlib_cstatic \
$[if $[ne $[LINK_FORCE_STATIC_RELEASE_C_RUNTIME],], \
/NODEFAULTLIB:MSVCRT.LIB, \
/NODEFAULTLIB:LIBCMT.LIB \
]
#defer LDFLAGS_OPT3 $[LDFLAGS_OPT3] $[nodefaultlib_cstatic]
#defer LDFLAGS_OPT4 $[LDFLAGS_OPT4] $[nodefaultlib_cstatic]
//////////////////////////////////////////////////////////////////////
#if $[or $[eq $[DIR_TYPE], src],$[eq $[DIR_TYPE], metalib]]
//////////////////////////////////////////////////////////////////////
@@ -554,7 +566,7 @@ $[TAB] $[VERHEADER_GENERATOR_RULE]
$[VERHEADER_DEPENDENTS] : $[verhdr_to_gen]
#endif
#define MIDL_COMMAND $[COMPILE_IDL] /out $[ODIR] $[ODIR]/$[IDL_BASENAME].idl
#define MIDL_COMMAND $[COMPILE_IDL] /out $[ODIR] $[ODIR]/$[IDL_BASENAME].idl $[IDL_CDEFS:%=/D%]
#define idl_to_gen $[filter %.idl, $[GENERATED_SOURCES]]
#if $[idl_to_gen]