Skip to content

steam: Fix float stat truncation, outdated macOS SDK path, and VS det… #367

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
andy5995 wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

steam: Fix float stat truncation, outdated macOS SDK path, and VS det… #367

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion source/glest_game/steamshim/steamshim_child.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ static const STEAMSHIM_Event *processEvent(const uint8 *buf, size_t buflen) {
case SHIMEVENT_SETSTATF:
case SHIMEVENT_GETSTATF:
event.okay = *(buf++) ? 1 : 0;
event.fvalue = (int)*((float *)buf);
event.fvalue = *((float *)buf);
buf += sizeof(float);
strcpy(event.name, (const char *)buf);
break;
Expand Down
2 changes: 1 addition & 1 deletion source/steamshim_parent/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ else ifeq ($(HOST),linux32)
else ifeq ($(HOST),linux64)
FLAGS += -L$(STEAMWORKS)/redistributable_bin/linux64 -m64
else ifeq ($(HOST),osx)
FLAGS += -L$(STEAMWORKS)/redistributable_bin/osx32
FLAGS += -L$(STEAMWORKS)/redistributable_bin/osx
endif

FLAGS += -lsteam_api
Expand Down
19 changes: 17 additions & 2 deletions source/steamshim_parent/build.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,31 @@ cd /d "%~dp0"
ECHO using msbuild config [%MSBUILD_CONFIG%]
ECHO Checking for windows binary runtime tools...

rem setup the Visual Studio 2015 environment
rem setup the Visual Studio environment (2022, 2019, 2017, or 2015)
ECHO --------------------------------
ECHO Setting up Visual Studio 2015 environment vars...
ECHO Setting up Visual Studio environment vars...
REM Ensure ultifds HP doesn't mess the build up
SET Platform=
if "%DevEnvDir%." == "." goto SETVCVARS
GOTO GITSECTION

:SETVCVARS

rem Try vswhere.exe to locate VS2017+ installations
SET VSWHERE="%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe"
IF NOT EXIST %VSWHERE% SET VSWHERE="%ProgramFiles%\Microsoft Visual Studio\Installer\vswhere.exe"
IF EXIST %VSWHERE% (
FOR /F "usebackq tokens=*" %%i IN (`%VSWHERE% -latest -products * -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property installationPath`) DO (
SET VS_INSTALL_PATH=%%i
)
)
IF DEFINED VS_INSTALL_PATH (
ECHO Found Visual Studio at: %VS_INSTALL_PATH%
call "%VS_INSTALL_PATH%\VC\Auxiliary\Build\vcvarsall.bat" %VCVARS_PLATFORM%
goto GITSECTION
)

rem Fall back to VS2015
IF EXIST "%VS140COMNTOOLS%..\..\" GOTO VC_Common_15
IF EXIST "\Program Files\Microsoft Visual Studio 14.0\" GOTO VC_32_15
IF EXIST "\Program Files (x86)\Microsoft Visual Studio 14.0\" GOTO VC_64_15
Expand Down
Loading