claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Conflict resolution.

Browse Source
This commit is contained in:
OBattler
2021-09-17 02:48:18 +02:00
parent b0367133d6 c35b7e21ba
commit 2bc9e7520a
13 changed files with 150 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/win/CMakeLists.txt
View File

@@ -58,5 +58,9 @@ if(OPENGL)
target_sources(ui PRIVATE glad.c win_opengl.c win_opengl_glslp.c)
endif()
if(NOT PTHREAD)
target_sources(plat PRIVATE win_thread.c)
endif()
target_link_libraries(86Box advapi32 comctl32 comdlg32 gdi32 shell32 iphlpapi
dxguid imm32 hid setupapi uxtheme version winmm psapi)