diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6ef8dd9..97e9478 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -59,7 +59,8 @@ build_windows: image: fedora script: - - dnf -y install wine wget p7zip sed dos2unix + - dnf -y install wine wget p7zip sed dos2unix unzip + - ./download_glew.sh - unix2dos *.txt - unix2dos files_example/*.txt files_example/*/*.txt - sed -i 's/C:\\Program Files (x86)\\Microsoft Visual Studio 14.0\\VC\\bin\\amd64\\vcvars64.bat/.\\sdk_standalone\\set_vars64.bat/g' build_env_x64.bat @@ -96,7 +97,7 @@ build_cmake_linux: script: - mkdir cmake-builds && cd cmake-builds - mkdir x64-release && cd x64-release - - cmake ../../ -G "Ninja" -DCMAKE_BUILD_TYPE:STRING="RelWithDebInfo" && ninja + - cmake ../../ -G "Ninja" -DCMAKE_BUILD_TYPE:STRING="RelWithDebInfo" -DNO_OVERLAY=ON && ninja - cd .. # - mkdir x64-experimental-release && cd x64-experimental-release # - cmake ../../ -G "Ninja" -DCMAKE_BUILD_TYPE:STRING="RelWithDebInfo" -DEMU_EXPERIMENTAL_BUILD:BOOL=ON && ninja @@ -129,7 +130,7 @@ build_cmake_windows: - mkdir cmake-builds && cd cmake-builds - mkdir x64-release && cd x64-release - 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" -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 - wine cmd /c cmake-build.bat - cd .. diff --git a/CMakeLists.txt b/CMakeLists.txt index aa2c057..eed3898 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -77,6 +77,12 @@ file(GLOB DETOURS_SRC_SHARED detours/*.cpp ) +file(GLOB OVERLAY_EXPERIMENTAL_SRC_SHARED + overlay_experimental/*.cpp + ImGui/*.cpp + ImGui/impls/*.cpp +) + ################################################### # Setup for the steam_api(64).dll / libsteam_api.so ################################################### @@ -85,6 +91,7 @@ file(GLOB DETOURS_SRC_SHARED add_library(${LIB_STEAM_API} SHARED $<$:${DETOURS_SRC_SHARED}> + $<$,$>>:${OVERLAY_EXPERIMENTAL_SRC_SHARED}> ${DLL_SRC_SHARED} ${PROTO_SRCS} ${PROTO_HDRS} @@ -113,6 +120,7 @@ target_compile_definitions(${LIB_STEAM_API} $<$:EMU_RELEASE_BUILD> $<$:EMU_RELEASE_BUILD> $<$:EMU_EXPERIMENTAL_BUILD> + $<$:NO_OVERLAY> ) # Install the target @@ -237,6 +245,7 @@ target_link_libraries(${BIN_LOBBY_CONNECT} target_compile_definitions(${BIN_LOBBY_CONNECT} PRIVATE NO_DISK_WRITES + NO_OVERLAY LOBBY_CONNECT $<$:EMU_RELEASE_BUILD> $<$:EMU_RELEASE_BUILD> diff --git a/build_win_release_experimental.bat b/build_win_release_experimental.bat index b02d4a1..3801a0c 100644 --- a/build_win_release_experimental.bat +++ b/build_win_release_experimental.bat @@ -9,6 +9,6 @@ cl /LD /DEMU_RELEASE_BUILD /DEMU_EXPERIMENTAL_BUILD /DNDEBUG steamclient.cpp /EH %PROTOBUF_X64_DIRECTORY%%PROTOC_DIRECTORY% -I.\dll\ --cpp_out=.\dll\ .\dll\net.proto call build_env_x64.bat cl dll/rtlgenrandom.c dll/rtlgenrandom.def -cl /LD /DEMU_RELEASE_BUILD /DEMU_EXPERIMENTAL_BUILD /DNDEBUG /IImGui /Iglew\include /I%PROTOBUF_X64_DIRECTORY%\include\ dll/*.cpp dll/*.cc detours/*.cpp ImGui/*.cpp ImGui/impls/*.cpp overlay_experimental/*.cpp %PROTOBUF_X64_DIRECTORY%%PROTOBUF_LIBRARY% /LIBPATH:"glew\lib\Release\x64\" Iphlpapi.lib Ws2_32.lib rtlgenrandom.lib Shell32.lib glew32s.lib/EHsc /MP12 /Ox /link /debug:none /OUT:release\experimental\steam_api64.dll +cl /LD /DEMU_RELEASE_BUILD /DEMU_EXPERIMENTAL_BUILD /DNDEBUG /IImGui /Iglew\include /I%PROTOBUF_X64_DIRECTORY%\include\ dll/*.cpp dll/*.cc detours/*.cpp ImGui/*.cpp ImGui/impls/*.cpp overlay_experimental/*.cpp %PROTOBUF_X64_DIRECTORY%%PROTOBUF_LIBRARY% /LIBPATH:"glew\lib\Release\x64\" Iphlpapi.lib Ws2_32.lib rtlgenrandom.lib Shell32.lib glew32s.lib /EHsc /MP12 /Ox /link /debug:none /OUT:release\experimental\steam_api64.dll cl /LD /DEMU_RELEASE_BUILD /DEMU_EXPERIMENTAL_BUILD /DNDEBUG steamclient.cpp /EHsc /MP12 /Ox /link /OUT:release\experimental\steamclient64.dll copy Readme_experimental.txt release\experimental\Readme.txt