TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-02 09:52:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

Revert "makepanda: Add pyenv support"

Browse Source 
This reverts commit eef55f19d866ad9e87698cb209dd49c19869da3c.
This commit is contained in:
rdb 2020-06-14 11:07:24 +02:00
parent eef55f19d8
commit cada6c2c7b
2 changed files with 0 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
makepanda/makepanda.py
View File

@ -1972,10 +1972,6 @@ def CompileLink(dll, obj, opts):
if GetOrigExt(x) != ".dat": if GetOrigExt(x) != ".dat":
cmd += ' ' + x cmd += ' ' + x
pyenv_prefix = GetPyenvPrefix()
if pyenv_prefix is not None:
cmd += ' -L' + os.path.join(pyenv_prefix, 'lib')
if (GetOrigExt(dll) == ".exe" and GetTarget() == 'windows' and "NOICON" not in opts): if (GetOrigExt(dll) == ".exe" and GetTarget() == 'windows' and "NOICON" not in opts):
cmd += " " + GetOutputDir() + "/tmp/pandaIcon.res" cmd += " " + GetOutputDir() + "/tmp/pandaIcon.res"

24
makepanda/makepandacore.py
View File

@ -548,24 +548,6 @@ def GetFlex():
return FLEX return FLEX
def GetPyenvPrefix():
pyenv_prefix = None
try:
pyenv_prefix = subprocess.check_output(['pyenv', 'virtualenv-prefix'])
except subprocess.CalledProcessError:
pass
try:
if pyenv_prefix is None:
pyenv_prefix = subprocess.check_output(['pyenv', 'prefix'])
except subprocess.CalledProcessError:
pass
if pyenv_prefix is not None:
pyenv_prefix = pyenv_prefix.decode('utf8').strip()
return pyenv_prefix
######################################################################## ########################################################################
## ##
## LocateBinary ## LocateBinary
@ -3083,12 +3065,6 @@ def SetupBuildEnvironment(compiler):
for dir in SYS_INC_DIRS: for dir in SYS_INC_DIRS:
print(" " + dir) print(" " + dir)
# Check to see if pyenv is being used and update SYS dirs accordingly
pyenv_prefix = GetPyenvPrefix()
if pyenv_prefix is not None:
SYS_LIB_DIRS.insert(0, os.path.join(pyenv_prefix, 'lib'))
SYS_INC_DIRS.insert(0, os.path.join(pyenv_prefix, 'include'))
# If we're cross-compiling, no point in putting our output dirs on the path. # If we're cross-compiling, no point in putting our output dirs on the path.
if CrossCompiling(): if CrossCompiling():
return return