now compatible with core moaisdk cmake build system (no moaicli requi…

…red)
halfnelson · Feb 13, 2014 · 743e0b1 · 743e0b1
1 parent aac37fc
commit 743e0b1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 17 deletions.
diff --git a/build_host.rb b/build_host.rb
@@ -19,9 +19,9 @@ def build
 
   def cmake_output
     if build_config.host.type == 'windows'
-      File.join(File.join(build_config.build_dir,'bin','sledge.exe'))
+      File.join(File.join(build_config.build_dir,'bin','host-custom','sledge.exe'))
     else
-      File.join(File.join(build_config.build_dir,'bin','sledge'))
+      File.join(File.join(build_config.build_dir,'bin','host-custom','sledge'))
     end
   end
 

diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
@@ -1,20 +1,8 @@
 cmake_minimum_required ( VERSION 2.8.8 )
 project ( sledge )
 
-
-set ( BUILD_HOST false )
-
-add_subdirectory( ${LIBMOAI_DIR} ${CMAKE_CURRENT_BINARY_DIR}/libmoaistatic )
-
 set (HOST_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/..")
 
-if (BUILD_WINDOWS)
-  if (NOT MSVC)
-    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32")
-    set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m32")
-  endif (NOT MSVC)
-endif (BUILD_WINDOWS)
-
 set (HUSKY_SRC
     ${HOST_ROOT}/Husky/shared/HuskyLoader.cpp
   )
@@ -63,9 +51,9 @@ if (BUILD_WINDOWS)
 endif (BUILD_WINDOWS)
 
 set (SLEDGE_INCLUDES
-	"${SDK_ROOT}/src"
-	"${SDK_ROOT}/src/moai-config"
-  "${SDK_ROOT}/3rdparty/sdl2-2.0.0/include"
+	"${MOAI_ROOT}/src"
+	"${MOAI_ROOT}/src/moai-config"
+  "${MOAI_ROOT}/3rdparty/sdl2-2.0.0/include"
   "${HOST_ROOT}/"
 )