追加忘れ

上画面表示のバージョンにMICROが抜けていたので修正
UnfixedKey用ビルドもツールのみで終了するように

git-svn-id: file:///Volumes/Transfer/gigaleak_20231201/2020-05-23%20-%20ctr.7z%20+%20svn_v1.068.zip/ctr/svn/ctr_Repair@649 385bec56-5757-e545-9c3a-d8741f4650f1

branches/1stNUP_for_2ndNUP/sources/build.sh

@@ -0,0 +1,69 @@
+#!/usr/bin/env bash
+
+# バージョン取得
+function getVersion
+{
+    VERSION_MAJOR=$(cat common/version.h |grep VERSION_MAJOR|awk -F' ' '{print $3}'|sed 's/"//g')
+    VERSION_MINOR=$(cat common/version.h |grep VERSION_MINOR|awk -F' ' '{print $3}'|sed 's/"//g')
+    VERSION_MICRO=$(cat common/version.h |grep VERSION_MICRO|awk -F' ' '{print $3}'|sed 's/"//g')
+    VERSION_STR="VERSION_MAJOR=$VERSION_MAJOR VERSION_MINOR=$VERSION_MINOR VERSION_MICRO=$VERSION_MICRO"
+}
+
+# フラグ判定
+for arg in $@
+do
+    if [ "$arg" = 'RELEASE' ]; then
+	releaseBuild=true
+    fi
+
+    if [ "$arg" = 'UNFIXEDKEY' ]; then
+	unfixedKeyBuild=true
+    fi
+done
+
+if [ $releaseBuild ] ; then
+    getVersion
+    BUILD_TYPE=release,development
+    OPTION="PROD_BUILD=true $VERSION_STR"
+elif [ $unfixedKeyBuild ] ; then
+    getVersion
+    BUILD_TYPE=release,development
+    OPTION="UNFIXEDKEY_BUILD=true $VERSION_STR"
+else
+    BUILD_TYPE=development    
+fi
+
+# IncrediBuildが使えるか
+which xgConsole > /dev/null 2>&1
+if [ "$?" -eq 0 ]; then
+    useIncrediBuild=true
+    PARALLEL=-j16
+else
+    PARALLEL=-j8
+fi
+
+#################### 通常ビルド ####################
+# ツールのビルド
+toolBuildExec="omake BUILD=$BUILD_TYPE FILTER=CTR-TS.*fast $OPTION"
+if [ $useIncrediBuild ] ; then
+    xgConsole /command="$toolBuildExec $PARALLEL" /profile="profile.xml"
+else
+    $toolBuildExec $PARALLEL
+fi
+
+#リリース用ビルドはツールのみ
+if [ $releaseBuild ] || [ $unfixedKeyBuild ] ; then
+    exit
+fi
+
+echo hogehoge
+
+# CTR自動テストのビルド
+testBuildExec="omake dotests-emumem BUILD=development FILTER=CTR-TS*.fast SKIP_RUN=true"
+cd tests
+if [ $useIncrediBuild ] ; then
+    xgConsole /command="$testBuildExec $PARALLEL" /profile="../profile.xml"    
+else
+    $testBuildExec $PARALLEL
+fi
+cd ../

branches/1stNUP_for_2ndNUP/sources/common/BuildSwitch.om

@@ -0,0 +1,29 @@
+#!/usr/bin/env omake
+#----------------------------------------------------------------------------
+# Project:  Horizon
+# File:     OMakefile
+#
+# Copyright (C)2009 Nintendo Co., Ltd.  All rights reserved.
+#
+# These coded instructions, statements, and computer programs contain
+# proprietary information of Nintendo of America Inc. and/or Nintendo
+# Company Ltd., and are protected by Federal copyright law.  They may
+# not be disclosed to third parties or copied or duplicated in any form,
+# in whole or in part, without the prior written consent of Nintendo.
+#
+# $Rev: 216 $
+#----------------------------------------------------------------------------
+if $(defined TARGET_PROGRAM)
+    if $(defined PROD_BUILD)
+        CCFLAGS += -DUSE_PROD_KEY
+        TARGET_NAME = $(TARGET_PROGRAM)
+        TARGET_PROGRAM = $(TARGET_PROGRAM)_prod_$(VERSION_MAJOR)-$(VERSION_MINOR)-$(VERSION_MICRO)
+        export
+    elseif $(defined UNFIXEDKEY_BUILD)
+        TARGET_NAME = $(TARGET_PROGRAM)
+        TARGET_PROGRAM = $(TARGET_PROGRAM)_dev_$(VERSION_MAJOR)-$(VERSION_MINOR)-$(VERSION_MICRO)
+        export
+    else
+        TARGET_NAME = $(TARGET_PROGRAM)
+        export
+    export

branches/1stNUP_for_2ndNUP/sources/common/DrawSystemState.cpp

@@ -169,8 +169,8 @@ void DrawSystemState
     renderSystem.SetFontSize(fontwidth);
 
     // ツール名、ハイライト
-    renderSystem.DrawText(0, line++ * fontheight, "%s %s-%s", toolName, CONSOLE_REPAIR_VERSION_MAJOR,
-            CONSOLE_REPAIR_VERSION_MINOR);
+    renderSystem.DrawText(0, line++ * fontheight, "%s %s-%s-%s", toolName, CONSOLE_REPAIR_VERSION_MAJOR,
+            CONSOLE_REPAIR_VERSION_MINOR, CONSOLE_REPAIR_VERSION_MICRO);
     renderSystem.SetColor(titleColor.r, titleColor.g, titleColor.b);
     renderSystem.FillRectangle(0, (line - 1) * fontheight, 400, fontheight);
     renderSystem.SetColor(1.f, 1.f, 1.f);