diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/OMakefile b/trunk/ConsoleDataMigration/sources/ConsoleRestore/OMakefile index 64029d4..d774ec6 100644 --- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/OMakefile +++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/OMakefile @@ -73,7 +73,9 @@ SHADER_PATH = $(ROMFS_ROOT)/$(SHADER_BIN) ROMFS_DEPENDENCIES = $(SHADER_PATH) -EXCLUDE_LIBS += libnn_olv +if $(defined-env BUILD_FOR_RESTORE) + EXCLUDE_LIBS += libnn_olv + export LIBS += libnn_cfg \ libnn_crypto \ diff --git a/trunk/ConsoleDataMigration/sources/build.sh b/trunk/ConsoleDataMigration/sources/build.sh index b717023..be4ec56 100755 --- a/trunk/ConsoleDataMigration/sources/build.sh +++ b/trunk/ConsoleDataMigration/sources/build.sh @@ -10,6 +10,7 @@ set -u set -e +#set -x # バージョン取得 function getVersion @@ -79,6 +80,7 @@ function buildBackupAndRestore buildCore "$BuildExec" cd ../ cd ConsoleRestore + export BUILD_FOR_RESTORE=true export HORIZON_ROOT=$HORIZON_ROOT_RESTORE buildCore "$BuildExec" cd ../ @@ -108,6 +110,9 @@ function buildAutoTest } #################### 通常ビルド #################### +# ビルドフラグ削除 +unset BUILD_FOR_RESTORE + # ConsoleBackup、ConsoleRestoreのビルド buildBackupAndRestore