Index: branches/x64_compiler_on_32/abdev/BasicCompiler_Common/src/CommonCodeGenerator.cpp
===================================================================
--- branches/x64_compiler_on_32/abdev/BasicCompiler_Common/src/CommonCodeGenerator.cpp	(revision 758)
+++ branches/x64_compiler_on_32/abdev/BasicCompiler_Common/src/CommonCodeGenerator.cpp	(revision 759)
@@ -3,5 +3,5 @@
 #include <CodeGenerator.h>
 
-#ifdef _AMD64_
+#if defined _AMD64_ || defined BUILD_X64_COMPILER
 #include "../../compiler_x64/opcode.h"
 #else
@@ -329,5 +329,5 @@
 void CodeGenerator::op_AddNeedFreeTempStructure( int reg )
 {
-#ifdef _AMD64_
+#if defined _AMD64_ || defined BUILD_X64_COMPILER
 	//////////////////////////////////////////////////////
 	/////    レジスタ資源のバックアップ
Index: branches/x64_compiler_on_32/abdev/BasicCompiler_Common/src/Exception.cpp
===================================================================
--- branches/x64_compiler_on_32/abdev/BasicCompiler_Common/src/Exception.cpp	(revision 758)
+++ branches/x64_compiler_on_32/abdev/BasicCompiler_Common/src/Exception.cpp	(revision 759)
@@ -1,5 +1,5 @@
 #include "stdafx.h"
 
-#ifdef _AMD64_
+#if defined _AMD64_ || defined BUILD_X64_COMPILER
 #include "../../compiler_x64/opcode.h"
 #else
@@ -395,5 +395,5 @@
 	}
 
-#ifdef _WIN64
+#if defined _WIN64 || defined BUILD_X64_COMPILER
 	//mov rax,catchAddress
 	const PertialSchedule *pPertialSchedule = compiler.codeGenerator.op_mov_RV( sizeof(long), REG_RAX, 0, Schedule::DataTable, true );
@@ -408,5 +408,5 @@
 	int dataTableOffset = compiler.GetObjectModule().dataTable.Add( static_cast<LONG_PTR>(0) );
 
-#ifdef _WIN64
+#if defined _WIN64 || defined BUILD_X64_COMPILER
 	//mov rax,dataTableOffset
 	compiler.codeGenerator.op_mov_RV( sizeof(_int64), REG_RAX, dataTableOffset, Schedule::DataTable);
@@ -426,5 +426,5 @@
 	}
 
-#ifdef _WIN64
+#if defined _WIN64 || defined BUILD_X64_COMPILER
 	//mov rax,finallyAddress
 	const PertialSchedule *pPertialSchedule = compiler.codeGenerator.op_mov_RV( sizeof(long), REG_RAX, 0, Schedule::CatchAddress, true );
@@ -439,5 +439,5 @@
 	int dataTableOffset = compiler.GetObjectModule().dataTable.Add( static_cast<LONG_PTR>(0) );
 
-#ifdef _WIN64
+#if defined _WIN64 || defined BUILD_X64_COMPILER
 	//mov rax,dataTableOffset
 	compiler.codeGenerator.op_mov_RV( sizeof(_int64), REG_RAX, dataTableOffset, Schedule::DataTable);
Index: branches/x64_compiler_on_32/abdev/BasicCompiler_Common/src/LexicalAnalyzer_Class.cpp
===================================================================
--- branches/x64_compiler_on_32/abdev/BasicCompiler_Common/src/LexicalAnalyzer_Class.cpp	(revision 758)
+++ branches/x64_compiler_on_32/abdev/BasicCompiler_Common/src/LexicalAnalyzer_Class.cpp	(revision 759)
@@ -2,5 +2,5 @@
 
 #include "../common.h"
-#ifdef _AMD64_
+#if defined _AMD64_ || defined BUILD_X64_COMPILER
 #include "../../compiler_x64/opcode.h"
 #else
Index: branches/x64_compiler_on_32/abdev/BasicCompiler_Common/src/LexicalScope.cpp
===================================================================
--- branches/x64_compiler_on_32/abdev/BasicCompiler_Common/src/LexicalScope.cpp	(revision 758)
+++ branches/x64_compiler_on_32/abdev/BasicCompiler_Common/src/LexicalScope.cpp	(revision 759)
@@ -6,5 +6,5 @@
 #include "../common.h"
 
-#ifdef _AMD64_
+#if defined _AMD64_ || defined BUILD_X64_COMPILER
 #include "../../compiler_x64/opcode.h"
 #else
@@ -125,5 +125,5 @@
 			//メモリを解放する
 
-#ifdef _AMD64_
+#if defined _AMD64_ || defined BUILD_X64_COMPILER
 			//x64ビットコード
 
Index: branches/x64_compiler_on_32/abdev/BasicCompiler_Common/src/Linker.cpp
===================================================================
--- branches/x64_compiler_on_32/abdev/BasicCompiler_Common/src/Linker.cpp	(revision 758)
+++ branches/x64_compiler_on_32/abdev/BasicCompiler_Common/src/Linker.cpp	(revision 759)
@@ -22,5 +22,5 @@
 		if( schedule.GetType() == Schedule::DataTable )
 		{
-#ifdef _WIN64
+#if defined _WIN64 || defined BUILD_X64_COMPILER
 			dataTable.OverwriteInt64(
 				schedule.GetOffset(),
@@ -62,5 +62,5 @@
 			{
 				// 置き換える値が0の場合を除く
-#ifdef _WIN64
+#if defined _WIN64 || defined BUILD_X64_COMPILER
 				dataTable.OverwriteInt64(
 					schedule.GetOffset(),
@@ -85,5 +85,5 @@
 		if( schedule.GetType() == Schedule::DllProc )
 		{
-#ifdef _AMD64_
+#if defined _AMD64_ || defined BUILD_X64_COMPILER
 			nativeCode.Overwrite(
 				schedule.GetOffset(),
@@ -192,5 +192,5 @@
 			LONG_PTR vtblOffset = schedule.GetClass().GetComVtblOffset();
 
-#ifdef _WIN64
+#if defined _WIN64 || defined BUILD_X64_COMPILER
 			dataTable.OverwriteInt64(
 				schedule.GetOffset(),
@@ -209,5 +209,5 @@
 			LONG_PTR vtblMasterListOffset = schedule.GetClass().GetVtblMasterListOffset();
 
-#ifdef _WIN64
+#if defined _WIN64 || defined BUILD_X64_COMPILER
 			dataTable.OverwriteInt64(
 				schedule.GetOffset(),
@@ -232,5 +232,5 @@
 			LONG_PTR typeInfoDataTableOffset = schedule.GetClass().GetTypeInfoDataTableOffset();
 
-#ifdef _WIN64
+#if defined _WIN64 || defined BUILD_X64_COMPILER
 			dataTable.OverwriteInt64(
 				schedule.GetOffset(),
Index: branches/x64_compiler_on_32/abdev/BasicCompiler_Common/src/ProcedureGenerator.cpp
===================================================================
--- branches/x64_compiler_on_32/abdev/BasicCompiler_Common/src/ProcedureGenerator.cpp	(revision 758)
+++ branches/x64_compiler_on_32/abdev/BasicCompiler_Common/src/ProcedureGenerator.cpp	(revision 759)
@@ -1,5 +1,5 @@
 #include "stdafx.h"
 
-#ifdef _AMD64_
+#if defined _AMD64_ || defined BUILD_X64_COMPILER
 #include "../../compiler_x64/opcode.h"
 #else
