OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge branch 'master' of https://github.com/rheit/zdoom

Browse source
This commit is contained in:
Christoph Oelckers 2013-11-26 22:12:18 +01:00
commit 40d4ebcbc5
4 changed files with 12 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/CMakeLists.txt
View file

@ -143,12 +143,8 @@ if( WIN32 )
comdlg32
ws2_32
setupapi
oleaut32 )
# For some reason this isn't implied on 2005
if( MSVC80 )
set( ZDOOM_LIBS ${ZDOOM_LIBS} DelayImp )
endif( MSVC80 )
oleaut32
DelayImp )
else( WIN32 )
if( APPLE )
set( FMOD_SEARCH_PATHS "/Developer/FMOD Programmers API Mac/api" )
@ -1226,7 +1222,7 @@ if( MSVC )
endif( ZDOOM_GENERATE_MAPFILE )
add_custom_command(TARGET zdoom POST_BUILD
COMMAND "mt.exe" -manifest \"${CMAKE_CURRENT_SOURCE_DIR}\\win32\\zdoom.exe.manifest\" -outputresource:\"$(TargetDir)$(TargetFileName)\"\;\#2
COMMAND "mt.exe" -manifest \"${CMAKE_CURRENT_SOURCE_DIR}\\win32\\zdoom.exe.manifest\" -outputresource:\"$(TargetDir)$(TargetFileName)\"\;\#1
COMMENT "Adding manifest..."
)