リビジョン 645 を trunk/ConsoleDataMigration からマージ:

成果物のファイル名にバージョン番号を入れられるように
UnfixedKey用ビルドを追加
........
ビルドが通るように修正

git-svn-id: file:///Volumes/Transfer/gigaleak_20231201/2020-05-23%20-%20ctr.7z%20+%20svn_v1.068.zip/ctr/svn/ctr_Repair@647 385bec56-5757-e545-9c3a-d8741f4650f1
This commit is contained in:
N2614 2012-02-21 04:44:42 +00:00
parent 58f09e5d1b
commit 8a5bccea86
11 changed files with 24 additions and 20 deletions

View File

@ -44,7 +44,8 @@ SOURCES[] =
../common/ResFont.cpp
../common/HardwareStateManager.cpp
CTR_BANNER_SPEC = $(TARGET_PROGRAM).bsf
include $(ROOT)/common/BuildSwitch.om
CTR_BANNER_SPEC = $(TARGET_NAME).bsf
ROMFS_ROOT = ../common/romfiles
@ -66,7 +67,7 @@ LIBS += libnn_cfg \
INSTALL_SDK_TOOL = true
ROM_SPEC_FILE = $(TARGET_PROGRAM).rsf
ROM_SPEC_FILE = $(TARGET_NAME).rsf
DESCRIPTOR = $(HORIZON_ROOT)/resources/specfiles/RepairTool.desc
include $(ROOT_OMAKE)/modulerules

View File

@ -47,7 +47,8 @@ SOURCES[] =
../common/ResFont.cpp
../common/HardwareStateManager.cpp
CTR_BANNER_SPEC = $(TARGET_PROGRAM).bsf
include $(ROOT)/common/BuildSwitch.om
CTR_BANNER_SPEC = $(TARGET_NAME).bsf
ROMFS_ROOT = ../common/romfiles
@ -69,7 +70,7 @@ LIBS += libnn_cfg \
INSTALL_SDK_TOOL = true
ROM_SPEC_FILE = $(TARGET_PROGRAM).rsf
ROM_SPEC_FILE = $(TARGET_NAME).rsf
DESCRIPTOR = $(HORIZON_ROOT)/resources/specfiles/RepairTool.desc
include $(ROOT_OMAKE)/modulerules

View File

@ -32,7 +32,6 @@ TEST_COMMON_SOURCES[] =
../../../common/LogConsole.cpp
../../../common/CommonLogger.cpp
../../../common/SdMountManager.cpp
../../../common/PlayHistoryManager.cpp
../../../common/VersionDetect.cpp
../../../common/HardwareStateManager.cpp
../../../common/FileTransfer.cpp
@ -54,7 +53,7 @@ LIBS += libnn_test \
ROM_SPEC_FILE = ../../../ConsoleBackup/ConsoleBackup.rsf
DESCRIPTOR = $(HORIZON_ROOT)/resources/specfiles/_private/RepairTool.desc
DESCRIPTOR = $(HORIZON_ROOT)/resources/specfiles/RepairTool.desc
include $(makePlatformDefsPath build.tests)

View File

@ -65,10 +65,10 @@ bool ExporterTest::InitializeSuite()
nn::am::InitializeForSystemMenu();
// ヒープの確保
common::HeapManager::GetHeap()->Initialize(nn::os::GetDeviceMemoryAddress(), nn::os::GetDeviceMemorySize(), nn::os::ALLOCATE_OPTION_LINEAR);
common::HeapManager gxHeap(s_GxHeapSize);
// RenderSystem の準備
uptr heapForGx = reinterpret_cast<uptr>(common::HeapManager::GetHeap()->Allocate(s_GxHeapSize));
uptr heapForGx = reinterpret_cast<uptr>(gxHeap.GetAddr());
demo::RenderSystemDrawing renderSystem;
renderSystem.Initialize(heapForGx, s_GxHeapSize);

View File

@ -33,7 +33,6 @@ TEST_COMMON_SOURCES[] =
../../../common/LogConsole.cpp
../../../common/CommonLogger.cpp
../../../common/SdMountManager.cpp
../../../common/PlayHistoryManager.cpp
../../../common/VersionDetect.cpp
../../../common/HardwareStateManager.cpp
../../../common/FileTransfer.cpp
@ -56,7 +55,7 @@ LIBS += libnn_test \
ROM_SPEC_FILE = ../../../ConsoleRestore/ConsoleRestore.rsf
DESCRIPTOR = $(HORIZON_ROOT)/resources/specfiles/_private/RepairTool.desc
DESCRIPTOR = $(HORIZON_ROOT)/resources/specfiles/RepairTool.desc
include $(makePlatformDefsPath build.tests)

