コミット: 265da92bf492b5a0e13f9430e373d01b094d3ff6 - zandronum-cluster (hg)

This is a fork of Zandronum used on servers hosted by The Sentinels Playground (TSPG), Euroboros (EB), and Down Under Doomers (DUD).

コミットメタ情報

• リビジョン: 265da92bf492b5a0e13f9430e373d01b094d3ff6 (tree)
• 日時: 2013-10-11 09:40:15
• 作者: Braden Obrzut <admin@mani...>
• コミッター: Braden Obrzut

ログメッセージ

- DYN_FLUIDSYNTH now defaults to ON.
- Added ZDOOM_OUTPUT_OLDSTYLE (could probably use a more descriptive name) which causes CMake to vary the executable name by build type and place the exes and pk3s into the directory specified in ZDOOM_OUTPUT_DIR.
- ALL_BUILD will now launch ZDoom.

変更サマリ

• modified: CMakeLists.txt
• modified: src/CMakeLists.txt
• add: CleanDirectoryList.cmake
• add: CreateLaunchers.cmake
• add: launcher-templates/genericlauncher.cmd.in
• add: launcher-templates/launcher.env.cmd.in
• add: launcher-templates/perconfig.vcproj.user.in
• add: launcher-templates/perconfig.vcxproj.user.in
• add: launcher-templates/targetlauncher.cmd.in
• add: launcher-templates/vcproj.user.in
• add: launcher-templates/vcxproj.user.in

差分

diff -r 6da7cbe0302f -r 265da92bf492 CMakeLists.txt
--- a/CMakeLists.txt	Wed Oct 09 22:33:58 2013 -0500
+++ b/CMakeLists.txt	Thu Oct 10 17:40:15 2013 -0700
@@ -1,6 +1,9 @@
 cmake_minimum_required( VERSION 2.4 )
 project(ZDoom)
 
+list( APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR} )
+include( CreateLaunchers )
+
 # Generator expression are available some time in CMake 2.8. Due to
 # cmake_minimum_required, we can assume a minor version of > 7 implies major >= 2
 if(${CMAKE_MAJOR_VERSION} GREATER 2 OR ${CMAKE_MINOR_VERSION} GREATER 7)
@@ -19,16 +22,16 @@
 		set( PK3_TARGET "pk3" )
 	endif( ${PK3_TARGET} STREQUAL "zdoom_pk3" )
 
-	if( NOT NO_GENERATOR_EXPRESSIONS )
+	if( NOT NO_GENERATOR_EXPRESSIONS AND NOT ZDOOM_OUTPUT_OLDSTYLE )
 		add_custom_command( OUTPUT ${ZDOOM_OUTPUT_DIR}/${PK3_NAME}
 			COMMAND ${ZIPDIR_EXE} -udf ${ZDOOM_OUTPUT_DIR}/${PK3_NAME} ${PK3_DIR}
 			COMMAND ${CMAKE_COMMAND} -E copy_if_different ${ZDOOM_OUTPUT_DIR}/${PK3_NAME} $<TARGET_FILE_DIR:zdoom>
 			DEPENDS zipdir ${PK3_DIR} )
-	else( NOT NO_GENERATOR_EXPRESSIONS )
+	else( NOT NO_GENERATOR_EXPRESSIONS AND NOT ZDOOM_OUTPUT_OLDSTYLE )
 		add_custom_command( OUTPUT ${ZDOOM_OUTPUT_DIR}/${PK3_NAME}
 			COMMAND ${ZIPDIR_EXE} -udf ${ZDOOM_OUTPUT_DIR}/${PK3_NAME} ${PK3_DIR}
 			DEPENDS zipdir ${PK3_DIR} )
-	endif( NOT NO_GENERATOR_EXPRESSIONS )
+	endif( NOT NO_GENERATOR_EXPRESSIONS AND NOT ZDOOM_OUTPUT_OLDSTYLE )
 
 	add_custom_target( ${PK3_TARGET} ALL
 		DEPENDS ${ZDOOM_OUTPUT_DIR}/${PK3_NAME} )
@@ -42,6 +45,13 @@
 
 set( ZDOOM_OUTPUT_DIR ${CMAKE_BINARY_DIR} CACHE PATH "Directory where zdoom.pk3 and the executable will be created." )
 set( ZDOOM_EXE_NAME "zdoom" CACHE FILEPATH "Name of the executable to create." )
