vivlim
/
Kart-Public
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Prepend ASM sources with the current source directory in CMake. 

This fixes generation with USEASM enabled.
This commit is contained in:
Ronald Kinard 2015-03-08 04:16:16 -05:00
parent a713509493
commit 8472075960
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/CMakeLists.txt
View File

@ -176,25 +176,25 @@ source_group("Renderer" FILES ${SRB2_CORE_RENDER_SOURCES})
source_group("Game" FILES ${SRB2_CORE_GAME_SOURCES}) source_group("Game" FILES ${SRB2_CORE_GAME_SOURCES})
set(SRB2_ASM_SOURCES set(SRB2_ASM_SOURCES
vid_copy.s ${CMAKE_CURRENT_SOURCE_DIR}/vid_copy.s
) )
set(SRB2_NASM_SOURCES set(SRB2_NASM_SOURCES
tmap_mmx.nas ${CMAKE_CURRENT_SOURCE_DIR}/tmap_mmx.nas
tmap.nas ${CMAKE_CURRENT_SOURCE_DIR}/tmap.nas
) )
if(MSVC) if(MSVC)
list(APPEND SRB2_NASM_SOURCES tmap_vc.nas) list(APPEND SRB2_NASM_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/tmap_vc.nas)
endif() endif()
set(SRB2_NASM_OBJECTS set(SRB2_NASM_OBJECTS
tmap_mmx.obj ${CMAKE_CURRENT_BINARY_DIR}/tmap_mmx.obj
tmap.obj ${CMAKE_CURRENT_BINARY_DIR}/tmap.obj
) )
if(MSVC) if(MSVC)
list(APPEND SRB2_NASM_OBJECTS tmap_vc.obj) list(APPEND SRB2_NASM_OBJECTS ${CMAKE_CURRENT_BINARY_DIR}/tmap_vc.obj)
endif() endif()
source_group("Assembly" FILES ${SRB2_ASM_SOURCES} ${SRB2_NASM_SOURCES}) source_group("Assembly" FILES ${SRB2_ASM_SOURCES} ${SRB2_NASM_SOURCES})