Browse Source

fix LINK_ALL_STATIC

David Rose 21 years ago
parent
commit
67b112010c
2 changed files with 2 additions and 2 deletions
  1. 1 1
      dtool/pptempl/Global.gmsvc.pp
  2. 1 1
      dtool/pptempl/Global.msvc.pp

+ 1 - 1
dtool/pptempl/Global.gmsvc.pp

@@ -127,7 +127,7 @@
 #defer COMPILE_C $[COMPILER] /Fo"$[osfilename $[target]]" $[MAIN_C_COMPILE_ARGS]
 #defer COMPILE_C $[COMPILER] /Fo"$[osfilename $[target]]" $[MAIN_C_COMPILE_ARGS]
 #defer COMPILE_C++ $[COMPILE_C]
 #defer COMPILE_C++ $[COMPILE_C]
 
 
-#defer STATIC_LIB_C $[LIBBER] /nologo $[sources] /OUT:"$[osfilename $[target]]"
+#defer STATIC_LIB_C $[LIBBER] /nologo $[sources] /OUT:"$[osfilename $[target]]" $[decygwin %,/LIBPATH:"%",$[lpath] $[EXTRA_LIBPATH]] $[patsubst %.lib,%.lib,%,lib%.lib,$[libs]]
 #defer STATIC_LIB_C++ $[STATIC_LIB_C]
 #defer STATIC_LIB_C++ $[STATIC_LIB_C]
 
 
 #defer COMPILE_IDL midl /nologo /env win32 /Oicf $[DECYGWINED_INC_PATHLIST_ARGS]
 #defer COMPILE_IDL midl /nologo /env win32 /Oicf $[DECYGWINED_INC_PATHLIST_ARGS]

+ 1 - 1
dtool/pptempl/Global.msvc.pp

@@ -138,7 +138,7 @@
 #defer COMPILE_C $[COMPILER] /Fo"$[osfilename $[target]]" $[MAIN_C_COMPILE_ARGS]
 #defer COMPILE_C $[COMPILER] /Fo"$[osfilename $[target]]" $[MAIN_C_COMPILE_ARGS]
 #defer COMPILE_C++ $[COMPILE_C]
 #defer COMPILE_C++ $[COMPILE_C]
 
 
-#defer STATIC_LIB_C $[LIBBER] /nologo $[sources] /OUT:"$[osfilename $[target]]"
+#defer STATIC_LIB_C $[LIBBER] /nologo $[sources] /OUT:"$[osfilename $[target]]" $[decygwin %,/LIBPATH:"%",$[lpath] $[EXTRA_LIBPATH]] $[patsubst %.lib,%.lib,%,lib%.lib,$[libs]]
 #defer STATIC_LIB_C++ $[STATIC_LIB_C]
 #defer STATIC_LIB_C++ $[STATIC_LIB_C]
 
 
 #defer COMPILE_IDL midl /nologo /env win32 /Oicf $[DECYGWINED_INC_PATHLIST_ARGS]
 #defer COMPILE_IDL midl /nologo /env win32 /Oicf $[DECYGWINED_INC_PATHLIST_ARGS]