From 9faeb08e5734fb2ce5add7c0f2635c8f6d58f363 Mon Sep 17 00:00:00 2001 From: rdb Date: Wed, 8 Oct 2014 20:46:01 +0000 Subject: [PATCH] Oops, I had accidentally commented out OCX installation --- direct/src/plugin_installer/make_installer.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/direct/src/plugin_installer/make_installer.py b/direct/src/plugin_installer/make_installer.py index c9b3f5124a..4a4a73ccd1 100755 --- a/direct/src/plugin_installer/make_installer.py +++ b/direct/src/plugin_installer/make_installer.py @@ -386,7 +386,7 @@ def makeInstaller(): npapi = 'nppanda3d.dll' panda3d = 'panda3d.exe' panda3dw = 'panda3dw.exe' - baseFiles = [npapi, panda3d, panda3dw] + baseFiles = [ocx, npapi, panda3d, panda3dw] else: baseFiles = [] @@ -551,7 +551,7 @@ def makeInstaller(): CMD += '/DINSTALL_DIR="' + options.install_dir + '" ' CMD += '/DLICENSE_FILE="' + options.license + '" ' CMD += '/DOCX="' + ocx + '" ' - #CMD += '/DOCX_PATH="' + pluginFiles[ocx] + '" ' + CMD += '/DOCX_PATH="' + pluginFiles[ocx] + '" ' CMD += '/DNPAPI="' + npapi + '" ' CMD += '/DNPAPI_PATH="' + pluginFiles[npapi] + '" ' CMD += '/DPANDA3D="' + panda3d + '" '