diff --git a/.github/workflows/build-vcpkg.yml b/.github/workflows/build-vcpkg.yml index 076cdcb8..442c7e76 100644 --- a/.github/workflows/build-vcpkg.yml +++ b/.github/workflows/build-vcpkg.yml @@ -73,7 +73,7 @@ jobs: uses: lukka/get-cmake@latest - name: Ubuntu - install opengl lua5.1 luajit - # vcpkg has lua 5.2 + # vcpkg has lua 5.3+ run: sudo apt-get install libglew-dev liblua5.1-0-dev libluajit-5.1-dev if: contains( matrix.os, 'ubuntu') diff --git a/CMakeLists.txt b/CMakeLists.txt index 970b9785..2b3bb198 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -23,13 +23,24 @@ set(executable_SOURCES src/main.cpp ) -# add executable icon for win32 platforms if(WIN32) - add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/otcicon.o - COMMAND ${CMAKE_RC_COMPILER} - -I${CMAKE_CURRENT_SOURCE_DIR}/src - -fo${CMAKE_CURRENT_BINARY_DIR}/otcicon.o - ${CMAKE_CURRENT_SOURCE_DIR}/src/otcicon.rc) + if(MSVC) + add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/otcicon.o + COMMAND ${CMAKE_RC_COMPILER} + -I${CMAKE_CURRENT_SOURCE_DIR}/src + -fo${CMAKE_CURRENT_BINARY_DIR}/otcicon.o + ${CMAKE_CURRENT_SOURCE_DIR}/src/otcicon.rc + ) + add_definitions(-D_CRT_SECURE_NO_WARNINGS) + else() + add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/otcicon.o + COMMAND ${CMAKE_RC_COMPILER} + -I${CMAKE_CURRENT_SOURCE_DIR}/src + -i${CMAKE_CURRENT_SOURCE_DIR}/src/otcicon.rc + -o ${CMAKE_CURRENT_BINARY_DIR}/otcicon.o + ) + endif() + set(executable_SOURCES ${executable_SOURCES} otcicon.o) endif()