Explorar el Código

Minor improvements to the build

BearishSun hace 9 años
padre
commit
714417d211
Se han modificado 2 ficheros con 12 adiciones y 4 borrados
  1. 3 3
      Documentation/GitHub/compiling.md
  2. 9 1
      Source/CMakeLists.txt

+ 3 - 3
Documentation/GitHub/compiling.md

@@ -43,7 +43,7 @@ For those that wish to customize their build, or compile using something other t
   3. Point CMake to the /Source sub-folder in Banshee's source code (Browse Source... button in GUI)
   3. Point CMake to the /Source sub-folder in Banshee's source code (Browse Source... button in GUI)
   4. Choose an output folder (Browse Build... button in GUI)
   4. Choose an output folder (Browse Build... button in GUI)
   5. Hit Configure and choose the toolset to generate the files for (e.g. Visual Studio 2015 64-bit)
   5. Hit Configure and choose the toolset to generate the files for (e.g. Visual Studio 2015 64-bit)
-  6. (Optionally) Customize your build by setting any of the properties that have appeared. You can choose whether to build the complete runtime or just the framework (BUILD_EDITOR property), as well as choose render API (Vulkan, DirectX, OpenGL), audio module (FMOD, OpenAudio) among other options.
+  6. (Optionally) Customize your build by setting any of the properties that have appeared. You can choose whether to build the complete runtime or just the framework, as well as choose render API (Vulkan, DirectX, OpenGL), audio module (FMOD, OpenAudio) among other options.
   7. Hit the Generate button
   7. Hit the Generate button
  4. Once CMake is done generating you can use the toolset you chose (e.g. Visual Studio) to open the generated files (e.g. open the .sln file provided in the Build folder in the case of Visual Studio)
  4. Once CMake is done generating you can use the toolset you chose (e.g. Visual Studio) to open the generated files (e.g. open the .sln file provided in the Build folder in the case of Visual Studio)
 
 
@@ -70,7 +70,7 @@ The following dependencies will need to be installed manually regardless if you
  - Go to Settings panel (type "Settings" in Start)->System->Apps & features->Manage optional Features->Add a feature->Select "Graphics Tools"
  - Go to Settings panel (type "Settings" in Start)->System->Apps & features->Manage optional Features->Add a feature->Select "Graphics Tools"
  
  
 **Vulkan SDK** (Optional if not using Vulkan) 
 **Vulkan SDK** (Optional if not using Vulkan) 
- - Only needed if you selected the Vulkan render API during build configuration (selected by default)
+ - Only needed if you selected the Vulkan render API during build configuration
  - https://lunarg.com/vulkan-sdk/
  - https://lunarg.com/vulkan-sdk/
  - If CMake complains it cannot find Vulkan, manually set the Vulkan_INSTALL_DIRS to your installation directory
  - If CMake complains it cannot find Vulkan, manually set the Vulkan_INSTALL_DIRS to your installation directory
  
  
@@ -79,7 +79,7 @@ The following dependencies will need to be installed manually regardless if you
  - https://www.python.org/downloads/
  - https://www.python.org/downloads/
 
 
 **FMOD Low Level Programmer API** (Optional)
 **FMOD Low Level Programmer API** (Optional)
- - Only needed if you selected the FMOD audio module during build configuration (not selected by default)
+ - Only needed if you selected the FMOD audio module during build configuration
  - http://www.fmod.org/download/
  - http://www.fmod.org/download/
  - If CMake complains it cannot find FMOD, manually set the FMOD_INSTALL_DIRS to your installation directory 
  - If CMake complains it cannot find FMOD, manually set the FMOD_INSTALL_DIRS to your installation directory 
  - Copy the dynamic libraries from {INSTALLDIR}/api/lowlevel/lib into /bin folder in Banshee source code folder
  - Copy the dynamic libraries from {INSTALLDIR}/api/lowlevel/lib into /bin folder in Banshee source code folder

+ 9 - 1
Source/CMakeLists.txt

@@ -43,9 +43,17 @@ endif()
 set(RENDERER_MODULE "RenderBeast" CACHE STRING "Renderer backend to use.")
 set(RENDERER_MODULE "RenderBeast" CACHE STRING "Renderer backend to use.")
 set_property(CACHE RENDERER_MODULE PROPERTY STRINGS RenderBeast)
 set_property(CACHE RENDERER_MODULE PROPERTY STRINGS RenderBeast)
 
 
-set(BUILD_EDITOR ON CACHE BOOL "If true both the engine and the editor will be built.")
+set(BUILD_SCOPE "Runtime" CACHE STRING "Determines which parts of Banshee to build. Pick Framework to build only the low-level C++ framework. Pick Runtime to build everything, including the framework, scripting API and the editor.")
+set_property(CACHE BUILD_SCOPE PROPERTY STRINGS "Runtime" "Framework")
+
 set(INCLUDE_ALL_IN_WORKFLOW OFF CACHE BOOL "If true, all libraries (even those not selected) will be included in the generated workflow. Only relevant for workflow generators like Visual Studio.")
 set(INCLUDE_ALL_IN_WORKFLOW OFF CACHE BOOL "If true, all libraries (even those not selected) will be included in the generated workflow. Only relevant for workflow generators like Visual Studio.")
 
 
+if(BUILD_SCOPE MATCHES "Runtime")
+	set(BUILD_EDITOR ON)
+else()
+	set(BUILD_EDITOR OFF)
+endif()
+
 mark_as_advanced(CMAKE_INSTALL_PREFIX)
 mark_as_advanced(CMAKE_INSTALL_PREFIX)
 
 
 # External code
 # External code