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

Fix Android compile on Windows

Browse Source
This commit is contained in:
rdb 2016-02-05 23:21:23 +01:00
parent 30fc995a2d
commit ffaa7419ec
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
makepanda/makepanda.py
View File

@ -457,7 +457,6 @@ SdkLocateMaya()
SdkLocateMax() SdkLocateMax()
SdkLocateMacOSX(OSXTARGET) SdkLocateMacOSX(OSXTARGET)
SdkLocatePython(RTDIST) SdkLocatePython(RTDIST)
SdkLocateVisualStudio(MSVC_VERSION)
SdkLocateWindows(WINDOWS_SDK) SdkLocateWindows(WINDOWS_SDK)
SdkLocatePhysX() SdkLocatePhysX()
SdkLocateSpeedTree() SdkLocateSpeedTree()
@ -496,6 +495,7 @@ if RUNTIME and not HOST_URL:
if GetHost() == 'windows' and GetTarget() == 'windows': if GetHost() == 'windows' and GetTarget() == 'windows':
COMPILER = "MSVC" COMPILER = "MSVC"
SdkLocateVisualStudio(MSVC_VERSION)
else: else:
COMPILER = "GCC" COMPILER = "GCC"
@ -737,6 +737,9 @@ if (COMPILER=="GCC"):
IncDirectory("ALWAYS", "/usr/PCBSD/local/include") IncDirectory("ALWAYS", "/usr/PCBSD/local/include")
LibDirectory("ALWAYS", "/usr/PCBSD/local/lib") LibDirectory("ALWAYS", "/usr/PCBSD/local/lib")
if GetTarget() != "windows":
PkgDisable("DIRECTCAM")
fcollada_libs = ("FColladaD", "FColladaSD", "FColladaS") fcollada_libs = ("FColladaD", "FColladaSD", "FColladaS")
# WARNING! The order of the ffmpeg libraries matters! # WARNING! The order of the ffmpeg libraries matters!
ffmpeg_libs = ("libavformat", "libavcodec", "libavutil") ffmpeg_libs = ("libavformat", "libavcodec", "libavutil")
@ -4323,7 +4326,7 @@ if (GetTarget() == 'windows' and not RUNTIME):
# DIRECTORY: panda/metalibs/pandadx9/ # DIRECTORY: panda/metalibs/pandadx9/
# #
if PkgSkip("DX9")==0 and not RUNTIME: if GetTarget() == 'windows' and PkgSkip("DX9")==0 and not RUNTIME:
OPTS=['DIR:panda/src/dxgsg9', 'BUILDING:PANDADX', 'DX9', 'NVIDIACG', 'CGDX9'] OPTS=['DIR:panda/src/dxgsg9', 'BUILDING:PANDADX', 'DX9', 'NVIDIACG', 'CGDX9']
TargetAdd('p3dxgsg9_dxGraphicsStateGuardian9.obj', opts=OPTS, input='dxGraphicsStateGuardian9.cxx') TargetAdd('p3dxgsg9_dxGraphicsStateGuardian9.obj', opts=OPTS, input='dxGraphicsStateGuardian9.cxx')
TargetAdd('p3dxgsg9_composite1.obj', opts=OPTS, input='p3dxgsg9_composite1.cxx') TargetAdd('p3dxgsg9_composite1.obj', opts=OPTS, input='p3dxgsg9_composite1.cxx')

3
makepanda/makepandacore.py
View File

@ -2008,7 +2008,8 @@ def SdkLocateVisualStudio(version=10):
print("Using Visual Studio %s" % (version)) print("Using Visual Studio %s" % (version))
def SdkLocateWindows(version = '7.1'): def SdkLocateWindows(version = '7.1'):
if (GetHost() != "windows"): return if GetTarget() != "windows" or GetHost() != "windows":
return
version = version.upper() version = version.upper()