mirror/goldberg_emulator
1
0
Fork 0
mirror of https://gitlab.com/Mr_Goldberg/goldberg_emulator.git synced 2024-11-23 12:28:07 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix cmake.

Browse source
This commit is contained in:
Mr_Goldberg 2020-01-19 14:29:55 -05:00
parent d829fd090f
commit f22828d858
No known key found for this signature in database
GPG key ID: 8597D87419DEF278
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
CMakeLists.txt
View file

@ -50,14 +50,12 @@ if(WIN32)
set(LIB_STEAMNETWORKINGSOCKETS steamnetworkingsockets64) set(LIB_STEAMNETWORKINGSOCKETS steamnetworkingsockets64)
set(BIN_LOBBY_CONNECT lobby_connect64) set(BIN_LOBBY_CONNECT lobby_connect64)
set(BIN_GENERATE_INTERFACES_FILE generate_interfaces_file64) set(BIN_GENERATE_INTERFACES_FILE generate_interfaces_file64)
link_directories(glew/lib/Release/x64)
else() else()
set(LIB_STEAM_API steam_api) set(LIB_STEAM_API steam_api)
set(LIB_STEAMCLIENT steamclient) set(LIB_STEAMCLIENT steamclient)
set(LIB_STEAMNETWORKINGSOCKETS steamnetworkingsockets) set(LIB_STEAMNETWORKINGSOCKETS steamnetworkingsockets)
set(BIN_LOBBY_CONNECT lobby_connect) set(BIN_LOBBY_CONNECT lobby_connect)
set(BIN_GENERATE_INTERFACES_FILE generate_interfaces_file) set(BIN_GENERATE_INTERFACES_FILE generate_interfaces_file)
link_directories(glew/lib/Release/Win32)
endif() endif()
elseif(UNIX AND NOT APPLE) elseif(UNIX AND NOT APPLE)
set(LIB_STEAM_API steam_api) set(LIB_STEAM_API steam_api)
@ -86,6 +84,7 @@ if(WIN32)
ImGui/*.cpp ImGui/*.cpp
ImGui/impls/*.cpp ImGui/impls/*.cpp
ImGui/impls/windows/*.cpp ImGui/impls/windows/*.cpp
glew/glew.c
) )
elseif(UNIX) elseif(UNIX)
file(GLOB OVERLAY_EXPERIMENTAL_SRC_SHARED file(GLOB OVERLAY_EXPERIMENTAL_SRC_SHARED
@ -94,6 +93,7 @@ elseif(UNIX)
ImGui/*.cpp ImGui/*.cpp
ImGui/impls/*.cpp ImGui/impls/*.cpp
ImGui/impls/linux/*.cpp ImGui/impls/linux/*.cpp
glew/glew.c
) )
endif() endif()
@ -126,7 +126,6 @@ target_link_libraries(${LIB_STEAM_API}
protobuf::libprotobuf protobuf::libprotobuf
$<$<BOOL:${WIN32}>:ws2_32> $<$<BOOL:${WIN32}>:ws2_32>
$<$<BOOL:${WIN32}>:iphlpapi> $<$<BOOL:${WIN32}>:iphlpapi>
$<$<AND:$<BOOL:${WIN32}>,$<BOOL:${EMU_EXPERIMENTAL_BUILD}>,$<BOOL:${EMU_OVERLAY}>>:glew32s.lib>
$<$<AND:$<BOOL:${WIN32}>,$<BOOL:${EMU_EXPERIMENTAL_BUILD}>,$<BOOL:${EMU_OVERLAY}>>:opengl32.lib> $<$<AND:$<BOOL:${WIN32}>,$<BOOL:${EMU_EXPERIMENTAL_BUILD}>,$<BOOL:${EMU_OVERLAY}>>:opengl32.lib>
$<$<AND:$<BOOL:${WIN32}>,$<BOOL:${EMU_EXPERIMENTAL_BUILD}>,$<BOOL:${EMU_OVERLAY}>>:Winmm.lib> $<$<AND:$<BOOL:${WIN32}>,$<BOOL:${EMU_EXPERIMENTAL_BUILD}>,$<BOOL:${EMU_OVERLAY}>>:Winmm.lib>
) )

2
build_win_find_interfaces.bat
View file

@ -1,4 +1,4 @@
@ecbo off @echo off
cd /d "%~dp0" cd /d "%~dp0"
mkdir release\tools mkdir release\tools
del /Q release\tools\* del /Q release\tools\*