From 53e4f388aa8a37593068f38ef4b6407a13919118 Mon Sep 17 00:00:00 2001
From: N2614 <N2614@385bec56-5757-e545-9c3a-d8741f4650f1>
Date: Fri, 22 Apr 2011 05:09:21 +0000
Subject: [PATCH] =?UTF-8?q?=E3=83=93=E3=83=AB=E3=83=89=E6=99=82=E3=81=AB?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=E3=81=99=E3=82=8B=E3=83=95=E3=82=A1=E3=82=A4?=
 =?UTF-8?q?=E3=83=AB=E3=82=92=E5=88=86=E3=81=91=E3=82=8B?=
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@217 385bec56-5757-e545-9c3a-d8741f4650f1
---
 .../sources/ConsoleBackup/ConsoleBackup.cpp                   | 2 +-
 trunk/ConsoleDataMigration/sources/ConsoleBackup/OMakefile    | 2 +-
 .../ConsoleDataMigration/sources/ConsoleBackup/genversion.sh  | 2 +-
 .../sources/ConsoleRestore/ConsoleRestore.cpp                 | 2 +-
 trunk/ConsoleDataMigration/sources/ConsoleRestore/OMakefile   | 4 ++--
 .../ConsoleDataMigration/sources/ConsoleRestore/genversion.sh | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/trunk/ConsoleDataMigration/sources/ConsoleBackup/ConsoleBackup.cpp b/trunk/ConsoleDataMigration/sources/ConsoleBackup/ConsoleBackup.cpp
index 18ebc3c..f095242 100644
--- a/trunk/ConsoleDataMigration/sources/ConsoleBackup/ConsoleBackup.cpp
+++ b/trunk/ConsoleDataMigration/sources/ConsoleBackup/ConsoleBackup.cpp
@@ -57,7 +57,7 @@
 #include "ResFont.h"
 
 // svnリビジョン埋め込み用
-#include "version.h"
+#include "../../generated/ConsoleBackup/version.h"
 #ifndef BACKUP_VERSION_NUM
 #define BACKUP_VERSION_NUM 0
 #endif
diff --git a/trunk/ConsoleDataMigration/sources/ConsoleBackup/OMakefile b/trunk/ConsoleDataMigration/sources/ConsoleBackup/OMakefile
index 44be172..14f6478 100644
--- a/trunk/ConsoleDataMigration/sources/ConsoleBackup/OMakefile
+++ b/trunk/ConsoleDataMigration/sources/ConsoleBackup/OMakefile
@@ -81,7 +81,7 @@ DESCRIPTOR          =   $(HORIZON_ROOT)/resources/specfiles/_private/RepairTool.
 
 include $(ROOT_OMAKE)/modulerules
 
-VERSION_H          = $(file version.h)
+VERSION_H          = $(file ../../generated/$(TARGET_PROGRAM)/version.h)
 
 $(VERSION_H): $(SOURCES)
     section
diff --git a/trunk/ConsoleDataMigration/sources/ConsoleBackup/genversion.sh b/trunk/ConsoleDataMigration/sources/ConsoleBackup/genversion.sh
index 8fa6ee8..0294617 100755
--- a/trunk/ConsoleDataMigration/sources/ConsoleBackup/genversion.sh
+++ b/trunk/ConsoleDataMigration/sources/ConsoleBackup/genversion.sh
@@ -1,4 +1,4 @@
 #!/bin/bash -f
 
-cd ../
+cd ../../generated/
 echo "#define BACKUP_VERSION_NUM \"`svn info|grep 'Last Changed Rev:'| awk -F ':' '{print $2}'|tr -d '\n'| sed 's/ //g'`\"" > ./ConsoleBackup/version.h
diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/ConsoleRestore.cpp b/trunk/ConsoleDataMigration/sources/ConsoleRestore/ConsoleRestore.cpp
index ef666a7..cc0c90b 100644
--- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/ConsoleRestore.cpp
+++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/ConsoleRestore.cpp
@@ -50,7 +50,7 @@
 #include "ResFont.h"
 
 // svnリビジョン埋め込み用
-#include "version.h"
+#include "../../generated/ConsoleRestore/version.h"
 #ifndef RESTORE_VERSION_NUM
 #define RESOTRE_VERSION_NUM 0
 #endif
diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/OMakefile b/trunk/ConsoleDataMigration/sources/ConsoleRestore/OMakefile
index 404f8d7..fcaafe4 100644
--- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/OMakefile
+++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/OMakefile
@@ -87,11 +87,11 @@ DESCRIPTOR          =   $(HORIZON_ROOT)/resources/specfiles/_private/RepairTool.
 
 include $(ROOT_OMAKE)/modulerules
 
-VERSION_H          = $(file version.h)
+VERSION_H          = $(file ../../generated/$(TARGET_PROGRAM)/version.h)
 
 $(VERSION_H): $(SOURCES)
     section
         bash genversion.sh
 
 RequireSetup($(VERSION_H))
-build: version.h $(DEFAULT_TARGETS)
+build: $(VERSION_H) $(DEFAULT_TARGETS)
diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/genversion.sh b/trunk/ConsoleDataMigration/sources/ConsoleRestore/genversion.sh
index 99daed5..136a54a 100755
--- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/genversion.sh
+++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/genversion.sh
@@ -1,4 +1,4 @@
 #!/bin/bash -f
 
-cd ../
+cd ../../generated/
 echo "#define RESTORE_VERSION_NUM \"`svn info|grep 'Last Changed Rev:'| awk -F ':' '{print $2}'|tr -d '\n'| sed 's/ //g'`\"" > ./ConsoleRestore/version.h