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

Oops, I had accidentally commented out OCX installation

Browse Source
This commit is contained in:
rdb 2014-10-08 20:46:01 +00:00
parent 43805f47bb
commit 9faeb08e57
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
direct/src/plugin_installer/make_installer.py
View File

@ -386,7 +386,7 @@ def makeInstaller():
npapi = 'nppanda3d.dll' npapi = 'nppanda3d.dll'
panda3d = 'panda3d.exe' panda3d = 'panda3d.exe'
panda3dw = 'panda3dw.exe' panda3dw = 'panda3dw.exe'
baseFiles = [npapi, panda3d, panda3dw] baseFiles = [ocx, npapi, panda3d, panda3dw]
else: else:
baseFiles = [] baseFiles = []
@ -551,7 +551,7 @@ def makeInstaller():
CMD += '/DINSTALL_DIR="' + options.install_dir + '" ' CMD += '/DINSTALL_DIR="' + options.install_dir + '" '
CMD += '/DLICENSE_FILE="' + options.license + '" ' CMD += '/DLICENSE_FILE="' + options.license + '" '
CMD += '/DOCX="' + ocx + '" ' CMD += '/DOCX="' + ocx + '" '
#CMD += '/DOCX_PATH="' + pluginFiles[ocx] + '" ' CMD += '/DOCX_PATH="' + pluginFiles[ocx] + '" '
CMD += '/DNPAPI="' + npapi + '" ' CMD += '/DNPAPI="' + npapi + '" '
CMD += '/DNPAPI_PATH="' + pluginFiles[npapi] + '" ' CMD += '/DNPAPI_PATH="' + pluginFiles[npapi] + '" '
CMD += '/DPANDA3D="' + panda3d + '" ' CMD += '/DPANDA3D="' + panda3d + '" '