diff options
| author | RJ Ryan <rryan@mixxx.org> | 2014-09-16 14:03:37 -0400 |
|---|---|---|
| committer | RJ Ryan <rryan@mixxx.org> | 2014-09-16 14:03:37 -0400 |
| commit | 7c85c7875bbfe681cdbce444c1cffc5fa07d6c4e (patch) | |
| tree | 3b9058d50761fd359e5a7bfa99d6e2e50f9e75d1 /plugins | |
| parent | 1b2ed105e379419b8842bea604d6df30b7a985ae (diff) | |
Windows XP compatibility: Use /subsystem:WINDOWS,5.[01|02].
See: http://blogs.msdn.com/b/vcblog/archive/2012/10/08/windows-xp-targeting-with-c-in-visual-studio-2012.aspx?PageIndex=2
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/soundsourcem4a/SConscript | 6 | ||||
| -rw-r--r-- | plugins/soundsourcemediafoundation/SConscript | 6 | ||||
| -rw-r--r-- | plugins/soundsourcewv/SConscript | 6 |
3 files changed, 15 insertions, 3 deletions
diff --git a/plugins/soundsourcem4a/SConscript b/plugins/soundsourcem4a/SConscript index 5b0c006d25..32ffeb1118 100644 --- a/plugins/soundsourcem4a/SConscript +++ b/plugins/soundsourcem4a/SConscript @@ -53,7 +53,11 @@ if int(build.flags['faad']): SHLIBPREFIX='lib' #Makes the filename "libsoundsourcem4a" consistently across platforms to make our lives easier. if build.platform_is_windows: env["LINKFLAGS"].remove("/entry:mainCRTStartup") - env["LINKFLAGS"].remove("/subsystem:windows") + # TODO(rryan): Why do we do this? + if build.machine_is_64bit: + env["LINKFLAGS"].remove("/subsystem:windows,5.02") + else: + env["LINKFLAGS"].remove("/subsystem:windows,5.01") ssm4a_bin = env.SharedLibrary('soundsourcem4a', m4a_sources, LINKCOM = [env['LINKCOM'], 'mt.exe -nologo -manifest ${TARGET}.manifest -outputresource:$TARGET;1']) else: ssm4a_bin = env.SharedLibrary('soundsourcem4a', m4a_sources) diff --git a/plugins/soundsourcemediafoundation/SConscript b/plugins/soundsourcemediafoundation/SConscript index afcd7e91c8..a0284db8cd 100644 --- a/plugins/soundsourcemediafoundation/SConscript +++ b/plugins/soundsourcemediafoundation/SConscript @@ -12,7 +12,11 @@ if int(build.flags['mediafoundation']): conf = Configure(env)
env = conf.Finish()
env["LINKFLAGS"].remove("/entry:mainCRTStartup")
- env["LINKFLAGS"].remove("/subsystem:windows")
+ # TODO(rryan): Why do we do this?
+ if build.machine_is_64bit:
+ env["LINKFLAGS"].remove("/subsystem:windows,5.02")
+ else:
+ env["LINKFLAGS"].remove("/subsystem:windows,5.01")
ssmediafoundation_bin = env.SharedLibrary('soundsourcemediafoundation',
['soundsource.cpp', 'soundsourcemediafoundation.cpp'],
LINKCOM = [env['LINKCOM'],
diff --git a/plugins/soundsourcewv/SConscript b/plugins/soundsourcewv/SConscript index d9845f2d6a..e0edfa9715 100644 --- a/plugins/soundsourcewv/SConscript +++ b/plugins/soundsourcewv/SConscript @@ -28,7 +28,11 @@ if int(build.flags['wv']): if build.platform_is_windows: env["LINKFLAGS"].remove("/entry:mainCRTStartup") - env["LINKFLAGS"].remove("/subsystem:windows") + # TODO(rryan): Why do we do this? + if build.machine_is_64bit: + env["LINKFLAGS"].remove("/subsystem:windows,5.02") + else: + env["LINKFLAGS"].remove("/subsystem:windows,5.01") sswv_bin = env.SharedLibrary('soundsourcewv', wv_sources, LINKCOM = [env['LINKCOM'], 'mt.exe -nologo -manifest ${TARGET}.manifest -outputresource:$TARGET;1']) else: sswv_bin = env.SharedLibrary('soundsourcewv', wv_sources) |