From e93ecacc46e290954f0dab9a4ffe306d4c10e606 Mon Sep 17 00:00:00 2001 From: realweezerfan93 <22036195+rwf93@users.noreply.github.com> Date: Thu, 22 Jun 2023 12:48:25 -0700 Subject: [PATCH] fix cmake (and better instructions) --- README.md | 5 +++-- source/CMakeLists.txt | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index ac5691d..fded48c 100644 --- a/README.md +++ b/README.md @@ -9,6 +9,7 @@ This might contain modifications to the source code that make it not interoperab Install [Visual Studio 2023](https://c2rsetup.officeapps.live.com/c2r/downloadVS.aspx?sku=community&channel=Release&version=VS2022&source=VSLandingPage&add=Microsoft.VisualStudio.Workload.ManagedDesktop&add=Microsoft.VisualStudio.Workload.Azure&add=Microsoft.VisualStudio.Workload.NetWeb&includeRecommended=true&cid=2030) Install [CMake](https://github.com/Kitware/CMake/releases/download/v3.27.0-rc2/cmake-3.27.0-rc2-windows-x86_64.msi) Optionally, Install [QT 5.6.0](https://download.qt.io/new_archive/qt/5.6/5.6.0/qt-opensource-windows-x86-msvc2015_64-5.6.0.exe) +Optionally, Install [Ninja](https://github.com/ninja-build/ninja/releases) if using Visual Studio Code (pip can be used to install it as well) ### Visual Studio @@ -17,8 +18,8 @@ A solution should be generated in the ``build`` folder Open it and click Build (shortcut: CTRL+B) ### Visual Studio Code -Open a vcvarsall window (x64 Native Tools Command Prompt for VS 2022) +Open a vcvars64 window (x64 Native Tools Command Prompt for VS 2022) Run ``scripts\windows\setup64-ninja.bat`` -A ninja project should be generated in the ``build`` folder +A ninja project should be generated in the ``build`` folder Simply run ``ninja`` \ No newline at end of file diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index 6f4b73d..8147253 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -1,6 +1,7 @@ +cmake_minimum_required(VERSION 3.25.1) + project(starbound) -cmake_minimum_required(VERSION 3.25.1) set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/../cmake) set(CMAKE_CONFIGURATION_TYPES Debug RelWithAsserts RelWithDebInfo Release)