Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main'
Browse files Browse the repository at this point in the history
  • Loading branch information
irrld committed Oct 12, 2023
2 parents 297898a + 871ff0e commit a918d48
Show file tree
Hide file tree
Showing 3 changed files with 61 additions and 7 deletions.
39 changes: 39 additions & 0 deletions .github/workflows/build-windows.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
# This starter workflow is for a CMake project running on a single platform. There is a different starter workflow if you need cross-platform coverage.
# See: https://github.com/actions/starter-workflows/blob/main/ci/cmake-multi-platform.yml
name: Build Windows

on:
push:
branches: [ "main" ]
pull_request:
branches: [ "main" ]

env:
# Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
BUILD_TYPE: Release

jobs:
build:
# The CMake configure and build commands are platform agnostic and should work equally well on Windows or Mac.
# You can convert this to a matrix build if you need cross-platform coverage.
# See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
runs-on: windows-latest

steps:
- uses: actions/checkout@v3

- name: Configure CMake
# Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
# See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}

- name: Build
# Build your program with the given configuration
run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}

- name: Test
working-directory: ${{github.workspace}}/build
# Execute tests defined by the CMake configuration.
# See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
run: ctest -C ${{env.BUILD_TYPE}}

13 changes: 10 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -103,9 +103,16 @@ set(GlistApp_SOURCES
${APP_DIR}/src/net/chess_connection.cpp
)

add_executable(${APP_NAME}
${GlistApp_SOURCES}
)

if(WIN32 AND DEBUG)
add_executable(${APP_NAME} WIN32
${GlistApp_SOURCES}
)
else()
add_executable(${APP_NAME}
${GlistApp_SOURCES}
)
endif(WIN32 AND DEBUG)

set_target_properties(
${APP_NAME}
Expand Down
16 changes: 12 additions & 4 deletions src/app/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,17 @@
#include "app.h"
#include "gAppManager.h"

int main(int argc, char **argv) {

gStartEngine(new gApp(argc, argv), "Chess Tacos", G_WINDOWMODE_APP, 1280, 720);
#ifdef WIN32
#include <windows.h>

return 0;
int WINAPI WinMain(HINSTANCE hThisInstance, HINSTANCE hPrevInstance, LPSTR lpszArgument, int nFunsterStil) {
gStartEngine(new gApp(), "Chess Tacos (Windows)", G_WINDOWMODE_APP, 1280, 720);
return 0;
}
#else
int main(int argc, char **argv) {
gStartEngine(new gApp(argc, argv), "Chess Tacos", G_WINDOWMODE_APP, 1280, 720);
return 0;
}
#endif

0 comments on commit a918d48

Please sign in to comment.