mirror of
https://github.com/panda3d/panda3d.git
synced 2025-10-02 09:52:27 -04:00
fix depedencies on cygwin/unix
This commit is contained in:
parent
5f449727e1
commit
0c13c5c763
@ -486,7 +486,7 @@
|
||||
// this variable, $[source] is the name of the file to read, $[target]
|
||||
// is the name of the file to generate, and $[script] is the one-line
|
||||
// sed script to run.
|
||||
#defer SED ppremake -s '$[script]' <$[source] >$[target]
|
||||
#defer SED ppremake -s "$[script]" <$[source] >$[target]
|
||||
|
||||
// What directory name (within each source directory) should the .o
|
||||
// (or .obj) files be written to? This can be any name, and it can be
|
||||
|
@ -359,7 +359,7 @@ $[varname] = $[sources]
|
||||
|
||||
// not parallel (requires gmake 3.79) because of link.exe conflicts in TMP dir (see audiotraits dir)
|
||||
#if $[GENERATE_BUILDDATE]
|
||||
.NOTPARALLEL $[target] : $[sources] $[static_lib_dependencies] $[dtool_ver_dir_cyg]/version.rc $[dtool_ver_dir_cyg]/$[DLLBASEADDRFILENAME]
|
||||
.NOTPARALLEL $[target] : $[sources] $[static_lib_dependencies] $[dtool_ver_dir_cyg]/version.rc $[DLLBASEADDRFILENAME:%=$[dtool_ver_dir_cyg]/%]
|
||||
// first generate builddate for rc compiler using compiler preprocessor
|
||||
$[TAB] mkdir -p $[tmpdirname_cyg] // this dir-creation-stuff is leftover from trying to resolve parallel link difficulties
|
||||
#define VER_RESOURCE "$[tmpdirname_win]\$[mybasename].res"
|
||||
@ -371,7 +371,7 @@ $[TAB] $[SHARED_LIB_C++] $[VER_RESOURCE]
|
||||
$[TAB] $[SHARED_LIB_C] $[VER_RESOURCE]
|
||||
#endif
|
||||
#else
|
||||
.NOTPARALLEL $[target] : $[sources] $[dtool_ver_dir_cyg]/$[DLLBASEADDRFILENAME]
|
||||
.NOTPARALLEL $[target] : $[sources] $[DLLBASEADDRFILENAME:%=$[dtool_ver_dir_cyg]/%]
|
||||
#if $[filter %.cxx %.cpp %.yxx %.lxx,$[get_sources]]
|
||||
$[TAB] $[SHARED_LIB_C++]
|
||||
#else
|
||||
|
Loading…
x
Reference in New Issue
Block a user