[WIP][Build][Agar] Prepare to build with Agar.

diff --git a/source/build-cmake/fm7/CMakeLists.txt b/source/build-cmake/fm7/CMakeLists.txt
index 445c308..bdf4f57 100644 (file)
--- a/source/build-cmake/fm7/CMakeLists.txt
+++ b/source/build-cmake/fm7/CMakeLists.txt
@@ -28,10 +28,10 @@ include(detect_target_cpu)
 # set entry
 set(CMAKE_SYSTEM_PROCESSOR ${ARCHITECTURE} CACHE STRING "Set processor to build.")
 
-include(config_commonsource)
-
 add_definitions(-D_FM7)
 
+include(config_commonsource)
+
 #include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../src/vm)
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../src/vm/fm7)

diff --git a/source/build-cmake/x1/CMakeLists.txt b/source/build-cmake/x1/CMakeLists.txt
new file mode 100644 (file)
index 0000000..e80d953
--- /dev/null
+++ b/source/build-cmake/x1/CMakeLists.txt
@@ -0,0 +1,52 @@
+# Build XM7/SDL, Agar.
+# (C) 2014 K.Ohta <whatisthis.sowhat@gmail.com>
+# This is part of XM7/SDL, but license is apache 2.2,
+# this part was written only me.
+
+cmake_minimum_required (VERSION 2.6)
+cmake_policy(SET CMP0011 NEW)
+
+message("")
+message("** Start of configure CommonSourceProject,X1, Agar **")
+message("")
+
+set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/../cmake")
+
+
+project (emux1)
+
+set(BUILD_SHARED_LIBS OFF)
+set(USE_OPENMP ON CACHE BOOL "Build using OpenMP")
+set(USE_OPENCL ON CACHE BOOL "Build using OpenCL")
+set(USE_OPENGL ON CACHE BOOL "Build using OpenGL")
+set(XM7_VERSION 3)
+#set(WITH_DEBUGGER ON CACHE BOOL "Build witn XM7 Debugger.")
+
+include(detect_target_cpu)
+#include(windows-mingw-cross)
+# set entry
+set(CMAKE_SYSTEM_PROCESSOR ${ARCHITECTURE} CACHE STRING "Set processor to build.")
+
+
+add_definitions(-D_X1)
+
+include(config_commonsource)
+
+
+#include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../src/vm)
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../src/vm/x1)
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../src/vm/fmgen)
+
+add_subdirectory(../../src/vm vm/)
+add_subdirectory(../../src/vm/x1 vm/x1)
+add_subdirectory(../../src/vm/fmgen vm/fmgen)
+
+if(USE_SSE2)
+#  include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../src/vm/fm7/vram/sse2)
+#  add_subdirectory(../../src/vm/fm7/vram/sse2 vm/fm7/vram/sse2)
+endif()
+
+if(USE_SSE2)
+# include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../src/agar/common/scaler/sse2)
+endif()

diff --git a/source/src/emu.h b/source/src/emu.h
index f4fbc99..5b726cf 100644 (file)
--- a/source/src/emu.h
+++ b/source/src/emu.h
@@ -27,7 +27,7 @@
 # include <SDL/SDL.h>\r
 # include <agar/core.h>\r
 # include <agar/gui.h>\r
-\r
+# include "simd_types.h"\r
 // Wrapper of WIN32->*nix\r
 \r
 \r

diff --git a/source/src/vm/x1/CMakeLists.txt b/source/src/vm/x1/CMakeLists.txt
index 5333dfb..e4aa748 100644 (file)
--- a/source/src/vm/x1/CMakeLists.txt
+++ b/source/src/vm/x1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required (VERSION 2.6)
 message("* vm/x1")
 
 add_library(vm_x1
-       wdisplay.cpp
+       display.cpp
        emm.cpp
        floppy.cpp
        io.cpp