View File

@ -66,10 +66,10 @@ bool TitleDownloaderTest::InitializeSuite()
nn::am::InitializeForSystemMenu();
// ヒープの確保
common::HeapManager::GetHeap()->Initialize(nn::os::GetDeviceMemoryAddress(), nn::os::GetDeviceMemorySize(), nn::os::ALLOCATE_OPTION_LINEAR);
common::HeapManager gxHeap(s_GxHeapSize);
// RenderSystem の準備
uptr heapForGx = reinterpret_cast<uptr>(common::HeapManager::GetHeap()->Allocate(s_GxHeapSize));
uptr heapForGx = reinterpret_cast<uptr>(gxHeap.GetAddr());
demo::RenderSystemDrawing renderSystem;
renderSystem.Initialize(heapForGx, s_GxHeapSize);

View File

@ -46,7 +46,7 @@ LIBS += libnn_test \
ROM_SPEC_FILE = ../../../ConsoleRestore/ConsoleRestore.rsf
DESCRIPTOR = $(HORIZON_ROOT)/resources/specfiles/_private/RepairTool.desc
DESCRIPTOR = $(HORIZON_ROOT)/resources/specfiles/RepairTool.desc
include $(makePlatformDefsPath build.tests)

View File

@ -39,6 +39,7 @@ SOURCES[] =
../../common/configLoader.cpp
../../common/VersionDetect.cpp
include $(ROOT)/common/BuildSwitch.om
CTR_BANNER_SPEC = AutoBoot.bsf
ROMFS_ROOT = ../../common/romfiles
@ -56,7 +57,7 @@ LIBS += libnn_cfg \
INSTALL_SDK_TOOL = true
ROM_SPEC_FILE = $(TARGET_PROGRAM).rsf
ROM_SPEC_FILE = $(TARGET_NAME).rsf
DESCRIPTOR = $(HORIZON_ROOT)/resources/specfiles/RepairTool.desc
include $(ROOT_OMAKE)/modulerules

View File

@ -39,7 +39,8 @@ SOURCES[] =
../../common/configLoader.cpp
../../common/VersionDetect.cpp
CTR_BANNER_SPEC = $(TARGET_PROGRAM).bsf
include $(ROOT)/common/BuildSwitch.om
CTR_BANNER_SPEC = $(TARGET_NAME).bsf
ROMFS_ROOT = ../../common/romfiles
@ -56,7 +57,7 @@ LIBS += libnn_cfg \
INSTALL_SDK_TOOL = true
ROM_SPEC_FILE = $(TARGET_PROGRAM).rsf
ROM_SPEC_FILE = $(TARGET_NAME).rsf
DESCRIPTOR = $(HORIZON_ROOT)/resources/specfiles/RepairTool.desc
include $(ROOT_OMAKE)/modulerules

View File

@ -39,7 +39,8 @@ SOURCES[] =
../../common/configLoader.cpp
../../common/VersionDetect.cpp
CTR_BANNER_SPEC = $(TARGET_PROGRAM).bsf
include $(ROOT)/common/BuildSwitch.om
CTR_BANNER_SPEC = $(TARGET_NAME).bsf
ROMFS_ROOT = ../../common/romfiles
@ -56,7 +57,7 @@ LIBS += libnn_cfg \
INSTALL_SDK_TOOL = true
ROM_SPEC_FILE = $(TARGET_PROGRAM).rsf
ROM_SPEC_FILE = $(TARGET_NAME).rsf
DESCRIPTOR = $(HORIZON_ROOT)/resources/specfiles/RepairTool.desc
include $(ROOT_OMAKE)/modulerules

View File

@ -39,7 +39,8 @@ SOURCES[] =
../../common/configLoader.cpp
../../common/VersionDetect.cpp
CTR_BANNER_SPEC = $(TARGET_PROGRAM).bsf
include $(ROOT)/common/BuildSwitch.om
CTR_BANNER_SPEC = $(TARGET_NAME).bsf
ROMFS_ROOT = ../../common/romfiles
@ -56,7 +57,7 @@ LIBS += libnn_cfg \
INSTALL_SDK_TOOL = true
ROM_SPEC_FILE = $(TARGET_PROGRAM).rsf
ROM_SPEC_FILE = $(TARGET_NAME).rsf
DESCRIPTOR = $(HORIZON_ROOT)/resources/specfiles/RepairTool.desc
include $(ROOT_OMAKE)/modulerules