فهرست منبع

More CMake cleanups, adding Rakefile

Josh Engebretson 11 سال پیش
والد
کامیت
36322ba69c
3فایلهای تغییر یافته به همراه45 افزوده شده و 2 حذف شده
  1. 2 0
      CMake/Modules/AtomicApple.cmake
  2. 5 2
      CMake/Modules/AtomicWindows.cmake
  3. 38 0
      Rakefile

+ 2 - 0
CMake/Modules/AtomicApple.cmake

@@ -2,6 +2,8 @@
 
 include (BundleUtilities)
 
+add_definitions(-DATOMIC_PLATFORM_OSX)
+
 add_definitions(-DATOMIC_OPENGL)
 list (APPEND ATOMIC_LINK_LIBRARIES GLEW)
 set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-invalid-offsetof -std=gnu++0x")

+ 5 - 2
CMake/Modules/AtomicWindows.cmake

@@ -1,6 +1,11 @@
 
 set (CMAKE_DEBUG_POSTFIX _d)
 
+add_definitions(-DATOMIC_PLATFORM_WINDOWS -D_CRT_SECURE_NO_WARNINGS)
+
+list (APPEND ATOMIC_LINK_LIBRARIES MojoShader user32 gdi32 winmm imm32 ole32 oleaut32 version uuid d3d9 d3dcompiler)
+
+# compile with static runtime
 set(CompilerFlags
     CMAKE_CXX_FLAGS
     CMAKE_CXX_FLAGS_DEBUG
@@ -14,7 +19,6 @@ foreach(CompilerFlag ${CompilerFlags})
     string(REPLACE "/MD" "/MT" ${CompilerFlag} "${${CompilerFlag}}")
 endforeach()
 
-add_definitions (-D_CRT_SECURE_NO_WARNINGS)
 set (CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELEASE} /fp:fast /Zi /GS-")
 set (CMAKE_C_FLAGS_RELEASE ${CMAKE_C_FLAGS_RELWITHDEBINFO})
 set (CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELEASE} /fp:fast /Zi /GS- /D _SECURE_SCL=0")
@@ -27,4 +31,3 @@ endif ()
 set (CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /OPT:REF /OPT:ICF /DEBUG")
 set (CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /OPT:REF /OPT:ICF")
 
-list (APPEND ATOMIC_LINK_LIBRARIES MojoShader user32 gdi32 winmm imm32 ole32 oleaut32 version uuid d3d9 d3dcompiler)

+ 38 - 0
Rakefile

@@ -0,0 +1,38 @@
+
+require 'rbconfig'
+
+def get_os
+@os ||= (
+  host_os = RbConfig::CONFIG['host_os']
+  case host_os
+  when /mswin|msys|mingw|cygwin|bccwin|wince|emc/
+    :windows
+  when /darwin|mac os/
+    :macosx
+  when /linux/
+    :linux
+  when /solaris|bsd/
+    :unix
+  else
+    raise Error::WebDriverError, "unknown os: #{host_os.inspect}"
+  end
+)
+end
+
+puts get_os
+
+namespace :build do
+
+	task :cmake do
+
+	end
+
+	task :jsbind do
+
+	end
+
+	task :player do
+
+	end
+
+end