From 631bcd96ceb817bcb52ee6455600fa256491d325 Mon Sep 17 00:00:00 2001 From: Nemirtingas Date: Thu, 15 Aug 2019 12:54:18 +0200 Subject: [PATCH] Added glew and pointing to the right directory for imgui --- .gitlab-ci.yml | 3 ++- CMakeLists.txt | 6 +++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e118f23..f0b76e0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -116,7 +116,7 @@ build_cmake_windows: - dnf update -y - dnf install 'dnf-command(config-manager)' -y - 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' - 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' @@ -129,6 +129,7 @@ build_cmake_windows: - wine cmd /c - mkdir cmake-builds && cd cmake-builds - mkdir x64-release && cd x64-release + - ../download_glew.sh - 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 nmake.exe >> cmake-build.bat diff --git a/CMakeLists.txt b/CMakeLists.txt index 66a6ab1..a0b19c5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -50,12 +50,14 @@ if(WIN32) set(LIB_STEAMNETWORKINGSOCKETS steamnetworkingsockets64) set(BIN_LOBBY_CONNECT lobby_connect64) set(BIN_GENERATE_INTERFACES_FILE generate_interfaces_file64) + link_directories(glew/lib/Release/x64) else() set(LIB_STEAM_API steam_api) set(LIB_STEAMCLIENT steamclient) set(LIB_STEAMNETWORKINGSOCKETS steamnetworkingsockets) set(BIN_LOBBY_CONNECT lobby_connect) set(BIN_GENERATE_INTERFACES_FILE generate_interfaces_file) + link_directories(glew/lib/Release/Win32) endif() elseif(UNIX AND NOT APPLE) set(LIB_STEAM_API steam_api) @@ -102,7 +104,8 @@ target_include_directories(${LIB_STEAM_API} PRIVATE ${PROTOBUF_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_CURRENT_BINARY_DIR}/ImGui + ${CMAKE_CURRENT_SOURCE_DIR}/ImGui + ${CMAKE_CURRENT_SOURCE_DIR}/glew/include ) # Link the required libraries @@ -111,6 +114,7 @@ target_link_libraries(${LIB_STEAM_API} protobuf::libprotobuf $<$:ws2_32> $<$:iphlpapi> + $<$,$,$>>:glew32s.lib> ) # Add target compile definitions