@@ -80,11 +80,11 @@ function(gameSubProject)
8080 -DFORK=2
8181 -DDAEMON_DIR=${Daemon_SOURCE_DIR}
8282 -DDEPS_DIR=${DEPS_DIR}
83- ${ARGV}
8483 -DBUILD_CLIENT=OFF
8584 -DBUILD_TTY_CLIENT=OFF
8685 -DBUILD_SERVER=OFF
87- ${inherited_option_args}
86+ ${ARGV}
87+ ${INHERITED_OPTION_ARGS}
8888 INSTALL_COMMAND ""
8989 )
9090
@@ -130,10 +130,10 @@ function(GAMEMODULE)
130130 endif ()
131131
132132 include (ExternalProject )
133- set (inherited_option_args )
133+ set (INHERITED_OPTION_ARGS )
134134
135135 foreach (inherited_option ${NACL_VM_INHERITED_OPTIONS} )
136- set (inherited_option_args ${inherited_option_args }
136+ set (INHERITED_OPTION_ARGS ${INHERITED_OPTION_ARGS }
137137 "-D${inherited_option} =${${inherited_option} }" )
138138 endforeach (inherited_option )
139139
@@ -171,11 +171,11 @@ function(GAMEMODULE)
171171 gameSubProject (
172172 -DCMAKE_TOOLCHAIN_FILE=${Daemon_SOURCE_DIR}/cmake/toolchain-saigo.cmake
173173 -DBUILD_GAME_NACL=ON
174- -DUSE_NACL_SAIGO=ON
175- -DNACL_TARGET=${NACL_TARGET}
176- -DSAIGO_ARCH=${SAIGO_ARCH}
177174 -DBUILD_GAME_NATIVE_DLL=OFF
178175 -DBUILD_GAME_NATIVE_EXE=OFF
176+ -DUSE_NACL_SAIGO=ON
177+ -DSAIGO_ARCH=${SAIGO_ARCH}
178+ -DNACL_TARGET=${NACL_TARGET}
179179 )
180180 endforeach ()
181181 else ()
@@ -188,9 +188,9 @@ function(GAMEMODULE)
188188 gameSubProject (
189189 -DCMAKE_TOOLCHAIN_FILE=${Daemon_SOURCE_DIR}/cmake/toolchain-pnacl.cmake
190190 -DBUILD_GAME_NACL=ON
191- -DNACL_TARGETS_STRING=${NACL_TARGETS_STRING}
192191 -DBUILD_GAME_NATIVE_DLL=OFF
193192 -DBUILD_GAME_NATIVE_EXE=OFF
193+ -DNACL_TARGETS_STRING=${NACL_TARGETS_STRING}
194194 )
195195 endif ()
196196 endif ()
0 commit comments