diff options
| author | Thomas Tanner <trtanner@btinternet.com> | 2015-12-05 10:21:44 +0000 |
|---|---|---|
| committer | Thomas Tanner <trtanner@btinternet.com> | 2015-12-05 10:21:44 +0000 |
| commit | ec9c78f8fa49ce960fb708d4a140c44ed3130989 (patch) | |
| tree | c6601b7045432caa5295b5cd1a4b51c6f19f5cb1 /src/shared/SConscript | |
| parent | 7f9af7f93e1d06d021fd60bf4845d928f4a6bc38 (diff) | |
| parent | 688e149c96c29d8249c9db416f5773cfc7baad6d (diff) | |
Merge remote-tracking branch 'TanninOne/master'
# Conflicts:
# SConstruct
# src/modinfo.cpp
# src/modinfo.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')
|