From 5b0cb11c2dc578b368a3cfda42c76e66a30bb3a0 Mon Sep 17 00:00:00 2001 From: N2614 Date: Wed, 15 Feb 2012 07:38:41 +0000 Subject: [PATCH] =?UTF-8?q?TEST=E7=92=B0=E5=A2=83=E5=90=91=E3=81=91?= =?UTF-8?q?=E3=83=AB=E3=83=89=E3=81=AE=E5=BB=83=E6=AD=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: file:///Volumes/Transfer/gigaleak_20231201/2020-05-23%20-%20ctr.7z%20+%20svn_v1.068.zip/ctr/svn/ctr_Repair@635 385bec56-5757-e545-9c3a-d8741f4650f1 --- trunk/ConsoleDataMigration/documents/Readme.txt | 14 +++----------- .../sources/common/BuildSwitch.om | 11 +---------- 2 files changed, 4 insertions(+), 21 deletions(-) diff --git a/trunk/ConsoleDataMigration/documents/Readme.txt b/trunk/ConsoleDataMigration/documents/Readme.txt index bbf67b1..a44b31a 100644 --- a/trunk/ConsoleDataMigration/documents/Readme.txt +++ b/trunk/ConsoleDataMigration/documents/Readme.txt @@ -1,26 +1,18 @@ 【ビルド環境】 ・SDK -CTR_SDK-3_3 branch r45337 +CTR_SDK-3_3 branch r45925 ・コンパイラ ARM C/C++ Compiler, 4.1 [Build 791] for Nintendo 【ビルド時の注意】 -開発機・量産機でAES鍵を変えるためと、BGSとの通信用の -クライアント証明書切り替えのため、 +開発機・量産機でAES鍵を変えるため -TESTサーバと通信する場合は -TEST_BUILD=true - -PRODサーバと通信する場合は +量産機用ビルドの場合 PROD_BUILD=true を有効にしてomakeを実行すること。 -どちらも有効にしない場合はDEV6のBGS用のクライアント証明書が -使われる。 - - 【その他】 PC上でのgoogletestを使う場合BOM付きのUTF-8を コンパイルできるgccが必要。 diff --git a/trunk/ConsoleDataMigration/sources/common/BuildSwitch.om b/trunk/ConsoleDataMigration/sources/common/BuildSwitch.om index bb554a0..25cd960 100644 --- a/trunk/ConsoleDataMigration/sources/common/BuildSwitch.om +++ b/trunk/ConsoleDataMigration/sources/common/BuildSwitch.om @@ -13,21 +13,12 @@ # # $Rev: 216 $ #---------------------------------------------------------------------------- -if $(and $(defined PROD_BUILD), $(defined TEST_BUILD)) - echo Both PROD_BUILD and TEST_BUILD defined!! - exit - if $(defined TARGET_PROGRAM) if $(defined PROD_BUILD) - CCFLAGS += -DUSE_PROD_KEY -DBUILD_FOR_PROD_BGS + CCFLAGS += -DUSE_PROD_KEY TARGET_NAME = $(TARGET_PROGRAM) TARGET_PROGRAM = $(TARGET_PROGRAM)_prod export - elseif $(defined TEST_BUILD) - CCFLAGS += -DUSE_PROD_KEY -DBUILD_FOR_TEST_BGS - TARGET_NAME = $(TARGET_PROGRAM) - TARGET_PROGRAM = $(TARGET_PROGRAM)_test - export else TARGET_NAME = $(TARGET_PROGRAM) export