diff options
| author | Paul Gilbert | 2011-02-18 20:21:07 +1100 |
|---|---|---|
| committer | Paul Gilbert | 2011-02-18 20:21:07 +1100 |
| commit | d16b89d8f97430cdb1b7847ab6ec759e2b223780 (patch) | |
| tree | 7f7eafc064608ce9fcf04c418c86ea80586089cd | |
| parent | 3c454685c21a7e2f659c13899959f1cf56e93285 (diff) | |
| parent | 1a84b04ce139cb026cb4a90dea6b8ce2b6fd716c (diff) | |
| download | scummvm-rg350-d16b89d8f97430cdb1b7847ab6ec759e2b223780.tar.gz scummvm-rg350-d16b89d8f97430cdb1b7847ab6ec759e2b223780.tar.bz2 scummvm-rg350-d16b89d8f97430cdb1b7847ab6ec759e2b223780.zip | |
Merge of GCC compilation fixes
| -rw-r--r-- | engines/engines.mk | 5 | ||||
| -rw-r--r-- | engines/tsage/saveload.h | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/engines/engines.mk b/engines/engines.mk index eea4ffc0b9..b0f57135aa 100644 --- a/engines/engines.mk +++ b/engines/engines.mk @@ -176,6 +176,11 @@ DEFINES += -DENABLE_TOUCHE=$(ENABLE_TOUCHE) MODULES += engines/touche endif +ifdef ENABLE_TSAGE +DEFINES += -DENABLE_TSAGE=$(ENABLE_TSAGE) +MODULES += engines/tsage +endif + ifdef ENABLE_TUCKER DEFINES += -DENABLE_TUCKER=$(ENABLE_TUCKER) MODULES += engines/tucker diff --git a/engines/tsage/saveload.h b/engines/tsage/saveload.h index 054d968105..efaa8d696e 100644 --- a/engines/tsage/saveload.h +++ b/engines/tsage/saveload.h @@ -52,8 +52,8 @@ struct tSageSavegameHeader { /*--------------------------------------------------------------------------*/ #define SYNC_POINTER(x) s.syncPointer((SavedObject **)&x) -#define SYNC_ENUM(FIELD, TYPE) int v_##FIELD## = (int)FIELD; s.syncAsUint16LE(v_##FIELD##); \ - if (s.isLoading()) FIELD = (TYPE)v_##FIELD##; +#define SYNC_ENUM(FIELD, TYPE) int v_##FIELD = (int)FIELD; s.syncAsUint16LE(v_##FIELD); \ + if (s.isLoading()) FIELD = (TYPE)v_##FIELD; /** * Derived serialiser class with extra synchronisation types |