+if( MSVC )
+	# Allow the user to use ZDOOM_OUTPUT_DIR as a single release point.
+	# Use zdoom, zdoomd, zdoom64, and zdoomd64 for the binary names
+	option( ZDOOM_OUTPUT_OLDSTYLE "Don't use Release/Debug directories." OFF )
+else( MSVC )
+	set( ZDOOM_OUTPUT_OLDSTYLE OFF )
+endif( MSVC )
 
 if( "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" )
 	set( PROFILE 0 CACHE BOOL "Enable profiling with gprof for Debug and RelWithDebInfo build types." )

diff -r 6da7cbe0302f -r 265da92bf492 CleanDirectoryList.cmake
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/CleanDirectoryList.cmake	Thu Oct 10 17:40:15 2013 -0700
@@ -0,0 +1,48 @@
+# - Removes duplicate entries and non-directories from a provided list
+#
+#  clean_directory_list(<listvar> [<additional list items>...])
+#
+# Requires CMake 2.6 or newer (uses the 'function' command)
+#
+# Original Author:
+# 2009-2010 Ryan Pavlik <[e-mail]> <[e-mail]>
+# http://academic.cleardefinition.com
+# Iowa State University HCI Graduate Program/VRAC
+#
+# Copyright Iowa State University 2009-2010.
+# Distributed under the Boost Software License, Version 1.0.
+# (See accompanying file LICENSE_1_0.txt or copy at
+# http://www.boost.org/LICENSE_1_0.txt)
+
+if(__clean_directory_list)
+	return()
+endif()
+set(__clean_directory_list YES)
+
+function(clean_directory_list _var)
+	# combine variable's current value with additional list items
+	set(_in ${${_var}} ${ARGN})
+
+	if(_in)
+		# Initial list cleaning
+		list(REMOVE_DUPLICATES _in)
+
+		# Grab the absolute path of each actual directory
+		set(_out)
+		foreach(_dir ${_in})
+			if(IS_DIRECTORY "${_dir}")
+				get_filename_component(_dir "${_dir}" ABSOLUTE)
+				file(TO_CMAKE_PATH "${_dir}" _dir)
+				list(APPEND _out "${_dir}")
+			endif()
+		endforeach()
+
+		if(_out)
+			# Clean up the output list now
+			list(REMOVE_DUPLICATES _out)
+		endif()
+
+		# return _out
+		set(${_var} "${_out}" PARENT_SCOPE)
+	endif()
+endfunction()

