From 8156c70f77ea5a75b60dfb96f467dc540cead9ae Mon Sep 17 00:00:00 2001 From: Alex Bevilacqua Date: Wed, 16 Feb 2011 14:52:01 -0500 Subject: [PATCH 1/2] add TSAGE to the engines list --- engines/engines.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/engines/engines.mk b/engines/engines.mk index eea4ffc0b94..b0f57135aa7 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 From 75c99ac175c235956b76cc230c6bd44e42de58eb Mon Sep 17 00:00:00 2001 From: Alex Bevilacqua Date: Wed, 16 Feb 2011 14:58:22 -0500 Subject: [PATCH 2/2] TSAGE: fix tokenization issue in SYNC_ENUM in GCC This needs to be tested in MSVC to ensure it doesn't now break Windows builds with a different error ;) --- engines/tsage/saveload.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/engines/tsage/saveload.h b/engines/tsage/saveload.h index 054d968105c..efaa8d696e2 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