diff --git a/src/proxy/SConscript b/src/proxy/SConscript index 19d79be..d5b15ed 100644 --- a/src/proxy/SConscript +++ b/src/proxy/SConscript @@ -19,16 +19,17 @@ env.AppendUnique(LIBS = 'shell32') runner = env.File(os.path.join('..', '..', 'pythonRunner', 'pythonRunner.dll')) -env.AppendUnique(RCFLAGS = [ - '/dSCONS_VARIANT', - '/i"%s"' % runner.dir -]) - +runner_env = env.Clone() +runner_env.AppendUnique(CPPDEFINES = 'SCONS_BUILD') +runner_env.AppendUnique(CPPPATH = runner.dir) +rc = runner_env.RES('embedrunner.rc') # Make sure we have the proper dependencies so it gets built -env.Depends('embedrunner.res', runner) +runner_env.Depends(rc, runner) # There's a whole load of unused C++ files in here. -lib = env.SharedLibrary('proxyPython', - [ 'proxypython.cpp' ] + env.RES(env.Glob('*.rc'))) +lib = env.SharedLibrary('proxyPython', [ 'proxypython.cpp' ] + rc) env.InstallModule(lib) + +res = env['QT_USED_MODULES'] +Return('res') diff --git a/src/proxy/embedrunner.rc b/src/proxy/embedrunner.rc index 336ab57..e3e5f2a 100644 --- a/src/proxy/embedrunner.rc +++ b/src/proxy/embedrunner.rc @@ -1,6 +1,6 @@ #include "resource.h" -#ifdef SCONS_VARIANT +#ifdef SCONS_BUILD IDR_LOADER_DLL BINARY MOVEABLE PURE pythonRunner.dll #else #ifdef _DEBUG diff --git a/src/runner/SConscript b/src/runner/SConscript index 5710e7a..efb78bd 100644 --- a/src/runner/SConscript +++ b/src/runner/SConscript @@ -43,4 +43,18 @@ cpp_files = [ lib = env.SharedLibrary('pythonRunner', cpp_files + targets) -env.InstallModule(lib) +#This is referred to from inside a resource file. We don't install it. +#env.InstallModule(lib) + +# However... +# we do need boost-python and pythonvv.dll and pythonvv.zip (though the last +# isn't needed to just bring up the module) +#env.Pseudo('install') +#env.Depends('install', +# (env.Install('${INSTALL_PATH}', 'pyCfg.py'), +# env.Install(os.path.join('${INSTALL_PATH}', 'data'), +# ( ui, rc, 'settings.json' )), +# )) + +res = env['QT_USED_MODULES'] +Return('res')