From 9da51d4081891a5c4baf9e26cbbae9f611f361b6 Mon Sep 17 00:00:00 2001 From: georges <> Date: Thu, 28 Dec 2000 21:50:37 +0000 Subject: [PATCH] another attempt to solve multiproc build issue with versioning change --- dtool/pptempl/Template.gmsvc.pp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/dtool/pptempl/Template.gmsvc.pp b/dtool/pptempl/Template.gmsvc.pp index e0b762647b..baabc6e591 100644 --- a/dtool/pptempl/Template.gmsvc.pp +++ b/dtool/pptempl/Template.gmsvc.pp @@ -340,15 +340,17 @@ $[varname] = $[sources] #define target $[so_dir]/lib$[TARGET]$[dllext].dll #define sources $($[varname]) #define flags $[get_cflags] $[C++FLAGS] $[CFLAGS_OPT$[OPTIMIZE]] $[CFLAGS_SHARED] $[building_var:%=/D%] + #define tmpverdatedirname $[directory]/$[subst /,-, $[target]] $[target] : $[sources] $[so_dir]/stamp $[dtool_ver_dir_cyg]/version.rc - // first generate builddate for rc compiler - // uses different .res names, no rm verdate.h to allow multi-proc build to work - cl /nologo /EP "$[dtool_ver_dir]\verdate.cpp" > "$[dtool_ver_dir]\verdate.h" - rc /n /fo"$[target]-ver.res" $[filter /D%, $[flags]] "$[dtool_ver_dir]\version.rc" + // first generate builddate for rc compiler + // different .res names and mkdir used to solve multiproc build issues (have multiple verdate.h's and .res files) + mkdir -p $[tmpverdatedirname] + cl /nologo /EP "$[dtool_ver_dir]\verdate.cpp" > "$[decygwin %,%,$[tmpverdatedirname]]\verdate.h" + rc /n /i"$[decygwin %,%,$[tmpverdatedirname]]" /fo"$[target]-ver.res" $[filter /D%, $[flags]] "$[dtool_ver_dir]\version.rc" #if $[filter %.cxx %.yxx %.lxx,$[get_sources]] - $[SHARED_LIB_C++] "$[target]-ver.res" + $[SHARED_LIB_C++] "$[decygwin %,%,$[target]-ver.res]" #else - $[SHARED_LIB_C] "$[target]-ver.res" + $[SHARED_LIB_C] "$[decygwin %,%,$[target]-ver.res]" #endif $[so_dir]/lib$[TARGET]$[dllext].lib : $[so_dir]/lib$[TARGET]$[dllext].dll