diff --git a/trunk/ConsoleDataMigration/sources/tests/googletest/OMakefile b/trunk/ConsoleDataMigration/sources/tests/googletest/OMakefile
new file mode 100644
index 0000000..d9640a6
--- /dev/null
+++ b/trunk/ConsoleDataMigration/sources/tests/googletest/OMakefile
@@ -0,0 +1 @@
+.SUBDIRS: RegionIdModifier
diff --git a/trunk/ConsoleDataMigration/sources/tests/googletest/OMakeroot b/trunk/ConsoleDataMigration/sources/tests/googletest/OMakeroot
new file mode 100644
index 0000000..405c049
--- /dev/null
+++ b/trunk/ConsoleDataMigration/sources/tests/googletest/OMakeroot
@@ -0,0 +1,48 @@
+########################################################################
+# Permission is hereby granted, free of charge, to any person
+# obtaining a copy of this file, to deal in the File without
+# restriction, including without limitation the rights to use,
+# copy, modify, merge, publish, distribute, sublicense, and/or
+# sell copies of the File, and to permit persons to whom the
+# File is furnished to do so, subject to the following condition:
+#
+# THE FILE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+# OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+# IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+# DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+# OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE FILE OR
+# THE USE OR OTHER DEALINGS IN THE FILE.
+
+########################################################################
+# The standard OMakeroot file.
+# You will not normally need to modify this file.
+# By default, your changes should be placed in the
+# OMakefile in this directory.
+#
+# If you decide to modify this file, note that it uses exactly
+# the same syntax as the OMakefile.
+#
+
+#
+# Include the standard installed configuration files.
+# Any of these can be deleted if you are not using them,
+# but you probably want to keep the Common file.
+#
+OSTYPE = Cygwin
+open build/C
+
+#
+# The command-line variables are defined *after* the
+# standard configuration has been loaded.
+#
+DefineCommandVars()
+
+# ビルド共通設定
+CXX = g++-4
+LDFLAGS += -L/usr/local/lib -lgtest -lgtest_main
+
+#
+# Include the OMakefile in this directory.
+#
+.SUBDIRS: .
diff --git a/trunk/ConsoleDataMigration/sources/tests/googletest/RegionIdModifier/Makefile b/trunk/ConsoleDataMigration/sources/tests/googletest/RegionIdModifier/Makefile
deleted file mode 100644
index 520c197..0000000
--- a/trunk/ConsoleDataMigration/sources/tests/googletest/RegionIdModifier/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-#�O�̃f�B���N�g���ɂ���̂Ō•ʂɋL�q
-EXTERNAL_SRC = ../../../ConsoleRestore/RegionIdModifier.cpp
-EXTERNAL_OBJ = $(notdir $(EXTERNAL_SRC:.cpp=.o))
-
-SRC = testRegionIdModifier.cpp testUtil.cpp
-OBJ = $(SRC:.cpp=.o) $(EXTERNAL_OBJ)
-INCLUDE_DIRECTORY = -I../../../ConsoleRestore -I./
-LIBS = -lgtest -lgtest_main
-#googletest�̃C���X�g�[����
-GTEST_LIB_DIRECTORY = -L/usr/local/lib
-GCC = g++
-TARGET = testRegionIdModifier
-
-$(TARGET).exe: $(OBJ)
-	$(GCC) -o $@ $(OBJ) $(INCLUDE_DIRECTORY) $(LIBS) $(GTEST_LIB_DIRECTORY)
-
-$(EXTERNAL_OBJ):
-	$(GCC) -c $(EXTERNAL_SRC) $(INCLUDE_DIRECTORY)
-
-.cpp.o:
-	$(GCC) -c $< $(INCLUDE_DIRECTORY)
-
-test: $(TARGET).exe
-	./$(TARGET).exe
-
-clean:
-	rm -rf *.exe *.o
\ No newline at end of file
diff --git a/trunk/ConsoleDataMigration/sources/tests/googletest/RegionIdModifier/OMakefile b/trunk/ConsoleDataMigration/sources/tests/googletest/RegionIdModifier/OMakefile
new file mode 100644
index 0000000..b3d37f8
--- /dev/null
+++ b/trunk/ConsoleDataMigration/sources/tests/googletest/RegionIdModifier/OMakefile
@@ -0,0 +1,25 @@
+INCLUDES[] +=
+              ./
+              ../../../ConsoleRestore
+
+TARGET = testRegionIdModifier
+
+SRC_FILES[] =
+               testRegionIdModifier
+               testUtil
+               RegionIdModifier
+
+# テストディレクトリ外にあるので独自ルールでビルド
+RegionIdModifier$(EXT_OBJ): ../../../ConsoleRestore/RegionIdModifier.cpp
+    $(CXX) $(PREFIXED_INCLUDES) -c $<
+
+.DEFAULT: RegionIdModifier$(EXT_OBJ) $(TARGET)$(EXE)
+
+CXXProgram(testRegionIdModifier, $(SRC_FILES))
+
+.PHONY: clean test
+clean:
+    rm -rf *$(EXT_OBJ) *$(EXE)
+
+test: $(TARGET)$(EXE)
+    $<