diff options
| author | Thomas Tanner <trtanner@btinternet.com> | 2015-12-05 10:32:07 +0000 |
|---|---|---|
| committer | Thomas Tanner <trtanner@btinternet.com> | 2015-12-05 10:32:07 +0000 |
| commit | 0dedf5a875753f75fd2d9735e9e8f3a9f4dabcb5 (patch) | |
| tree | 07b88fb5af7d7e7680e7a7ba0269c866bb659188 /src/shared/SConscript | |
| parent | 1a12b1f1f6256139427c2516d314f25c593087c5 (diff) | |
| parent | 688e149c96c29d8249c9db416f5773cfc7baad6d (diff) | |
Merge remote-tracking branch 'remotes/TanninOne/master' into issue/344
# Conflicts:
# src/shared/fallout3info.h
# src/shared/falloutnvinfo.h
# src/shared/gameinfo.h
# src/shared/oblivioninfo.h
# src/shared/skyriminfo.h
Diffstat (limited to 'src/shared/SConscript')
| -rw-r--r-- | src/shared/SConscript | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/shared/SConscript b/src/shared/SConscript index 69a95289..24ca5b19 100644 --- a/src/shared/SConscript +++ b/src/shared/SConscript @@ -1,8 +1,6 @@ -Import('qt_env')
+Import('env')
-env = qt_env.Clone()
-
-env.EnableQtModules('Core', 'Gui')
+env = env.Clone()
env.AppendUnique(CPPDEFINES = [
'UNICODE',
@@ -21,5 +19,5 @@ env.AppendUnique(CPPPATH = [ # Not sure if renaming this helps much as it's static
env.StaticLibrary('mo_shared', env.Glob('*.cpp'))
-res = env['QT_USED_MODULES']
-Return('res')
+#res = env['QT_USED_MODULES']
+#Return('res')
|