diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index aea5f181..9b7de8cc 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -4,6 +4,7 @@ on: [push] env: VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite" + CMAKE_BUILD_TYPE: "Release" jobs: debian-11-build: @@ -147,4 +148,4 @@ jobs: - name: Test run: | chmod +x ./BeamMP-Server-tests - ./BeamMP-Server-tests \ No newline at end of file + ./BeamMP-Server-tests diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3b607a50..1105fd5a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -7,6 +7,7 @@ on: env: VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite" + CMAKE_BUILD_TYPE: "Release" jobs: create-release: @@ -27,7 +28,7 @@ jobs: prerelease: true body: | Files included in this release: - - `BeamMP-Server.exe` is the windows build. + - `BeamMP-Server.exe` is the windows build. You need to install the [Visual C++ Redistributables](https://aka.ms/vs/17/release/vc_redist.x64.exe) to run this. - `BeamMP-Server-debian` is a Debian 11 build, requires `liblua5.3-0`. - `BeamMP-Server-ubuntu` is a Ubuntu 22.04 build, requires `liblua5.3-0`. @@ -163,6 +164,6 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: upload_url: ${{ needs.create-release.outputs.upload_url }} - asset_path: ./bin/BeamMP-Server.exe + asset_path: ./bin/Release/BeamMP-Server.exe asset_name: BeamMP-Server.exe - asset_content_type: application/vnd.microsoft.portable-executable \ No newline at end of file + asset_content_type: application/vnd.microsoft.portable-executable diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index c7e64505..f33ed92b 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -5,6 +5,7 @@ on: [push] env: VCPKG_DEFAULT_TRIPLET: x64-windows-static VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite" + CMAKE_BUILD_TYPE: "Release" jobs: windows-build: @@ -38,5 +39,5 @@ jobs: uses: actions/upload-artifact@v2 with: name: BeamMP-Server-windows - path: ./bin/BeamMP-Server.exe + path: ./bin/Release/BeamMP-Server.exe diff --git a/CMakeLists.txt b/CMakeLists.txt index 00f22364..a87bb373 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -126,9 +126,10 @@ include(FindThreads) # enables compile_commands.json for clang-related tools (such as the clang LS) set(CMAKE_EXPORT_COMPILE_COMMANDS ON) -# build debug builds by default (if not specified otherwise) -if(NOT CMAKE_BUILD_TYPE) - set(CMAKE_BUILD_TYPE "Debug") +# build release builds by default (if not specified otherwise) +if(NOT DEFINED CMAKE_BUILD_TYPE) + message(NOTICE "No build type specified, defaulting to 'Release'") + set(CMAKE_BUILD_TYPE "Release") endif() if(UNIX) diff --git a/include/Common.h b/include/Common.h index 6df16157..47b08120 100644 --- a/include/Common.h +++ b/include/Common.h @@ -135,7 +135,7 @@ class Application final { static inline std::mutex mShutdownHandlersMutex {}; static inline std::deque mShutdownHandlers {}; - static inline Version mVersion { 3, 1, 2 }; + static inline Version mVersion { 3, 1, 3 }; }; std::string ThreadName(bool DebugModeOverride = false); diff --git a/scripts/windows/2-build.sh b/scripts/windows/2-build.sh index 28fee9bb..95124100 100755 --- a/scripts/windows/2-build.sh +++ b/scripts/windows/2-build.sh @@ -2,4 +2,4 @@ set -ex -cmake --build bin --parallel -t BeamMP-Server +cmake --build bin --parallel -t BeamMP-Server --config Release