fixup

DaemonEngine · Jan 6, 2025 · e8919d6 · e8919d6
1 parent 039add7
commit e8919d6
Showing 1 changed file with 9 additions and 8 deletions.
diff --git a/cmake/DaemonGame.cmake b/cmake/DaemonGame.cmake
@@ -40,6 +40,7 @@ function(buildExe)
 		COMPILE_OPTIONS "${GAMEMODULE_FLAGS}"
 		FOLDER ${GAMEMODULE_NAME}
 	)
+
 	ADD_PRECOMPILED_HEADER(${GAMEMODULE_NAME}-native-exe)
 endfunction()
 
@@ -80,11 +81,11 @@ function(gameSubProject)
 			-DFORK=2
 			-DDAEMON_DIR=${Daemon_SOURCE_DIR}
 			-DDEPS_DIR=${DEPS_DIR}
-			${ARGV}
 			-DBUILD_CLIENT=OFF
 			-DBUILD_TTY_CLIENT=OFF
 			-DBUILD_SERVER=OFF
-			${inherited_option_args}
+			${ARGV}
+			${INHERITED_OPTION_ARGS}
 		INSTALL_COMMAND ""
 	)
 
@@ -130,10 +131,10 @@ function(GAMEMODULE)
 		endif()
 
 		include(ExternalProject)
-		set(inherited_option_args)
+		set(INHERITED_OPTION_ARGS)
 
 		foreach(inherited_option ${NACL_VM_INHERITED_OPTIONS})
-			set(inherited_option_args ${inherited_option_args}
+			set(INHERITED_OPTION_ARGS ${INHERITED_OPTION_ARGS}
 				"-D${inherited_option}=${${inherited_option}}")
 		endforeach(inherited_option)
 
@@ -171,11 +172,11 @@ function(GAMEMODULE)
 					gameSubProject(
 						-DCMAKE_TOOLCHAIN_FILE=${Daemon_SOURCE_DIR}/cmake/toolchain-saigo.cmake
 						-DBUILD_GAME_NACL=ON
-						-DUSE_NACL_SAIGO=ON
-						-DNACL_TARGET=${NACL_TARGET}
-						-DSAIGO_ARCH=${SAIGO_ARCH}
 						-DBUILD_GAME_NATIVE_DLL=OFF
 						-DBUILD_GAME_NATIVE_EXE=OFF
+						-DUSE_NACL_SAIGO=ON
+						-DSAIGO_ARCH=${SAIGO_ARCH}
+						-DNACL_TARGET=${NACL_TARGET}
 					)
 				endforeach()
 			else()
@@ -188,9 +189,9 @@ function(GAMEMODULE)
 				gameSubProject(
 					-DCMAKE_TOOLCHAIN_FILE=${Daemon_SOURCE_DIR}/cmake/toolchain-pnacl.cmake
 					-DBUILD_GAME_NACL=ON
-					-DNACL_TARGETS_STRING=${NACL_TARGETS_STRING}
 					-DBUILD_GAME_NATIVE_DLL=OFF
 					-DBUILD_GAME_NATIVE_EXE=OFF
+					-DNACL_TARGETS_STRING=${NACL_TARGETS_STRING}
 				)
 			endif()
 		endif()