Merge branch 'master' of https://github.com/86Box/86Box
This commit is contained in:
1
.github/workflows/cmake.yml
vendored
1
.github/workflows/cmake.yml
vendored
@@ -161,6 +161,7 @@ jobs:
|
||||
-D NEW_DYNAREC=${{ matrix.build.new-dynarec }}
|
||||
-D VNC=OFF
|
||||
-D CMAKE_BUILD_TYPE=${{ matrix.build.type }}
|
||||
-D CMAKE_C_COMPILER=gcc-11 -D CMAKE_CXX_COMPILER=g++-11
|
||||
- name: Build
|
||||
run: cmake --build build --target install
|
||||
|
||||
|
@@ -83,8 +83,10 @@ find_package(SDL2 REQUIRED)
|
||||
include_directories(${SDL2_INCLUDE_DIRS})
|
||||
if(MINGW)
|
||||
target_link_libraries(86Box SDL2::SDL2-static)
|
||||
else()
|
||||
elseif(WIN32)
|
||||
target_link_libraries(86Box SDL2::SDL2)
|
||||
else()
|
||||
target_link_libraries(86Box ${SDL2_LIBRARIES})
|
||||
endif()
|
||||
|
||||
find_package(PNG REQUIRED)
|
||||
|
Reference in New Issue
Block a user