From 13ba77c9e5d850305d67d77664d3e386f76b5c51 Mon Sep 17 00:00:00 2001
From: N2614 <N2614@385bec56-5757-e545-9c3a-d8741f4650f1>
Date: Wed, 5 Mar 2014 02:15:07 +0000
Subject: [PATCH] =?UTF-8?q?ConsoleRestore=E3=81=AE=E3=83=93=E3=83=AB?=
 =?UTF-8?q?=E3=83=89=E7=92=B0=E5=A2=83=E3=82=92trunk=E3=81=AB=E7=A7=BB?=
 =?UTF-8?q?=E8=A1=8C?=
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@773 385bec56-5757-e545-9c3a-d8741f4650f1
---
 .../ConsoleDataMigration/documents/Readme.txt | 20 +++----------------
 .../sources/ConsoleRestore/OMakefile          |  3 ++-
 2 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/trunk/ConsoleDataMigration/documents/Readme.txt b/trunk/ConsoleDataMigration/documents/Readme.txt
index 829eb99..a5bb58c 100644
--- a/trunk/ConsoleDataMigration/documents/Readme.txt
+++ b/trunk/ConsoleDataMigration/documents/Readme.txt
@@ -3,11 +3,12 @@
 
 SDK
 ----
-CTR_SDK-3_3 branch r45925 + r51434 + r54939
+Backup CTR_SDK-3_3 branch r45925 + r51434 + r54939
+Restore Horizon trunk r55909
 
 コンパイラ
 -------
-ARM C/C++ Compiler, 4.1 [Build 1247] for Nintendo
+ARM C/C++ Compiler, 4.1 [Build 1307] for Nintendo
 
 ミドルウェア
 --------
@@ -33,21 +34,6 @@ QR
 `$HORIZON_ROOT/sources/libraries/nwm/CTR`
 にコピーしてからnwmをリビルドする必要がある。
 
-### NNA移行完了
-NNA移行完了のため、
-trunk r54688からactライブラリをコピーする必要がある。
-3_3 branch のcfgには無いシンボルを参照してしまうので、trunkでactライブラリをビルドする時に
-`sources/common/act_ApiAdmin.cpp.patch`を当ててからビルドすること。
-
-#### trunkからコピーするファイル
-* $HORIZON_ROOT/include/nn/act
-* $HORIZON_ROOT/include/nn/mii
-* $HORIZON_ROOT/include/nn/Result.h
-* $HORIZON_ROOT/libraries/CTR-TS.Process.MPCore/release/libnn_act.fast.a
-* $HORIZON_ROOT/libraries/CTR-TS.Process.MPCore/release/libnn_act.small.a
-* $HORIZON_ROOT/libraries/CTR-TS.Process.MPCore/verbose/libnn_act.fast.a
-* $HORIZON_ROOT/libraries/CTR-TS.Process.MPCore/verbose/libnn_act.small.a
-
 リリース時の注意
 =============
 
diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/OMakefile b/trunk/ConsoleDataMigration/sources/ConsoleRestore/OMakefile
index 08287bf..3e12fba 100644
--- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/OMakefile
+++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/OMakefile
@@ -77,6 +77,7 @@ LIBS               +=   libnn_cfg \
                         libnn_nim \
                         libnn_xml_simple \
                         libnn_act \
+                        libnn_actslv \
 
 QRE_LIBRARIES[] =  libmw_qre
 LIBFILES            += $`(addprefix $(CTRMW_QRE_ROOT)$(DIRSEP)$(SUBDIR_LIBRARIES)$(DIRSEP)$(config.getTargetSubDirectory true)$(DIRSEP), $(QRE_LIBRARIES)) \
@@ -84,7 +85,7 @@ LIBFILES            += $`(addprefix $(CTRMW_QRE_ROOT)$(DIRSEP)$(SUBDIR_LIBRARIES
 INSTALL_SDK_TOOL = true
 
 ROM_SPEC_FILE       =   $(TARGET_NAME).rsf
-DESCRIPTOR          =   $(HORIZON_ROOT)/resources/specfiles/private/RepairTool.desc
+DESCRIPTOR          =   $(HORIZON_ROOT)/resources/specfiles/tools/RepairTool.desc
 
 include $(ROOT_OMAKE)/modulerules