mirror of
https://github.com/TerryCavanagh/VVVVVV.git
synced 2026-07-27 17:41:49 +03:00
Compare commits
2 Commits
8c70c9eb97
...
391148415c
| Author | SHA1 | Date | |
|---|---|---|---|
| 391148415c | |||
| 05a5abbfbd |
@@ -51,18 +51,18 @@ endif()
|
||||
# RPATH
|
||||
if(NOT WIN32)
|
||||
if(CMAKE_SYSTEM_NAME STREQUAL "iOS")
|
||||
set(BIN_LIBROOT "Frameworks")
|
||||
set(BIN_RPATH "@executable_path/Frameworks")
|
||||
elseif(APPLE)
|
||||
set(BIN_LIBROOT "osx")
|
||||
set(BIN_RPATH "@executable_path/osx")
|
||||
elseif(CMAKE_SIZEOF_VOID_P MATCHES "8")
|
||||
set(BIN_LIBROOT "lib64")
|
||||
set(BIN_RPATH "\$ORIGIN/lib64")
|
||||
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--disable-new-dtags")
|
||||
else()
|
||||
set(BIN_LIBROOT "lib")
|
||||
set(BIN_RPATH "\$ORIGIN/lib")
|
||||
SET(CMAKE_EXE_LINKER_FLAGS ${CMAKE_EXE_LINKER_FLAGS} "-Wl,--disable-new-dtags")
|
||||
|
||||
if (CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64")
|
||||
# Naming quirk for backward compatibility
|
||||
SET(BIN_RPATH "\$ORIGIN/lib64")
|
||||
else()
|
||||
SET(BIN_RPATH "\$ORIGIN/lib${CMAKE_SYSTEM_PROCESSOR}")
|
||||
endif()
|
||||
endif()
|
||||
set(CMAKE_SKIP_BUILD_RPATH TRUE)
|
||||
set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
|
||||
|
||||
@@ -10,8 +10,8 @@
|
||||
|
||||
/* Steamworks interface versions */
|
||||
|
||||
#define VVVVVV_STEAMCLIENT "SteamClient017"
|
||||
#define VVVVVV_STEAMUSERSTATS "STEAMUSERSTATS_INTERFACE_VERSION011"
|
||||
#define VVVVVV_STEAMCLIENT "SteamClient023"
|
||||
#define VVVVVV_STEAMUSERSTATS "STEAMUSERSTATS_INTERFACE_VERSION013"
|
||||
#define VVVVVV_STEAMSCREENSHOTS "STEAMSCREENSHOTS_INTERFACE_VERSION003"
|
||||
|
||||
/* Shared object file name */
|
||||
@@ -45,8 +45,16 @@ struct SteamAPICallCompleted_t
|
||||
uint32_t m_cubParam;
|
||||
};
|
||||
|
||||
typedef enum ESteamAPIInitResult
|
||||
{
|
||||
k_ESteamAPIInitResult_OK = 0,
|
||||
k_ESteamAPIInitResult_FailedGeneric = 1,
|
||||
k_ESteamAPIInitResult_NoSteamClient = 2,
|
||||
k_ESteamAPIInitResult_VersionMismatch = 3,
|
||||
} ESteamAPIInitResult;
|
||||
|
||||
#define FUNC_LIST \
|
||||
FOREACH_FUNC(uint8_t, SteamAPI_Init, (void)) \
|
||||
FOREACH_FUNC(ESteamAPIInitResult, SteamAPI_InitFlat, (void*)) \
|
||||
FOREACH_FUNC(void, SteamAPI_Shutdown, (void)) \
|
||||
FOREACH_FUNC(void, SteamAPI_RunCallbacks, (void)) \
|
||||
FOREACH_FUNC(struct ISteamClient*, SteamInternal_CreateInterface, (const char*)) \
|
||||
@@ -58,7 +66,6 @@ struct SteamAPICallCompleted_t
|
||||
int32_t, \
|
||||
const char* \
|
||||
)) \
|
||||
FOREACH_FUNC(uint8_t, SteamAPI_ISteamUserStats_RequestCurrentStats, (struct ISteamUserStats*)) \
|
||||
FOREACH_FUNC(uint8_t, SteamAPI_ISteamUserStats_StoreStats, (struct ISteamUserStats*)) \
|
||||
FOREACH_FUNC(uint8_t, SteamAPI_ISteamUserStats_SetAchievement, ( \
|
||||
struct ISteamUserStats*, \
|
||||
@@ -177,7 +184,7 @@ int32_t STEAM_init(void)
|
||||
FUNC_LIST
|
||||
#undef FOREACH_FUNC
|
||||
|
||||
if (!SteamAPI_Init())
|
||||
if (SteamAPI_InitFlat(NULL) != k_ESteamAPIInitResult_OK)
|
||||
{
|
||||
vlog_error("Steamworks not initialized!");
|
||||
ClearPointers();
|
||||
@@ -207,7 +214,6 @@ int32_t STEAM_init(void)
|
||||
ClearPointers();
|
||||
return 0;
|
||||
}
|
||||
SteamAPI_ISteamUserStats_RequestCurrentStats(steamUserStats);
|
||||
steamScreenshots = SteamAPI_ISteamClient_GetISteamScreenshots(
|
||||
steamClient,
|
||||
steamUser,
|
||||
|
||||
Reference in New Issue
Block a user