Skip to content

Commit

Permalink
fix macos and windows builds( maybe )
Browse files Browse the repository at this point in the history
  • Loading branch information
nillerusr committed Oct 3, 2023
1 parent 3626803 commit 77b9cb7
Show file tree
Hide file tree
Showing 8 changed files with 8 additions and 9 deletions.
2 changes: 1 addition & 1 deletion game/client/cdll_util.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#include <soundflags.h>
#include "mathlib/vector.h"
#include <shareddefs.h>
#include "color.h"
#include "Color.h"

#include "shake.h"
#include "bitmap/imageformat.h"
Expand Down
3 changes: 2 additions & 1 deletion game/shared/sceneimage.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -698,7 +698,8 @@ bool CSceneImage::UpdateSceneImageFile( CUtlBuffer &targetBuffer, char const *pc
scene.crcFileName = pEntry->crcFilename;
scene.compiledBuffer.Put( pData, pEntry->nDataLength );
scene.msecs = pSummary->msecs;
scene.lastspeak_msecs = pSummary->lastspeech_msecs;
// TODO(nillerusr): support for loading other scene image versions?
//scene.lastspeak_msecs = pSummary->lastspeech_msecs;
// Load sounds
for ( int j = 0 ; j < pSummary->numSounds; ++j )
{
Expand Down
1 change: 0 additions & 1 deletion public/appframework/iappsystem.h

This file was deleted.

1 change: 0 additions & 1 deletion public/color.h

This file was deleted.

2 changes: 1 addition & 1 deletion public/datacache/iprecachesystem.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#include "tier0/dbg.h"
#include "tier2/tier2.h"
#include "tier2/resourceprecacher.h"
#include "appframework/iappsystem.h"
#include "appframework/IAppSystem.h"

//-----------------------------------------------------------------------------
// Resource access control API
Expand Down
2 changes: 1 addition & 1 deletion public/soundsystem/isoundsystem.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#pragma once
#endif

#include "appframework/iappsystem.h"
#include "appframework/IAppSystem.h"


//-----------------------------------------------------------------------------
Expand Down
4 changes: 2 additions & 2 deletions public/tier0/logging.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#pragma once
#endif

#include "color.h"
#include "Color.h"
#include "icommandline.h"
#include <stdio.h>

Expand Down Expand Up @@ -765,4 +765,4 @@ PLATFORM_INTERFACE LoggingResponse_t LoggingSystem_LogAssert( PRINTF_FORMAT_STRI

#endif //#if !defined(__SPU__)

#endif // LOGGING_H
#endif // LOGGING_H
2 changes: 1 addition & 1 deletion public/vscript/ivscript.h
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@

#include "platform.h"
#include "datamap.h"
#include "appframework/iappsystem.h"
#include "appframework/IAppSystem.h"
#include "tier1/functors.h"
#include "tier0/memdbgon.h"

Expand Down

0 comments on commit 77b9cb7

Please sign in to comment.