diff --git a/deployment/deploy_capture/bundle.spec b/deployment/deploy_capture/bundle.spec index 2b0989d5f2..24aa51e22b 100644 --- a/deployment/deploy_capture/bundle.spec +++ b/deployment/deploy_capture/bundle.spec @@ -118,7 +118,7 @@ elif platform.system() == 'Windows': scipy_imports += ['scipy.integrate.vode', 'scipy.integrate.lsoda', 'scipy.integrate._dop', 'scipy.special._ufuncs', 'scipy.special._ufuncs_cxx'] a = Analysis(['../../pupil_src/capture/main.py'], - pathex=['../../pupil_src/shared_modules/'], + pathex=['../../pupil_src/shared_modules/', '../../pupil_external'], binaries=None, datas=None, hiddenimports=pyglui_hidden_imports+scipy_imports+av_hidden_imports, @@ -144,7 +144,7 @@ elif platform.system() == 'Windows': a.binaries, a.zipfiles, a.datas, - [('glfw3.dll', '../../pupil_src/shared_modules/external/glfw3.dll','BINARY')], + [('glfw3.dll','../../pupil_external/glfw3.dll','BINARY')], [('OpenSans-Regular.ttf', os.path.join(package_path, 'pyglui/OpenSans-Regular.ttf'),'DATA')], [('Roboto-Regular.ttf', os.path.join(package_path, 'pyglui/Roboto-Regular.ttf'),'DATA')], [('fontawesome-webfont.ttf', os.path.join(package_path, 'pyglui/fontawesome-webfont.ttf'),'DATA')], diff --git a/deployment/deploy_player/bundle.spec b/deployment/deploy_player/bundle.spec index e009a30796..f3fa3a0c3b 100644 --- a/deployment/deploy_player/bundle.spec +++ b/deployment/deploy_player/bundle.spec @@ -116,7 +116,7 @@ elif platform.system() == 'Windows': scipy_imports += ['scipy.integrate.vode', 'scipy.integrate.lsoda', 'scipy.integrate._dop', 'scipy.special._ufuncs', 'scipy.special._ufuncs_cxx'] a = Analysis(['../../pupil_src/player/main.py'], - pathex=['../../pupil_src/shared_modules/'], + pathex=['../../pupil_src/shared_modules/', '../../pupil_external'], hiddenimports=['pyglui.cygl.shader']+scipy_imports+av_hidden_imports+pyndsi_hidden_imports, hookspath=None, runtime_hooks=None, @@ -139,7 +139,7 @@ elif platform.system() == 'Windows': a.binaries, a.zipfiles, a.datas, - [('glfw3.dll', '../../pupil_src/shared_modules/external/glfw3.dll','BINARY')], + [('glfw3.dll', '../../pupil_external/glfw3.dll','BINARY')], [('OpenSans-Regular.ttf', os.path.join(package_path, 'pyglui/OpenSans-Regular.ttf'),'DATA')], [('Roboto-Regular.ttf', os.path.join(package_path, 'pyglui/Roboto-Regular.ttf'),'DATA')], [('fontawesome-webfont.ttf', os.path.join(package_path, 'pyglui/fontawesome-webfont.ttf'),'DATA')], diff --git a/pupil_external/.gitignore b/pupil_external/.gitignore new file mode 100644 index 0000000000..5e7d2734cf --- /dev/null +++ b/pupil_external/.gitignore @@ -0,0 +1,4 @@ +# Ignore everything in this directory +* +# Except this file +!.gitignore diff --git a/pupil_src/capture/run_capture.bat b/pupil_src/capture/run_capture.bat new file mode 100644 index 0000000000..ead6e985a8 --- /dev/null +++ b/pupil_src/capture/run_capture.bat @@ -0,0 +1,2 @@ +PATH %PATH%..\..\pupil_external +python main.py diff --git a/pupil_src/player/run_player.bat b/pupil_src/player/run_player.bat new file mode 100644 index 0000000000..2189f7ec2e --- /dev/null +++ b/pupil_src/player/run_player.bat @@ -0,0 +1,2 @@ +PATH %PATH%..\..\pupil_external +python main.py %1%