Merge branch 'master' into overlay_h

This commit is contained in:
Nemirtingas 2019-08-12 16:47:58 +02:00
commit f9ee123a05
2 changed files with 304 additions and 304 deletions

View file

@ -1,303 +1,303 @@
# Based on: https://github.com/ttroy50/cmake-examples/blob/master/03-code-generation/protobuf/CMakeLists.txt # Based on: https://github.com/ttroy50/cmake-examples/blob/master/03-code-generation/protobuf/CMakeLists.txt
cmake_minimum_required(VERSION 3.6) cmake_minimum_required(VERSION 3.6)
# Set the project name # Set the project name
project(goldberg_emulator) project(goldberg_emulator)
if(MSVC) if(MSVC)
# Set static environment (results in static compile flags) if Visual Studio is used (dynamic by default) # Set static environment (results in static compile flags) if Visual Studio is used (dynamic by default)
# Officially recommended solution: https://gitlab.kitware.com/cmake/community/wikis/FAQ#how-can-i-build-my-msvc-application-with-a-static-runtime # Officially recommended solution: https://gitlab.kitware.com/cmake/community/wikis/FAQ#how-can-i-build-my-msvc-application-with-a-static-runtime
# Should be replaced by a better solution in the future: https://gitlab.kitware.com/cmake/cmake/merge_requests/3211 # Should be replaced by a better solution in the future: https://gitlab.kitware.com/cmake/cmake/merge_requests/3211
foreach(flag_var foreach(flag_var
CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE
CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO) CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO)
if(${flag_var} MATCHES "/MD") if(${flag_var} MATCHES "/MD")
string(REGEX REPLACE "/MD" "/MT" ${flag_var} "${${flag_var}}") string(REGEX REPLACE "/MD" "/MT" ${flag_var} "${${flag_var}}")
endif(${flag_var} MATCHES "/MD") endif(${flag_var} MATCHES "/MD")
endforeach(flag_var) endforeach(flag_var)
# Disable MSVC++ warning C4996: 'may be unsafe/disable deprecation' # Disable MSVC++ warning C4996: 'may be unsafe/disable deprecation'
add_definitions(-D_CRT_SECURE_NO_WARNINGS) add_definitions(-D_CRT_SECURE_NO_WARNINGS)
endif() endif()
# Add option to enable experimental build # Add option to enable experimental build
option(EMU_EXPERIMENTAL_BUILD "Enable experimental build" OFF) option(EMU_EXPERIMENTAL_BUILD "Enable experimental build" OFF)
# Set CXX standard # Set CXX standard
set(CMAKE_CXX_STANDARD 11) set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS OFF) set(CMAKE_CXX_EXTENSIONS OFF)
# Find the protobuf compiler and libraries # Find the protobuf compiler and libraries
include(FindProtobuf) include(FindProtobuf)
find_package(Protobuf 3.1.0 REQUIRED) find_package(Protobuf 3.1.0 REQUIRED)
# Generate the .h and .cxx files for dll/net.proto # Generate the .h and .cxx files for dll/net.proto
protobuf_generate_cpp(PROTO_SRCS PROTO_HDRS dll/net.proto) protobuf_generate_cpp(PROTO_SRCS PROTO_HDRS dll/net.proto)
# Print path to generated files # Print path to generated files
message(STATUS "PROTO_SRCS = ${PROTO_SRCS}") message(STATUS "PROTO_SRCS = ${PROTO_SRCS}")
message(STATUS "PROTO_HDRS = ${PROTO_HDRS}") message(STATUS "PROTO_HDRS = ${PROTO_HDRS}")
message(STATUS "PROTOBUF_INCLUDE_DIRS = ${PROTOBUF_INCLUDE_DIRS}") message(STATUS "PROTOBUF_INCLUDE_DIRS = ${PROTOBUF_INCLUDE_DIRS}")
message(STATUS "PROTOBUF_LIBRARIES = ${PROTOBUF_LIBRARIES}") message(STATUS "PROTOBUF_LIBRARIES = ${PROTOBUF_LIBRARIES}")
message(STATUS "PROTOBUF_PROTOC_EXECUTABLE = ${PROTOBUF_PROTOC_EXECUTABLE}") message(STATUS "PROTOBUF_PROTOC_EXECUTABLE = ${PROTOBUF_PROTOC_EXECUTABLE}")
# Setup the lib/exe names for the targets # Setup the lib/exe names for the targets
if(WIN32) if(WIN32)
if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8") if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
set(LIB_STEAM_API steam_api64) set(LIB_STEAM_API steam_api64)
set(LIB_STEAMCLIENT steamclient64) set(LIB_STEAMCLIENT steamclient64)
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)
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)
endif() endif()
elseif(UNIX AND NOT APPLE) elseif(UNIX AND NOT APPLE)
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)
else() else()
message(FATAL_ERROR "Other platforms not supported...") message(FATAL_ERROR "Other platforms not supported...")
endif() endif()
# Gather the files that are shared between multiple targets # Gather the files that are shared between multiple targets
file(GLOB DLL_SRC_SHARED file(GLOB DLL_SRC_SHARED
dll/*.h dll/*.h
dll/*.cpp dll/*.cpp
) )
file(GLOB DETOURS_SRC_SHARED file(GLOB DETOURS_SRC_SHARED
detours/*.cpp detours/*.cpp
) )
################################################### ###################################################
# Setup for the steam_api(64).dll / libsteam_api.so # Setup for the steam_api(64).dll / libsteam_api.so
################################################### ###################################################
# Setup the target # Setup the target
add_library(${LIB_STEAM_API} add_library(${LIB_STEAM_API}
SHARED SHARED
$<$<BOOL:${EMU_EXPERIMENTAL_BUILD}>:${DETOURS_SRC_SHARED}> $<$<BOOL:${EMU_EXPERIMENTAL_BUILD}>:${DETOURS_SRC_SHARED}>
${DLL_SRC_SHARED} ${DLL_SRC_SHARED}
${PROTO_SRCS} ${PROTO_SRCS}
${PROTO_HDRS} ${PROTO_HDRS}
) )
# Include the required directories # Include the required directories
target_include_directories(${LIB_STEAM_API} target_include_directories(${LIB_STEAM_API}
PRIVATE PRIVATE
${PROTOBUF_INCLUDE_DIRS} ${PROTOBUF_INCLUDE_DIRS}
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
) )
# Link the required libraries # Link the required libraries
target_link_libraries(${LIB_STEAM_API} target_link_libraries(${LIB_STEAM_API}
PRIVATE PRIVATE
protobuf::libprotobuf protobuf::libprotobuf
$<$<BOOL:${WIN32}>:ws2_32> $<$<BOOL:${WIN32}>:ws2_32>
$<$<BOOL:${WIN32}>:iphlpapi> $<$<BOOL:${WIN32}>:iphlpapi>
) )
# Add target compile definitions # Add target compile definitions
target_compile_definitions(${LIB_STEAM_API} target_compile_definitions(${LIB_STEAM_API}
PRIVATE PRIVATE
$<$<CONFIG:>:EMU_RELEASE_BUILD> $<$<CONFIG:>:EMU_RELEASE_BUILD>
$<$<CONFIG:Release>:EMU_RELEASE_BUILD> $<$<CONFIG:Release>:EMU_RELEASE_BUILD>
$<$<CONFIG:RelWithDebInfo>:EMU_RELEASE_BUILD> $<$<CONFIG:RelWithDebInfo>:EMU_RELEASE_BUILD>
$<$<CONFIG:MinSizeRel>:EMU_RELEASE_BUILD> $<$<CONFIG:MinSizeRel>:EMU_RELEASE_BUILD>
$<$<BOOL:${EMU_EXPERIMENTAL_BUILD}>:EMU_EXPERIMENTAL_BUILD> $<$<BOOL:${EMU_EXPERIMENTAL_BUILD}>:EMU_EXPERIMENTAL_BUILD>
) )
# Install the target # Install the target
if(WIN32) if(WIN32)
install(TARGETS install(TARGETS
${LIB_STEAM_API} ${LIB_STEAM_API}
RUNTIME DESTINATION ./ RUNTIME DESTINATION ./
) )
else() else()
install(TARGETS install(TARGETS
${LIB_STEAM_API} ${LIB_STEAM_API}
LIBRARY DESTINATION ./ LIBRARY DESTINATION ./
) )
endif() endif()
######################################################## ########################################################
# Setup for the steamclient(64).dll / libsteamclient.so? # Setup for the steamclient(64).dll / libsteamclient.so?
######################################################## ########################################################
# Setup the target # Setup the target
add_library(${LIB_STEAMCLIENT} add_library(${LIB_STEAMCLIENT}
SHARED SHARED
steamclient.cpp steamclient.cpp
) )
# Add target compile definitions # Add target compile definitions
target_compile_definitions(${LIB_STEAMCLIENT} target_compile_definitions(${LIB_STEAMCLIENT}
PRIVATE PRIVATE
$<$<CONFIG:>:EMU_RELEASE_BUILD> $<$<CONFIG:>:EMU_RELEASE_BUILD>
$<$<CONFIG:Release>:EMU_RELEASE_BUILD> $<$<CONFIG:Release>:EMU_RELEASE_BUILD>
$<$<CONFIG:RelWithDebInfo>:EMU_RELEASE_BUILD> $<$<CONFIG:RelWithDebInfo>:EMU_RELEASE_BUILD>
$<$<CONFIG:MinSizeRel>:EMU_RELEASE_BUILD> $<$<CONFIG:MinSizeRel>:EMU_RELEASE_BUILD>
$<$<BOOL:${EMU_EXPERIMENTAL_BUILD}>:EMU_EXPERIMENTAL_BUILD> $<$<BOOL:${EMU_EXPERIMENTAL_BUILD}>:EMU_EXPERIMENTAL_BUILD>
) )
# Install the target # Install the target
if(WIN32) if(WIN32)
install(TARGETS install(TARGETS
${LIB_STEAMCLIENT} ${LIB_STEAMCLIENT}
RUNTIME DESTINATION ./ RUNTIME DESTINATION ./
) )
else() else()
install(TARGETS install(TARGETS
${LIB_STEAMCLIENT} ${LIB_STEAMCLIENT}
LIBRARY DESTINATION ./ LIBRARY DESTINATION ./
) )
endif() endif()
if(NOT WIN32) if(NOT WIN32)
message(STATUS "Target library 'steamclient' is only suported for windows at this time... Disabling Build ALL inclusion for this target") message(STATUS "Target library 'steamclient' is only suported for windows at this time... Disabling Build ALL inclusion for this target")
set_target_properties(${LIB_STEAMCLIENT} PROPERTIES EXCLUDE_FROM_ALL 1 EXCLUDE_FROM_DEFAULT_BUILD 1) set_target_properties(${LIB_STEAMCLIENT} PROPERTIES EXCLUDE_FROM_ALL 1 EXCLUDE_FROM_DEFAULT_BUILD 1)
endif() endif()
############################################################################## ##############################################################################
# Setup for the steamnetworkingsockets(64).dll / libsteamnetworkingsockets.so? # Setup for the steamnetworkingsockets(64).dll / libsteamnetworkingsockets.so?
############################################################################## ##############################################################################
# Setup the target # Setup the target
add_library(${LIB_STEAMNETWORKINGSOCKETS} add_library(${LIB_STEAMNETWORKINGSOCKETS}
SHARED SHARED
steamnetworkingsockets.cpp steamnetworkingsockets.cpp
) )
# Add target compile definitions # Add target compile definitions
target_compile_definitions(${LIB_STEAMNETWORKINGSOCKETS} target_compile_definitions(${LIB_STEAMNETWORKINGSOCKETS}
PRIVATE PRIVATE
$<$<CONFIG:>:EMU_RELEASE_BUILD> $<$<CONFIG:>:EMU_RELEASE_BUILD>
$<$<CONFIG:Release>:EMU_RELEASE_BUILD> $<$<CONFIG:Release>:EMU_RELEASE_BUILD>
$<$<CONFIG:RelWithDebInfo>:EMU_RELEASE_BUILD> $<$<CONFIG:RelWithDebInfo>:EMU_RELEASE_BUILD>
$<$<CONFIG:MinSizeRel>:EMU_RELEASE_BUILD> $<$<CONFIG:MinSizeRel>:EMU_RELEASE_BUILD>
$<$<BOOL:${EMU_EXPERIMENTAL_BUILD}>:EMU_EXPERIMENTAL_BUILD> $<$<BOOL:${EMU_EXPERIMENTAL_BUILD}>:EMU_EXPERIMENTAL_BUILD>
) )
# Setup install rules for the target # Setup install rules for the target
if(WIN32) if(WIN32)
install(TARGETS install(TARGETS
${LIB_STEAMNETWORKINGSOCKETS} ${LIB_STEAMNETWORKINGSOCKETS}
RUNTIME DESTINATION ./ RUNTIME DESTINATION ./
) )
else() else()
install(TARGETS install(TARGETS
${LIB_STEAMNETWORKINGSOCKETS} ${LIB_STEAMNETWORKINGSOCKETS}
LIBRARY DESTINATION ./ LIBRARY DESTINATION ./
) )
endif() endif()
if(NOT WIN32) if(NOT WIN32)
message(STATUS "Target library 'steamnetworkingsockets' is only supported for windows at this time... Disabling Build ALL inclusion for this target") message(STATUS "Target library 'steamnetworkingsockets' is only supported for windows at this time... Disabling Build ALL inclusion for this target")
set_target_properties(${LIB_STEAMNETWORKINGSOCKETS} PROPERTIES EXCLUDE_FROM_ALL 1 EXCLUDE_FROM_DEFAULT_BUILD 1) set_target_properties(${LIB_STEAMNETWORKINGSOCKETS} PROPERTIES EXCLUDE_FROM_ALL 1 EXCLUDE_FROM_DEFAULT_BUILD 1)
endif() endif()
########################################################################### ###########################################################################
# Setup for the lobby_connect(64).exe / lobby_connect # Setup for the lobby_connect(64).exe / lobby_connect
########################################################################### ###########################################################################
# Setup the target # Setup the target
add_executable(${BIN_LOBBY_CONNECT} add_executable(${BIN_LOBBY_CONNECT}
lobby_connect.cpp lobby_connect.cpp
$<$<BOOL:${EMU_EXPERIMENTAL_BUILD}>:${DETOURS_SRC_SHARED}> $<$<BOOL:${EMU_EXPERIMENTAL_BUILD}>:${DETOURS_SRC_SHARED}>
${DLL_SRC_SHARED} ${DLL_SRC_SHARED}
${PROTO_SRCS} ${PROTO_SRCS}
${PROTO_HDRS} ${PROTO_HDRS}
) )
target_include_directories(${BIN_LOBBY_CONNECT} target_include_directories(${BIN_LOBBY_CONNECT}
PRIVATE PRIVATE
${PROTOBUF_INCLUDE_DIRS} ${PROTOBUF_INCLUDE_DIRS}
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
) )
# Link the required libraries # Link the required libraries
target_link_libraries(${BIN_LOBBY_CONNECT} target_link_libraries(${BIN_LOBBY_CONNECT}
PRIVATE PRIVATE
protobuf::libprotobuf protobuf::libprotobuf
$<$<BOOL:${WIN32}>:ws2_32> $<$<BOOL:${WIN32}>:ws2_32>
$<$<BOOL:${WIN32}>:iphlpapi> $<$<BOOL:${WIN32}>:iphlpapi>
$<$<BOOL:${WIN32}>:comdlg32> $<$<BOOL:${WIN32}>:comdlg32>
-debug:none -debug:none
) )
# Add target compile definitions # Add target compile definitions
target_compile_definitions(${BIN_LOBBY_CONNECT} target_compile_definitions(${BIN_LOBBY_CONNECT}
PRIVATE PRIVATE
NO_DISK_WRITES NO_DISK_WRITES
LOBBY_CONNECT LOBBY_CONNECT
$<$<CONFIG:>:EMU_RELEASE_BUILD> $<$<CONFIG:>:EMU_RELEASE_BUILD>
$<$<CONFIG:Release>:EMU_RELEASE_BUILD> $<$<CONFIG:Release>:EMU_RELEASE_BUILD>
$<$<CONFIG:RelWithDebInfo>:EMU_RELEASE_BUILD> $<$<CONFIG:RelWithDebInfo>:EMU_RELEASE_BUILD>
$<$<CONFIG:MinSizeRel>:EMU_RELEASE_BUILD> $<$<CONFIG:MinSizeRel>:EMU_RELEASE_BUILD>
$<$<BOOL:${EMU_EXPERIMENTAL_BUILD}>:EMU_EXPERIMENTAL_BUILD> $<$<BOOL:${EMU_EXPERIMENTAL_BUILD}>:EMU_EXPERIMENTAL_BUILD>
) )
# Setup install rules for the target # Setup install rules for the target
install(TARGETS install(TARGETS
${BIN_LOBBY_CONNECT} ${BIN_LOBBY_CONNECT}
RUNTIME DESTINATION lobby_connect/ RUNTIME DESTINATION lobby_connect/
) )
########################################################################### ###########################################################################
# Setup for the generate_interfaces_file(64).exe / generate_interfaces_file # Setup for the generate_interfaces_file(64).exe / generate_interfaces_file
########################################################################### ###########################################################################
# Setup the target # Setup the target
add_executable(${BIN_GENERATE_INTERFACES_FILE} add_executable(${BIN_GENERATE_INTERFACES_FILE}
generate_interfaces_file.cpp generate_interfaces_file.cpp
) )
# Link the required libraries # Link the required libraries
target_link_libraries(${BIN_GENERATE_INTERFACES_FILE} target_link_libraries(${BIN_GENERATE_INTERFACES_FILE}
PRIVATE PRIVATE
-debug:none -debug:none
) )
# Setup install rules for the target # Setup install rules for the target
install(TARGETS install(TARGETS
${BIN_GENERATE_INTERFACES_FILE} ${BIN_GENERATE_INTERFACES_FILE}
RUNTIME DESTINATION tools/ RUNTIME DESTINATION tools/
) )
########################################################################### ###########################################################################
# Installation setup for non target files and directories # Installation setup for non target files and directories
########################################################################### ###########################################################################
install(FILES install(FILES
Readme_lobby_connect.txt Readme_lobby_connect.txt
DESTINATION lobby_connect/ DESTINATION lobby_connect/
) )
install(FILES install(FILES
scripts/find_interfaces.sh scripts/find_interfaces.sh
scripts/find_interfaces.ps1 scripts/find_interfaces.ps1
Readme_generate_interfaces.txt Readme_generate_interfaces.txt
DESTINATION tools/ DESTINATION tools/
) )
install(FILES install(FILES
Readme_release.txt Readme_release.txt
files_example/steam_appid.EDIT_AND_RENAME.txt files_example/steam_appid.EDIT_AND_RENAME.txt
files_example/steam_interfaces.EXAMPLE.txt files_example/steam_interfaces.EXAMPLE.txt
$<$<BOOL:${EMU_EXPERIMENTAL_BUILD}>:${PROJECT_SOURCE_DIR}/Readme_experimental.txt> $<$<BOOL:${EMU_EXPERIMENTAL_BUILD}>:${PROJECT_SOURCE_DIR}/Readme_experimental.txt>
$<$<CONFIG:Debug>:${PROJECT_SOURCE_DIR}/Readme_debug.txt> $<$<CONFIG:Debug>:${PROJECT_SOURCE_DIR}/Readme_debug.txt>
DESTINATION ./ DESTINATION ./
) )
install(DIRECTORY install(DIRECTORY
files_example/steam_settings.EXAMPLE files_example/steam_settings.EXAMPLE
DESTINATION ./ DESTINATION ./
) )

View file

@ -273,7 +273,7 @@ bool Steam_Apps::GetDlcDownloadProgress( AppId_t nAppID, uint64 *punBytesDownloa
int Steam_Apps::GetAppBuildId() int Steam_Apps::GetAppBuildId()
{ {
PRINT_DEBUG("GetAppBuildId\n"); PRINT_DEBUG("GetAppBuildId\n");
return 1; return 10;
} }