nvda root sconstruct: the release commandline option now only controls filenames...

diff --git a/nvdaHelper/archBuild_sconscript b/nvdaHelper/archBuild_sconscript
index c3b2d2b..b077306 100644 (file)
--- a/nvdaHelper/archBuild_sconscript
+++ b/nvdaHelper/archBuild_sconscript
@@ -20,7 +20,7 @@ Import(
 )\r
 \r
 TARGET_ARCH=env['TARGET_ARCH']\r
-release=env['release']\r
+debug=env['nvdaHelperDebug']\r
 \r
 #Some defines and includes for the environment\r
 env.Append(CPPDEFINES=['UNICODE','_CRT_SECURE_NO_DEPRECATE',('LOGLEVEL','${logLevel}')])\r
@@ -29,7 +29,7 @@ env.Append(CPPPATH=['#/include',Dir('.').abspath])
 env.Append(LINKFLAGS='/incremental:no')\r
 env.Append(MIDLFLAGS='/x64' if TARGET_ARCH=='x86_64' else '/win32')\r
 \r
-if release:\r
+if not debug:\r
        env.Append(CPPDEFINES=['NDEBUG'])\r
        env.Append(CCFLAGS=['/O2','/MT'])\r
        env.Append(LINKFLAGS='/release')\r

diff --git a/nvdaHelper/remote/sconscript b/nvdaHelper/remote/sconscript
index 2931938..4314eda 100644 (file)
--- a/nvdaHelper/remote/sconscript
+++ b/nvdaHelper/remote/sconscript
@@ -87,7 +87,7 @@ remoteLib=env.SharedLibrary(
                "nvdaHelperRemote.def",\r
        ],\r
        LIBS=[\r
-               minHookLib[1 if env['release'] else 2],\r
+               minHookLib[1 if not env['nvdaHelperDebug'] else 2],\r
                "user32",\r
                "gdi32",\r
                "ole32",\r

diff --git a/nvdaHelper/remoteLoader/sconscript b/nvdaHelper/remoteLoader/sconscript
index 4ae263e..fec9362 100644 (file)
--- a/nvdaHelper/remoteLoader/sconscript
+++ b/nvdaHelper/remoteLoader/sconscript
@@ -20,7 +20,7 @@ env.Append(LINKFLAGS='/subsystem:windows')
 remoteLoaderProgram=env.Program(\r
        target='nvdaHelperRemoteLoader',\r
        source=['loader.cpp'],\r
-       LIBS=[remoteLib[1] if env['release'] else remoteLib[2],'kernel32'],\r
+       LIBS=[remoteLib[1] if not env['nvdaHelperDebug'] else remoteLib[2],'kernel32'],\r
 )\r
 \r
 Return('remoteLoaderProgram')\r

diff --git a/nvdaHelper/vbufBase/sconscript b/nvdaHelper/vbufBase/sconscript
index 0fbd0e5..d482345 100644 (file)
--- a/nvdaHelper/vbufBase/sconscript
+++ b/nvdaHelper/vbufBase/sconscript
@@ -13,7 +13,7 @@ vbufBaseStaticLib=env.StaticLibrary(
                "lock.cpp",\r
                "backend.cpp",\r
                debugObj,\r
-               remoteLib[1] if env['release'] else remoteLib[2],\r
+               remoteLib[1] if not env['nvdaHelperDebug'] else remoteLib[2],\r
        ],\r
 )\r
 \r