Browse Source

fix macos and windows builds( maybe )

aswarm
nillerusr 1 year ago
parent
commit
2011179696
  1. 2
      game/client/cdll_util.h
  2. 3
      game/shared/sceneimage.cpp
  3. 1
      header-list.txt
  4. 1
      public/appframework/iappsystem.h
  5. 1
      public/color.h
  6. 2
      public/datacache/iprecachesystem.h
  7. 2
      public/datamap.h
  8. 2
      public/networkvar.h
  9. 2
      public/soundsystem/isoundsystem.h
  10. 2
      public/tier0/logging.h
  11. 2
      public/vscript/ivscript.h
  12. 2
      wscript

2
game/client/cdll_util.h

@ -16,7 +16,7 @@
#include <soundflags.h> #include <soundflags.h>
#include "mathlib/vector.h" #include "mathlib/vector.h"
#include <shareddefs.h> #include <shareddefs.h>
#include "color.h" #include "Color.h"
#include "shake.h" #include "shake.h"
#include "bitmap/imageformat.h" #include "bitmap/imageformat.h"

3
game/shared/sceneimage.cpp

@ -698,7 +698,8 @@ bool CSceneImage::UpdateSceneImageFile( CUtlBuffer &targetBuffer, char const *pc
scene.crcFileName = pEntry->crcFilename; scene.crcFileName = pEntry->crcFilename;
scene.compiledBuffer.Put( pData, pEntry->nDataLength ); scene.compiledBuffer.Put( pData, pEntry->nDataLength );
scene.msecs = pSummary->msecs; 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 // Load sounds
for ( int j = 0 ; j < pSummary->numSounds; ++j ) for ( int j = 0 ; j < pSummary->numSounds; ++j )
{ {

1
header-list.txt

@ -7,3 +7,4 @@ public/color.h
public/igameevents.h public/igameevents.h
public/engine/ICollideable.h public/engine/ICollideable.h
public/datamap.h

1
public/appframework/iappsystem.h

@ -1 +0,0 @@
IAppSystem.h

1
public/color.h

@ -1 +0,0 @@
Color.h

2
public/datacache/iprecachesystem.h vendored

@ -17,7 +17,7 @@
#include "tier0/dbg.h" #include "tier0/dbg.h"
#include "tier2/tier2.h" #include "tier2/tier2.h"
#include "tier2/resourceprecacher.h" #include "tier2/resourceprecacher.h"
#include "appframework/iappsystem.h" #include "appframework/IAppSystem.h"
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// Resource access control API // Resource access control API

2
public/datamap.h

@ -249,7 +249,7 @@ typedef void (CBaseEntity::*inputfunc_t)(inputdata_t &data);
struct datamap_t; struct datamap_t;
struct typedescription_t; struct typedescription_t;
#if 0 #if SOURCE_ASW
enum enum
{ {
PC_NON_NETWORKED_ONLY = 0, PC_NON_NETWORKED_ONLY = 0,

2
public/networkvar.h

@ -21,7 +21,7 @@
#pragma warning( disable : 4284 ) // warning C4284: return type for 'CNetworkVarT<int>::operator ->' is 'int *' (ie; not a UDT or reference to a UDT. Will produce errors if applied using infix notation) #pragma warning( disable : 4284 ) // warning C4284: return type for 'CNetworkVarT<int>::operator ->' is 'int *' (ie; not a UDT or reference to a UDT. Will produce errors if applied using infix notation)
#define MyOffsetOf( type, var ) ( (int)&((type*)0)->var ) #define MyOffsetOf( type, var ) ( (intp)&((type*)0)->var )
#ifdef _DEBUG #ifdef _DEBUG
#undef new #undef new

2
public/soundsystem/isoundsystem.h

@ -10,7 +10,7 @@
#pragma once #pragma once
#endif #endif
#include "appframework/iappsystem.h" #include "appframework/IAppSystem.h"
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------

2
public/tier0/logging.h

@ -16,7 +16,7 @@
#pragma once #pragma once
#endif #endif
#include "color.h" #include "Color.h"
#include "icommandline.h" #include "icommandline.h"
#include <stdio.h> #include <stdio.h>

2
public/vscript/ivscript.h

@ -97,7 +97,7 @@
#include "platform.h" #include "platform.h"
#include "datamap.h" #include "datamap.h"
#include "appframework/iappsystem.h" #include "appframework/IAppSystem.h"
#include "tier1/functors.h" #include "tier1/functors.h"
#include "tier0/memdbgon.h" #include "tier0/memdbgon.h"

2
wscript

@ -107,7 +107,7 @@ projects={
'dedicated_main', 'dedicated_main',
'dmxloader', 'dmxloader',
'engine', 'engine',
'game/server', # 'game/server',
'ivp/havana', 'ivp/havana',
'ivp/havana/havok/hk_base', 'ivp/havana/havok/hk_base',
'ivp/havana/havok/hk_math', 'ivp/havana/havok/hk_math',

Loading…
Cancel
Save