소스 검색

Merge branch 'master' of https://github.com/BearishSun/BansheeEngine.git

BearishSun 9 년 전
부모
커밋
5cdf8ebfe3
1개의 변경된 파일3개의 추가작업 그리고 2개의 파일을 삭제
  1. 3 2
      Source/CMakeLists.txt

+ 3 - 2
Source/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.5.1)
+cmake_minimum_required (VERSION 3.6.1)
 project (Banshee)
 
 # Version
@@ -253,6 +253,7 @@ if(MSVC)
 		include_external_msproject(MBansheeEditor ${PROJECT_SOURCE_DIR}/MBansheeEditor/MBansheeEditor.csproj)
 		add_dependencies(BansheeEditorExec MBansheeEngine MBansheeEditor)
 		set_property(TARGET MBansheeEditor PROPERTY FOLDER Script)
+		set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT BansheeEditorExec)
 	endif()
 else()
 # TODO - Use Mono compiler to build the managed code as a pre-build step
@@ -279,4 +280,4 @@ set(INPUT_MODULE_LIB BansheeOISInput)
 set(PHYSICS_MODULE_LIB BansheePhysX)
 
 ## Generate config file
-configure_file("${PROJECT_SOURCE_DIR}/CMake/BsEngineConfig.h.in" "${PROJECT_SOURCE_DIR}/BansheeEngine/Include/BsEngineConfig.h")
+configure_file("${PROJECT_SOURCE_DIR}/CMake/BsEngineConfig.h.in" "${PROJECT_SOURCE_DIR}/BansheeEngine/Include/BsEngineConfig.h")