MickSlash
/
goldberg_emulator
mirror of https://gitlab.com/Mr_Goldberg/goldberg_emulator.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Added glew and pointing to the right directory for imgui

merge-requests/28/head
Nemirtingas 2019-08-15 12:54:18 +02:00
parent 71afa0daf6
commit 631bcd96ce
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitlab-ci.yml
View File

@ -116,7 +116,7 @@ build_cmake_windows:
- dnf update -y - dnf update -y
- dnf install 'dnf-command(config-manager)' -y - dnf install 'dnf-command(config-manager)' -y
- dnf config-manager --add-repo https://dl.winehq.org/wine-builds/fedora/30/winehq.repo - dnf config-manager --add-repo https://dl.winehq.org/wine-builds/fedora/30/winehq.repo
- dnf install wget p7zip winehq-devel samba-winbind-clients -y - dnf install wget unzip p7zip winehq-devel samba-winbind-clients -y
- wget 'https://gitlab.com/Mr_Goldberg/goldberg_emulator/uploads/48db8f434a193aae872279dc4f5dde6a/sdk_standalone.7z' - wget 'https://gitlab.com/Mr_Goldberg/goldberg_emulator/uploads/48db8f434a193aae872279dc4f5dde6a/sdk_standalone.7z'
- 7za x sdk_standalone.7z -osdk_standalone - 7za x sdk_standalone.7z -osdk_standalone
- wget 'https://github.com/Kitware/CMake/releases/download/v3.15.0-rc1/cmake-3.15.0-rc1-win64-x64.zip' - wget 'https://github.com/Kitware/CMake/releases/download/v3.15.0-rc1/cmake-3.15.0-rc1-win64-x64.zip'
@ -129,6 +129,7 @@ build_cmake_windows:
- wine cmd /c - wine cmd /c
- mkdir cmake-builds && cd cmake-builds - mkdir cmake-builds && cd cmake-builds
- mkdir x64-release && cd x64-release - mkdir x64-release && cd x64-release
- ../download_glew.sh
- echo call .\\..\\..\\sdk_standalone\\set_vars64.bat >> cmake-build.bat - echo call .\\..\\..\\sdk_standalone\\set_vars64.bat >> cmake-build.bat
- echo .\\..\\..\\cmake-3.15.0-rc1-win64-x64\\bin\\cmake.exe ..\\.. -G \"NMake Makefiles\" -DCMAKE_BUILD_TYPE:STRING="RelWithDebInfo" -DNO_OVERLAY=ON -DCMAKE_PREFIX_PATH="protobuf_x64-windows-static" -DProtobuf_PROTOC_EXECUTABLE:STRING="./../../protobuf_x64-windows-static/tools/protobuf/protoc.exe" >> cmake-build.bat - echo .\\..\\..\\cmake-3.15.0-rc1-win64-x64\\bin\\cmake.exe ..\\.. -G \"NMake Makefiles\" -DCMAKE_BUILD_TYPE:STRING="RelWithDebInfo" -DNO_OVERLAY=ON -DCMAKE_PREFIX_PATH="protobuf_x64-windows-static" -DProtobuf_PROTOC_EXECUTABLE:STRING="./../../protobuf_x64-windows-static/tools/protobuf/protoc.exe" >> cmake-build.bat
- echo nmake.exe >> cmake-build.bat - echo nmake.exe >> cmake-build.bat

6
CMakeLists.txt
View File

@ -50,12 +50,14 @@ 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)
@ -102,7 +104,8 @@ target_include_directories(${LIB_STEAM_API}
PRIVATE PRIVATE
${PROTOBUF_INCLUDE_DIRS} ${PROTOBUF_INCLUDE_DIRS}
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_BINARY_DIR}/ImGui ${CMAKE_CURRENT_SOURCE_DIR}/ImGui
${CMAKE_CURRENT_SOURCE_DIR}/glew/include
) )
# Link the required libraries # Link the required libraries
@ -111,6 +114,7 @@ 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}>,$<NOT:$<BOOL:${NO_OVERLAY}>>>:glew32s.lib>
) )
# Add target compile definitions # Add target compile definitions