diff options
author | Daniel Schürmann <daschuer@mixxx.org> | 2015-05-11 23:12:21 +0200 |
---|---|---|
committer | Daniel Schürmann <daschuer@mixxx.org> | 2015-05-11 23:12:21 +0200 |
commit | 6441ecb369fac5a0d9e44af0afa36e3635a195ec (patch) | |
tree | c4b45d7031586bff9fd38e35caca4e1884c950ad /src/SConscript | |
parent | a6ae2b36f3f2a0ca81b74168364f7761095d5f60 (diff) |
Removed commented code
Diffstat (limited to 'src/SConscript')
-rw-r--r-- | src/SConscript | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/src/SConscript b/src/SConscript index 6e7fc98a03..013bb39729 100644 --- a/src/SConscript +++ b/src/SConscript @@ -94,19 +94,12 @@ def build_tests(): env.Append(LIBS = 'gmock') if build.platform_is_windows: - # Subsystem change temporarily disabled due to LP #1453782. # TODO(rryan): Build Mixxx core as a shared object and link it # into mixxx and mixxx-test. We could build both in different # environments right now but then automoc and protoc get run in # both environments which makes SCons unhappy. - # # We want a terminal for tests. - # if build.machine_is_64bit: - # test_env['LINKFLAGS'].remove('/subsystem:windows,5.02') - # test_env['LINKFLAGS'].append('/subsystem:console,5.02') - # else: - # test_env['LINKFLAGS'].remove('/subsystem:windows,5.01') - # test_env['LINKFLAGS'].append('/subsystem:console,5.01') - + # Currently booth Exes ar build with /subsystem:windows,5.02 + # The console is attached manually test_bin = env.Program( 'mixxx-test', [test_sources, env.RES('#src/mixxx.rc')], LINKCOM = [env['LINKCOM'], 'mt.exe -nologo -manifest ${TARGET}.manifest -outputresource:$TARGET;1']) |