From 45c2293497a47913dd3037191480b2c5c6512058 Mon Sep 17 00:00:00 2001 From: Stas Degteff Date: Thu, 19 Jan 2006 21:31:36 +0000 Subject: [PATCH] Add condition to build golded+ with spellchecker into Makefile --- Config.def | 2 ++ GNUmakef.def | 1 + golded.mak | 15 ++++++++++++--- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/Config.def b/Config.def index 7ae369a..ac99185 100644 --- a/Config.def +++ b/Config.def @@ -72,3 +72,5 @@ #CPPFLAGS+=-DGCFG_NOXMAIL # Uncomment to disable Synchronet BBS support #CPPFLAGS+=-DGCFG_NOSYNCHRONET +# Uncomment to enable MS Office spellchecker support (win32 only) +#CPPFLAGS+=-D__GOLD_SPELL__ diff --git a/GNUmakef.def b/GNUmakef.def index 1d45e84..2f0f87b 100644 --- a/GNUmakef.def +++ b/GNUmakef.def @@ -76,6 +76,7 @@ SHELL=sh EXEEXT=.exe OBJEXT=.o LIBEXT=.a +CPPFLAGS+=-Wno-deprecated else ifeq ($(PLATFORM),be) CAT=cat diff --git a/golded.mak b/golded.mak index 2617309..814ac13 100644 --- a/golded.mak +++ b/golded.mak @@ -6,10 +6,19 @@ # # NMAKE /f "golded.mak" CFG="Release" # -# or +# to standard build or +# +# NMAKE /f "golded.mak" CFG="Release" CPP_EXTRA_FLAGS=/D__GOLD_SPELL__ +# +# to build with spellcheck feature or # # NMAKE /f "golded.mak" CFG="Debug" # +# to build debug binary or +# +# NMAKE /f "golded.mak" CFG="Debug" CPP_EXTRA_FLAGS=/D__GOLD_SPELL__ +# +# to build debug binary with spellcheck feature # !IF "$(CFG)" == "" @@ -288,11 +297,11 @@ RSC_FLAGS=/igolded3 /fo$(OBJ_DIR)\gedcyg.res LNK_FLAGS=winmm.lib user32.lib /nologo /subsystem:console /machine:I386 !IF "$(CFG)" == "Release" -CPP_PROJ=$(CPP_FLAGS) /MD /O1 /DNDEBUG +CPP_PROJ=$(CPP_FLAGS) /MD /O1 /DNDEBUG $(CPP_EXTRA_FLAGS) RSC_PROJ=$(RSC_FLAGS) /dNDEBUG LNK_PROJ=$(LNK_FLAGS) /incremental:no !ELSEIF "$(CFG)" == "Debug" -CPP_PROJ=$(CPP_FLAGS) /MDd /Gm /ZI /GZ /Od /D_DEBUG +CPP_PROJ=$(CPP_FLAGS) /MDd /Gm /ZI /GZ /Od /D_DEBUG $(CPP_EXTRA_FLAGS) RSC_PROJ=$(RSC_FLAGS) /d_DEBUG LNK_PROJ=$(LNK_FLAGS) /incremental:yes /debug /pdbtype:sept !ENDIF