@@ -40,6 +40,7 @@ function(buildExe)
4040 COMPILE_OPTIONS "${GAMEMODULE_FLAGS} "
4141 FOLDER ${GAMEMODULE_NAME}
4242 )
43+
4344 ADD_PRECOMPILED_HEADER (${GAMEMODULE_NAME} -native-exe )
4445endfunction ()
4546
@@ -80,11 +81,11 @@ function(gameSubProject)
8081 -DFORK=2
8182 -DDAEMON_DIR=${Daemon_SOURCE_DIR}
8283 -DDEPS_DIR=${DEPS_DIR}
83- ${ARGV}
8484 -DBUILD_CLIENT=OFF
8585 -DBUILD_TTY_CLIENT=OFF
8686 -DBUILD_SERVER=OFF
87- ${inherited_option_args}
87+ ${ARGV}
88+ ${INHERITED_OPTION_ARGS}
8889 INSTALL_COMMAND ""
8990 )
9091
@@ -130,10 +131,10 @@ function(GAMEMODULE)
130131 endif ()
131132
132133 include (ExternalProject )
133- set (inherited_option_args )
134+ set (INHERITED_OPTION_ARGS )
134135
135136 foreach (inherited_option ${NACL_VM_INHERITED_OPTIONS} )
136- set (inherited_option_args ${inherited_option_args }
137+ set (INHERITED_OPTION_ARGS ${INHERITED_OPTION_ARGS }
137138 "-D${inherited_option} =${${inherited_option} }" )
138139 endforeach (inherited_option )
139140
@@ -171,11 +172,11 @@ function(GAMEMODULE)
171172 gameSubProject (
172173 -DCMAKE_TOOLCHAIN_FILE=${Daemon_SOURCE_DIR}/cmake/toolchain-saigo.cmake
173174 -DBUILD_GAME_NACL=ON
174- -DUSE_NACL_SAIGO=ON
175- -DNACL_TARGET=${NACL_TARGET}
176- -DSAIGO_ARCH=${SAIGO_ARCH}
177175 -DBUILD_GAME_NATIVE_DLL=OFF
178176 -DBUILD_GAME_NATIVE_EXE=OFF
177+ -DUSE_NACL_SAIGO=ON
178+ -DSAIGO_ARCH=${SAIGO_ARCH}
179+ -DNACL_TARGET=${NACL_TARGET}
179180 )
180181 endforeach ()
181182 else ()
@@ -188,9 +189,9 @@ function(GAMEMODULE)
188189 gameSubProject (
189190 -DCMAKE_TOOLCHAIN_FILE=${Daemon_SOURCE_DIR}/cmake/toolchain-pnacl.cmake
190191 -DBUILD_GAME_NACL=ON
191- -DNACL_TARGETS_STRING=${NACL_TARGETS_STRING}
192192 -DBUILD_GAME_NATIVE_DLL=OFF
193193 -DBUILD_GAME_NATIVE_EXE=OFF
194+ -DNACL_TARGETS_STRING=${NACL_TARGETS_STRING}
194195 )
195196 endif ()
196197 endif ()
0 commit comments