CMAKE: minor fixes

ioquake · Apr 23, 2022 · 46f2539 · 46f2539
1 parent 30fb062
commit 46f2539
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt
@@ -13,6 +13,8 @@ check_compiler_flag(-Wextra)
 check_compiler_flag(-Wno-unused-parameter)
 check_compiler_flag(-Wno-sign-compare)
 
+add_custom_target(qvm)
+
 set(QCOMMON_COLLISION_SRCS
 	${CMAKE_CURRENT_SOURCE_DIR}/qcommon/cm_load.c
 	${CMAKE_CURRENT_SOURCE_DIR}/qcommon/cm_local.h
@@ -56,7 +58,7 @@ function(add_debuggger TARGET)
 	elseif (${DEBUGGER} MATCHES "lldb")
 		add_custom_target(${TARGET}-debug)
 		add_custom_command(TARGET ${TARGET}-debug
-			COMMAND CG_CONTEXT_SHOW_BACKTRACE=1 ${LLDB_EXECUTABLE} -b -o run $<TARGET_FILE:${TARGET}>
+			COMMAND CG_CONTEXT_SHOW_BACKTRACE=1 ${LLDB_EXECUTABLE} -b -o run $<TARGET_FILE:${TARGET}> +set vm_game 0 +set vm_cgame 0 +set vm_ui 0 +set sv_pure 0 +set ttycon 0 +set com_ansiColor 0 +set developer 1
 			COMMENT "Starting debugger session for ${TARGET}"
 			USES_TERMINAL
 			WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
@@ -116,17 +118,17 @@ function(q3_add_executable)
 
 	if (_EXE_WINDOWED)
 		if (WIN32)
-			add_executable(${_EXE_TARGET} WIN32 ${SRCS})
+			add_executable(${_EXE_TARGET} WIN32 ${_EXE_SRCS})
 			if (MSVC)
 				set_target_properties(${_EXE_TARGET} PROPERTIES LINK_FLAGS "/SUBSYSTEM:WINDOWS")
 			endif()
 		elseif(APPLE)
-			add_executable(${_EXE_TARGET} MACOSX_BUNDLE ${SRCS})
+			add_executable(${_EXE_TARGET} MACOSX_BUNDLE ${_EXE_SRCS})
 		else()
-			add_executable(${_EXE_TARGET} ${SRCS})
+			add_executable(${_EXE_TARGET} ${_EXE_SRCS})
 		endif()
 	else()
-		add_executable(${_EXE_TARGET} ${SRCS})
+		add_executable(${_EXE_TARGET} ${_EXE_SRCS})
 		if (WIN32)
 			if (MSVC)
 				set_target_properties(${_EXE_TARGET} PROPERTIES LINK_FLAGS "/SUBSYSTEM:CONSOLE")
@@ -197,7 +199,7 @@ function(add_qvm TARGET_SHORT GAME_NAME)
 	set(srcfiles ${ARGV})
 	string(TOUPPER ${TARGET_SHORT} UPPERTARGET)
 	set(TARGET ${GAME_NAME}-${TARGET_SHORT})
-	set(compileflags "-D${UPPERTARGET}")
+	set(compileflags "-D${UPPERTARGET}" "-DVMS")
 	set(QVM_SRCS)
 	foreach(srcfile ${srcfiles})
 		get_filename_component(ext ${srcfile} EXT)
@@ -216,6 +218,7 @@ function(add_qvm TARGET_SHORT GAME_NAME)
 			list(APPEND QVM_SRCS ${q3asm_outfile})
 		endif()
 	endforeach()
+	add_dependencies(qvm qvm_${TARGET})
 
 	set(QVM_PATH ${GAME_NAME}/vm/${TARGET_SHORT}.qvm)
 	add_custom_command(