TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-03 10:22:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

generate .lib for .pyd files on Windows.

Browse Source
This commit is contained in:
rdb 2014-02-20 20:00:45 +00:00
parent 60fb5376f9
commit 260cb66c54
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
makepanda/makepanda.py
View File

@ -1354,12 +1354,12 @@ def CompileLink(dll, obj, opts):
cmd += ' /OUT:' + BracketNameWithQuotes(dll) cmd += ' /OUT:' + BracketNameWithQuotes(dll)
subsystem = GetValueOption(opts, "SUBSYSTEM:") subsystem = GetValueOption(opts, "SUBSYSTEM:")
if (subsystem): cmd += " /SUBSYSTEM:" + subsystem if (subsystem): cmd += " /SUBSYSTEM:" + subsystem
if (dll.endswith(".dll")): if (dll.endswith(".dll") or dll.endswith(".pyd")):
cmd += ' /IMPLIB:' + GetOutputDir() + '/lib/'+os.path.splitext(os.path.basename(dll))[0]+".lib" cmd += ' /IMPLIB:' + GetOutputDir() + '/lib/' + os.path.splitext(os.path.basename(dll))[0] + ".lib"
for (opt, dir) in LIBDIRECTORIES: for (opt, dir) in LIBDIRECTORIES:
if (opt=="ALWAYS") or (opt in opts): cmd += ' /LIBPATH:' + BracketNameWithQuotes(dir) if (opt=="ALWAYS") or (opt in opts): cmd += ' /LIBPATH:' + BracketNameWithQuotes(dir)
for x in obj: for x in obj:
if (x.endswith(".dll")): if (x.endswith(".dll") or x.endswith(".pyd")):
cmd += ' ' + GetOutputDir() + '/lib/' + os.path.splitext(os.path.basename(x))[0] + ".lib" cmd += ' ' + GetOutputDir() + '/lib/' + os.path.splitext(os.path.basename(x))[0] + ".lib"
elif (x.endswith(".lib")): elif (x.endswith(".lib")):
dname = os.path.splitext(os.path.basename(x))[0] + ".dll" dname = os.path.splitext(os.path.basename(x))[0] + ".dll"
@ -1401,12 +1401,12 @@ def CompileLink(dll, obj, opts):
cmd += ' /OUT:' + BracketNameWithQuotes(dll) cmd += ' /OUT:' + BracketNameWithQuotes(dll)
subsystem = GetValueOption(opts, "SUBSYSTEM:") subsystem = GetValueOption(opts, "SUBSYSTEM:")
if (subsystem): cmd += " /SUBSYSTEM:" + subsystem if (subsystem): cmd += " /SUBSYSTEM:" + subsystem
if (dll.endswith(".dll")): if (dll.endswith(".dll") or dll.endswith(".pyd")):
cmd += ' /IMPLIB:' + GetOutputDir() + '/lib/'+os.path.splitext(os.path.basename(dll))[0]+".lib" cmd += ' /IMPLIB:' + GetOutputDir() + '/lib/'+os.path.splitext(os.path.basename(dll))[0]+".lib"
for (opt, dir) in LIBDIRECTORIES: for (opt, dir) in LIBDIRECTORIES:
if (opt=="ALWAYS") or (opt in opts): cmd += ' /LIBPATH:' + BracketNameWithQuotes(dir) if (opt=="ALWAYS") or (opt in opts): cmd += ' /LIBPATH:' + BracketNameWithQuotes(dir)
for x in obj: for x in obj:
if (x.endswith(".dll")): if (x.endswith(".dll") or x.endswith(".pyd")):
cmd += ' ' + GetOutputDir() + '/lib/' + os.path.splitext(os.path.basename(x))[0] + ".lib" cmd += ' ' + GetOutputDir() + '/lib/' + os.path.splitext(os.path.basename(x))[0] + ".lib"
elif (x.endswith(".lib")): elif (x.endswith(".lib")):
dname = os.path.splitext(dll)[0]+".dll" dname = os.path.splitext(dll)[0]+".dll"