diff -r 6da7cbe0302f -r 265da92bf492 CreateLaunchers.cmake
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/CreateLaunchers.cmake	Thu Oct 10 17:40:15 2013 -0700
@@ -0,0 +1,336 @@
+# - Create launchers to set working directory, env. vars, etc.
+#
+#  include(CreateLaunchers) - to make these available
+#  guess_runtime_library_dirs(<outputvarname> [<extralibrary> ...])
+#  create_default_target_launcher(<targetname>
+#    [ARGS <args...>]
+#    [FORWARD_ARGS]
+#    [RUNTIME_LIBRARY_DIRS <dir...>]
+#    [WORKING_DIRECTORY <dir>]
+#    [ENVIRONMENT <VAR=value> [<VAR=value>...]])
+#
+#  create_target_launcher(<targetname>
+#    [ARGS <args...>]
+#    [FORWARD_ARGS]
+#    [RUNTIME_LIBRARY_DIRS <dir...>]
+#    [WORKING_DIRECTORY <dir>]
+#    [ENVIRONMENT <VAR=value> [<VAR=value>...]])
+#
+#  create_generic_launcher(<launchername>
+#    [RUNTIME_LIBRARY_DIRS <dir...>]
+#    [WORKING_DIRECTORY <dir>]
+#    [ENVIRONMENT <VAR=value> [<VAR=value>...]])
+#    - sets GENERIC_LAUNCHER_COMMAND and GENERIC_LAUNCHER_FAIL_REGULAR_EXPRESSION
+#
+# Requires these CMake modules:
+#  ListFilter
+#  ProgramFilesGlob
+#  CleanDirectoryList
+#
+# Requires CMake 2.6 or newer (uses the 'function' command)
+#
+# Original Author:
+# 2009-2010 Ryan Pavlik <[e-mail]> <[e-mail]>
+# http://academic.cleardefinition.com
+# Iowa State University HCI Graduate Program/VRAC
+#
+# Copyright Iowa State University 2009-2010.
+# Distributed under the Boost Software License, Version 1.0.
+# (See accompanying file LICENSE_1_0.txt or copy at
+# http://www.boost.org/LICENSE_1_0.txt)
+
+if(__create_launchers)
+	return()
+endif()
+set(__create_launchers YES)
+
+include(CleanDirectoryList)
+
+# We must run the following at "include" time, not at function call time,
+# to find the path to this module rather than the path to a calling list file
+get_filename_component(_launchermoddir
+	${CMAKE_CURRENT_LIST_FILE}
+	PATH)
+set(_launchermoddir "${_launchermoddir}/launcher-templates")
+
+macro(_launcher_system_settings)
+	if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+		set(BITS 64)
+	else()
+		set(BITS 32)
+	endif()
+
+	if(WIN32)
+		# Find user and system name
+		set(SYSTEM_NAME $ENV{USERDOMAIN})
+		set(USER_NAME $ENV{USERNAME})
+		set(VCPROJ_TYPE vcproj)
+		set(USERFILE_EXTENSION ${SYSTEM_NAME}.${USER_NAME}.user)
+		set(LAUNCHER_LINESEP "&#x0A;")
+		if(MSVC90)
+			set(USERFILE_VC_VERSION 9.00)
+		elseif(MSVC80)
+			set(USERFILE_VC_VERSION 8.00)
+		elseif(MSVC71)
+			set(USERFILE_VC_VERSION 7.10)
+		elseif(MSVC10 OR (MSVC AND MSVC_VERSION GREATER 1600)) # 2010 or newer
+			set(LAUNCHER_LINESEP "\n")
+			set(USERFILE_VC_VERSION 10.00)
+			set(USERFILE_EXTENSION user)
+			set(VCPROJ_TYPE vcxproj)
+		endif()
+		if(BITS EQUAL 64)
+			set(USERFILE_PLATFORM x64)
+		else()
+			set(USERFILE_PLATFORM Win${BITS})
+		endif()
+		set(_pathdelim ";")
+		set(_suffix "cmd")
+	else()
+		set(_pathdelim ":")
+		set(USERFILE_PLATFORM ${CMAKE_SYSTEM_NAME}${BITS})
+		set(_suffix "sh")
+		find_package(GDB QUIET)
+		if(GDB_FOUND)
+			set(LAUNCHERS_GOT_GDB YES)
+			if(GDB_HAS_RETURN_CHILD_RESULT)
+				set(LAUNCHERS_GDB_ARG --return-child-result)
+			endif()
+		else()
+			set(LAUNCHERS_GOT_GDB)
+		endif()
+	endif()
+
+	if(WIN32 AND NOT USERFILE_REMOTE_MACHINE)
+		site_name(USERFILE_REMOTE_MACHINE)
+		mark_as_advanced(USERFILE_REMOTE_MACHINE)
+	endif()
+endmacro()
+
+macro(_launcher_process_args)
+	set(_nowhere)
+	set(_curdest _nowhere)
+	set(_val_args
+		ARGS
+		RUNTIME_LIBRARY_DIRS
+		WORKING_DIRECTORY
+		ENVIRONMENT)
+	set(_bool_args FORWARD_ARGS)
+	foreach(_arg ${_val_args} ${_bool_args})
+		set(${_arg})
+	endforeach()
+	foreach(_element ${ARGN})
+		list(FIND _val_args "${_element}" _val_arg_find)
+		list(FIND _bool_args "${_element}" _bool_arg_find)
+		if("${_val_arg_find}" GREATER "-1")
+			set(_curdest "${_element}")
+		elseif("${_bool_arg_find}" GREATER "-1")
+			set("${_element}" ON)
+			set(_curdest _nowhere)
+		else()
+			list(APPEND ${_curdest} "${_element}")
+		endif()
+	endforeach()
+
+	if(_nowhere)
+		message(FATAL_ERROR
+			"Syntax error in use of a function in CreateLaunchers!")
+	endif()
+
+	# Turn into a list of native paths
+	set(_runtime_lib_dirs)
+	foreach(_dlldir ${RUNTIME_LIBRARY_DIRS})
+		file(TO_NATIVE_PATH "${_dlldir}" _path)
+		set(_runtime_lib_dirs "${_runtime_lib_dirs}${_path}${_pathdelim}")
+	endforeach()
+
+	if(NOT WORKING_DIRECTORY)
+		set(WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}")
+	endif()
+
+	if(FORWARD_ARGS)
+		if(WIN32)
+			set(FWD_ARGS %*)
+		else()
+			set(FWD_ARGS $*)
+		endif()
+	else()
+		set(FWD_ARGS)
+	endif()
+
+	set(USERFILE_WORKING_DIRECTORY "${WORKING_DIRECTORY}")
+	set(USERFILE_COMMAND_ARGUMENTS "${ARGS}")
+	set(LAUNCHERSCRIPT_COMMAND_ARGUMENTS "${ARGS} ${FWD_ARGS}")
+
+	if(WIN32)
+		set(RUNTIME_LIBRARIES_ENVIRONMENT "PATH=${_runtime_lib_dirs};%PATH%")
+		file(READ
+			"${_launchermoddir}/launcher.env.cmd.in"
+			_cmdenv)
+	else()
+		if(APPLE)
+			set(RUNTIME_LIBRARIES_ENVIRONMENT
+				"DYLD_LIBRARY_PATH=${_runtime_lib_dirs}:$DYLD_LIBRARY_PATH")
+		else()
+			set(RUNTIME_LIBRARIES_ENVIRONMENT
+				"LD_LIBRARY_PATH=${_runtime_lib_dirs}:$LD_LIBRARY_PATH")
+		endif()
+		file(READ
+			"${_launchermoddir}/launcher.env.sh.in"
+			_cmdenv)
+	endif()
+	set(USERFILE_ENVIRONMENT "${RUNTIME_LIBRARIES_ENVIRONMENT}")
+
+	set(USERFILE_ENV_COMMANDS)
+	foreach(_arg "${RUNTIME_LIBRARIES_ENVIRONMENT}" ${ENVIRONMENT})
+		string(CONFIGURE
+			"@USERFILE_ENVIRONMENT@@LAUNCHER_LINESEP@@_arg@"
+			USERFILE_ENVIRONMENT
+			@ONLY)
+		string(CONFIGURE
+			"@USERFILE_ENV_COMMANDS@${_cmdenv}"
+			USERFILE_ENV_COMMANDS
+			@ONLY)
+	endforeach()
+endmacro()
+
+macro(_launcher_produce_vcproj_user)
+	if(MSVC)
+		file(READ
+			"${_launchermoddir}/perconfig.${VCPROJ_TYPE}.user.in"
+			_perconfig)
+		set(USERFILE_CONFIGSECTIONS)
+		foreach(USERFILE_CONFIGNAME ${CMAKE_CONFIGURATION_TYPES})
+			get_target_property(USERFILE_${USERFILE_CONFIGNAME}_COMMAND
+				${_targetname}
+				LOCATION_${USERFILE_CONFIGNAME})
+			file(TO_NATIVE_PATH
+				"${USERFILE_${USERFILE_CONFIGNAME}_COMMAND}"
+				USERFILE_${USERFILE_CONFIGNAME}_COMMAND)
+			string(CONFIGURE "${_perconfig}" _temp @ONLY ESCAPE_QUOTES)
+			string(CONFIGURE
+				"${USERFILE_CONFIGSECTIONS}${_temp}"
+				USERFILE_CONFIGSECTIONS
+				ESCAPE_QUOTES)
+		endforeach()
+
+
+		configure_file("${_launchermoddir}/${VCPROJ_TYPE}.user.in"
+			${VCPROJNAME}.${VCPROJ_TYPE}.${USERFILE_EXTENSION}
+			@ONLY)
+	endif()
+
+endmacro()
+
+macro(_launcher_configure_executable _src _tmp _target)
+#    get_filename_component(_targetname "${_target}" NAME)
+    get_filename_component(_targetpath "${_target}" PATH)
+	configure_file("${_src}"
+		"${_tmp}"
+		@ONLY)
+	file(COPY "${_tmp}"
+	    DESTINATION "${_targetpath}"
+	    FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+endmacro()
+
+macro(_launcher_create_target_launcher)
+	if(CMAKE_CONFIGURATION_TYPES)
+		# Multi-config generator - multiple launchers
+		foreach(_config ${CMAKE_CONFIGURATION_TYPES})
+			get_target_property(USERFILE_${_config}_COMMAND
+				${_targetname}
+				LOCATION_${_config})
+			file(TO_NATIVE_PATH
+				"${USERFILE_${_config}_COMMAND}"
+				USERFILE_COMMAND)
+			set(_fn "launch-${_targetname}-${_config}.${_suffix}")
+			_launcher_configure_executable("${_launchermoddir}/targetlauncher.${_suffix}.in"
+			    "${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${_fn}"
+			    "${CMAKE_CURRENT_BINARY_DIR}/${_fn}")
+		endforeach()
+	else()
+		# Single-config generator - single launcher
+		get_target_property(USERFILE_COMMAND
+			${_targetname}
+			LOCATION)
+		file(TO_NATIVE_PATH
+			"${USERFILE_COMMAND}"
+			USERFILE_COMMAND)
+		_launcher_configure_executable("${_launchermoddir}/targetlauncher.${_suffix}.in"
+		    "${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/launch-${_targetname}.${_suffix}"
+			"${CMAKE_CURRENT_BINARY_DIR}/launch-${_targetname}.${_suffix}"
+			@ONLY)
+	endif()
+endmacro()
+
+function(create_default_target_launcher _targetname)
+	_launcher_system_settings()
+	_launcher_process_args(${ARGN})
+
+	set(VCPROJNAME "${CMAKE_BINARY_DIR}/ALL_BUILD")
+	_launcher_produce_vcproj_user()
+
+	_launcher_create_target_launcher()
+endfunction()
+
+function(create_target_launcher _targetname)
+	_launcher_system_settings()
+	_launcher_process_args(${ARGN})
+
+	set(VCPROJNAME "${CMAKE_CURRENT_BINARY_DIR}/${_targetname}")
+	_launcher_produce_vcproj_user()
+
+	_launcher_create_target_launcher()
+endfunction()
+
+function(create_generic_launcher _launchername)
+	_launcher_system_settings()
+	_launcher_process_args(${ARGN})
+
+	if(NOT IS_ABSOLUTE _launchername)
+		set(_launchername
+			"${CMAKE_CURRENT_BINARY_DIR}/${_launchername}.${_suffix}")
+	else()
+		set(_launchername "${_launchername}.${_suffix}")
+	endif()
+	if(WIN32)
+		set(GENERIC_LAUNCHER_COMMAND "${_launchername}" PARENT_SCOPE)
+		set(GENERIC_LAUNCHER_FAIL_REGULAR_EXPRESSION)
+	else()
+		set(GENERIC_LAUNCHER_COMMAND sh "${_launchername}" PARENT_SCOPE)
+		set(GENERIC_LAUNCHER_FAIL_REGULAR_EXPRESSION
+			"Program terminated with signal")
+	endif()
+
+	_launcher_configure_executable("${_launchermoddir}/genericlauncher.${_suffix}.in"
+	    "${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/genericlauncher.${_suffix}.in"
+		"${_launchername}")
+endfunction()
+
+function(guess_runtime_library_dirs _var)
+	# Start off with the link directories of the calling listfile's directory
+	get_directory_property(_libdirs LINK_DIRECTORIES)
+
+	# Add additional libraries passed to the function
+	foreach(_lib ${ARGN})
+		get_filename_component(_libdir "${_lib}" PATH)
+		list(APPEND _libdirs "${_libdir}")
+	endforeach()
+
+	# Now, build a list of potential dll directories
+	set(_dlldirs)
+	foreach(_libdir ${_libdirs})
+		# Add the libdir itself
+		list(APPEND _dlldirs "${_libdir}")
+
+		# Look also in libdir/../bin since the dll might not be with the lib
+		get_filename_component(_libdir "${_libdir}/../bin" ABSOLUTE)
+		list(APPEND _dlldirs "${_libdir}")
+	endforeach()
+
+	# Only keep the valid, unique directories
+	clean_directory_list(_dlldirs)
+
+	# Return _dlldirs
+	set(${_var} "${_dlldirs}" PARENT_SCOPE)
+endfunction()

diff -r 6da7cbe0302f -r 265da92bf492 launcher-templates/genericlauncher.cmd.in
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/launcher-templates/genericlauncher.cmd.in	Thu Oct 10 17:40:15 2013 -0700
@@ -0,0 +1,14 @@
+cd @USERFILE_WORKING_DIRECTORY@
+@USERFILE_ENV_COMMANDS@
+
+IF NOT [x%1]==[x--debugger] GOTO SkipDebuggingMess
+
+ECHO Need to ditch the debugger!
+SHIFT /1
+%1 %2 %3 %4 %5 %6 %7 %8 %9
+GOTO EOF
+
+:SkipDebuggingMess
+%*
+
+:EOF
\ No newline at end of file

diff -r 6da7cbe0302f -r 265da92bf492 launcher-templates/launcher.env.cmd.in
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/launcher-templates/launcher.env.cmd.in	Thu Oct 10 17:40:15 2013 -0700
@@ -0,0 +1,1 @@
+set @_arg@

diff -r 6da7cbe0302f -r 265da92bf492 launcher-templates/perconfig.vcproj.user.in
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/launcher-templates/perconfig.vcproj.user.in	Thu Oct 10 17:40:15 2013 -0700
@@ -0,0 +1,28 @@
+		<Configuration
+			Name="@USERFILE_CONFIGNAME@|@USERFILE_PLATFORM@"
+			>
+			<DebugSettings
+				Command="${USERFILE_@USERFILE_CONFIGNAME@_COMMAND}"
+				WorkingDirectory="@USERFILE_WORKING_DIRECTORY@"
+				CommandArguments="@USERFILE_COMMAND_ARGUMENTS@"
+				Attach="false"
+				DebuggerType="3"
+				Remote="1"
+				RemoteMachine="@USERFILE_REMOTE_MACHINE@"
+				RemoteCommand=""
+				HttpUrl=""
+				PDBPath=""
+				SQLDebugging=""
+				Environment="@USERFILE_ENVIRONMENT@"
+				EnvironmentMerge="true"
+				DebuggerFlavor=""
+				MPIRunCommand=""
+				MPIRunArguments=""
+				MPIRunWorkingDirectory=""
+				ApplicationCommand=""
+				ApplicationArguments=""
+				ShimCommand=""
+				MPIAcceptMode=""
+				MPIAcceptFilter=""
+			/>
+		</Configuration>

diff -r 6da7cbe0302f -r 265da92bf492 launcher-templates/perconfig.vcxproj.user.in
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/launcher-templates/perconfig.vcxproj.user.in	Thu Oct 10 17:40:15 2013 -0700
@@ -0,0 +1,7 @@
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='@USERFILE_CONFIGNAME@|@USERFILE_PLATFORM@'">
+    <LocalDebuggerEnvironment>@USERFILE_ENVIRONMENT@</LocalDebuggerEnvironment>
+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+    <LocalDebuggerCommand>${USERFILE_@USERFILE_CONFIGNAME@_COMMAND}</LocalDebuggerCommand>
+    <LocalDebuggerCommandArguments>@USERFILE_COMMAND_ARGUMENTS@</LocalDebuggerCommandArguments>
+    <LocalDebuggerWorkingDirectory>@USERFILE_WORKING_DIRECTORY@</LocalDebuggerWorkingDirectory>
+  </PropertyGroup>

diff -r 6da7cbe0302f -r 265da92bf492 launcher-templates/targetlauncher.cmd.in
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/launcher-templates/targetlauncher.cmd.in	Thu Oct 10 17:40:15 2013 -0700
@@ -0,0 +1,8 @@
+cd @USERFILE_WORKING_DIRECTORY@
+@USERFILE_ENV_COMMANDS@
+if [%1]==[--debugger] (
+	SHIFT
+)
+
+"@USERFILE_COMMAND@" @LAUNCHERSCRIPT_COMMAND_ARGUMENTS@
+pause

diff -r 6da7cbe0302f -r 265da92bf492 launcher-templates/vcproj.user.in
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/launcher-templates/vcproj.user.in	Thu Oct 10 17:40:15 2013 -0700
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioUserFile
+	ProjectType="Visual C++"
+	Version="@USERFILE_VC_VERSION@"
+	ShowAllFiles="false"
+	>
+	<Configurations>
+@USERFILE_CONFIGSECTIONS@
+	</Configurations>
+</VisualStudioUserFile>

diff -r 6da7cbe0302f -r 265da92bf492 launcher-templates/vcxproj.user.in
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/launcher-templates/vcxproj.user.in	Thu Oct 10 17:40:15 2013 -0700
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+@USERFILE_CONFIGSECTIONS@
+</Project>

diff -r 6da7cbe0302f -r 265da92bf492 src/CMakeLists.txt
--- a/src/CMakeLists.txt	Wed Oct 09 22:33:58 2013 -0500
+++ b/src/CMakeLists.txt	Thu Oct 10 17:40:15 2013 -0700
@@ -24,7 +24,7 @@
 	endif( APPLE )
 endif( "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" )
 
-option( DYN_FLUIDSYNTH "Dynamically load fluidsynth" )
+option( DYN_FLUIDSYNTH "Dynamically load fluidsynth" ON )
 
 if( CMAKE_SIZEOF_VOID_P MATCHES "8" )
 	set( X64 64 )
@@ -1087,10 +1087,32 @@
 
 add_dependencies( zdoom revision_check )
 
-# RUNTIME_OUTPUT_DIRECTORY does not exist in CMake 2.4.
-# Linux distributions are slow to adopt 2.6. :(
-set_target_properties( zdoom PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${ZDOOM_OUTPUT_DIR} )
-set_target_properties( zdoom PROPERTIES OUTPUT_NAME ${ZDOOM_EXE_NAME} )
+if( MSVC )
+	set_target_properties(zdoom PROPERTIES LINK_FLAGS "/MANIFEST:NO")
+	add_custom_command(TARGET zdoom POST_BUILD
+		COMMAND "mt.exe" -manifest \"${CMAKE_CURRENT_SOURCE_DIR}\\win32\\zdoom.exe.manifest\" -outputresource:\"$(TargetDir)$(TargetFileName)\"\;\#2
+		COMMENT "Adding manifest..."
+	)
+
+	create_default_target_launcher( zdoom WORKING_DIRECTORY ${ZDOOM_OUTPUT_DIR} )
+endif( MSVC )
+
+if( ZDOOM_OUTPUT_OLDSTYLE AND NOT NO_GENERATOR_EXPRESSION )
+	set_target_properties( zdoom PROPERTIES
+		RUNTIME_OUTPUT_NAME ${ZDOOM_EXE_NAME}
+		RUNTIME_OUTPUT_NAME_DEBUG ${ZDOOM_EXE_NAME}d
+		RUNTIME_OUTPUT_NAME_MINSIZEREL ${ZDOOM_EXE_NAME}msr
+		RUNTIME_OUTPUT_NAME_RELWITHDEBINFO ${ZDOOM_EXE_NAME}rd
+	)
+	add_custom_command(TARGET zdoom POST_BUILD
+		COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:zdoom> ${ZDOOM_OUTPUT_DIR}/$<TARGET_FILE_NAME:zdoom>
+		COMMENT "Copying to output directory..." )
+else( ZDOOM_OUTPUT_OLDSTYLE AND NOT NO_GENERATOR_EXPRESSION )
+	# RUNTIME_OUTPUT_DIRECTORY does not exist in CMake 2.4.
+	# Linux distributions are slow to adopt 2.6. :(
+	set_target_properties( zdoom PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${ZDOOM_OUTPUT_DIR} )
+	set_target_properties( zdoom PROPERTIES OUTPUT_NAME ${ZDOOM_EXE_NAME} )
+endif( ZDOOM_OUTPUT_OLDSTYLE AND NOT NO_GENERATOR_EXPRESSION )
 
 if( NOT WIN32 )
 	FILE( WRITE ${CMAKE_CURRENT_BINARY_DIR}/link-make "if [ ! -e ${ZDOOM_OUTPUT_DIR}/${ZDOOM_EXE_NAME} ]; then ln -sf ${CMAKE_CURRENT_BINARY_DIR}/${ZDOOM_EXE_NAME} ${ZDOOM_OUTPUT_DIR}/${ZDOOM_EXE_NAME}; fi" )
@@ -1108,14 +1130,6 @@
 	endif( SSE_MATTERS )
 endif( "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" )
 
-if( MSVC )
-	set_target_properties(zdoom PROPERTIES LINK_FLAGS "/MANIFEST:NO")
-	add_custom_command(TARGET zdoom POST_BUILD
-		COMMAND "mt.exe" -manifest \"${CMAKE_CURRENT_SOURCE_DIR}\\win32\\zdoom.exe.manifest\" -outputresource:\"$(TargetDir)$(TargetFileName)\"\;\#2
-		COMMENT "Adding manifest..."
-	)
-endif( MSVC )
-
 source_group("Assembly Files\\ia32" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/asm_ia32/.+")
 source_group("Assembly Files\\x86_64" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/asm_x86_64/.+")
 source_group("Audio Files" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/sound/.+")