From c956237d7c5507aea649ce7b20c00d7bd9d37a7a Mon Sep 17 00:00:00 2001 From: Holger Schemel Date: Wed, 23 Apr 2003 00:00:53 +0200 Subject: [PATCH] rnd-20030423-1-src --- CHANGES | 12 +++++++++--- Makefile | 15 ++++++++++++--- src/conftime.h | 2 +- src/editor.c | 2 ++ src/main.h | 2 +- 5 files changed, 25 insertions(+), 8 deletions(-) diff --git a/CHANGES b/CHANGES index ca0d819e..ef1098c0 100644 --- a/CHANGES +++ b/CHANGES @@ -1,19 +1,25 @@ +Pre-Release Version 2.2.0rc7 [?? ??? ????] +------------------------------------------ + Pre-Release Version 2.2.0rc6 [22 APR 2003] ------------------------------------------ - - added missing source file - - fixed little font directive bug - - added actual CHANGES file ;-) + - fixed small font configuration directive bug + - tape recorder font slightly enhanced (now complete character set) + - added missing font configuration source file + - added updated CHANGES file ;-) Pre-Release Version 2.2.0rc5 [20 APR 2003] ------------------------------------------ - added generic selectbox gadget - added special mouse cursor for playfield while playing - font handling now more flexible (support for ISO-Latin-1 fonts) + - font graphics adjusted accordingly Pre-Release Version 2.2.0rc4 [30 MAR 2003] ------------------------------------------ - changes for menu configuration - not officially announced pre-release version + - Emerald Mine text font now much better quality Pre-Release Version 2.2.0rc3 [11 FEB 2003] ------------------------------------------ diff --git a/Makefile b/Makefile index a5b3d976..bdd285b5 100644 --- a/Makefile +++ b/Makefile @@ -138,11 +138,20 @@ upload-macosx: dist-clean: @$(MAKE_CMD) dist-clean +dist-build-unix: + @BUILD_DIST=TRUE $(MAKE) x11 + +dist-build-win32: + @BUILD_DIST=TRUE $(MAKE) cross-win32 + +dist-build-msdos: + @BUILD_DIST=TRUE $(MAKE) cross-msdos + dist-build-all: $(MAKE) clean - @BUILD_DIST=TRUE $(MAKE) x11 ; $(MAKE) dist-clean - @BUILD_DIST=TRUE $(MAKE) cross-win32 ; $(MAKE) dist-clean - @BUILD_DIST=TRUE $(MAKE) cross-msdos ; $(MAKE) dist-clean + $(MAKE) dist-build-unix ; $(MAKE) dist-clean + $(MAKE) dist-build-win32 ; $(MAKE) dist-clean + $(MAKE) dist-build-msdos ; $(MAKE) dist-clean dist-all: dist-build-all dist-unix dist-msdos dist-win32 dist-macosx diff --git a/src/conftime.h b/src/conftime.h index 32cd1cc2..af29e066 100644 --- a/src/conftime.h +++ b/src/conftime.h @@ -1 +1 @@ -#define COMPILE_DATE_STRING "[2003-04-22 23:10]" +#define COMPILE_DATE_STRING "[2003-04-22 23:56]" diff --git a/src/editor.c b/src/editor.c index 2a78b901..86311c57 100644 --- a/src/editor.c +++ b/src/editor.c @@ -3406,8 +3406,10 @@ static void DrawPropertiesConfig() else DrawElementContentAreas(); } +#if 1 else if (IS_CUSTOM_ELEMENT(properties_element)) DrawCustomChangedArea(); +#endif } if (IS_GEM(properties_element)) diff --git a/src/main.h b/src/main.h index a7adb261..f4243bf6 100644 --- a/src/main.h +++ b/src/main.h @@ -878,7 +878,7 @@ #define PROGRAM_VERSION_MAJOR 2 #define PROGRAM_VERSION_MINOR 2 #define PROGRAM_VERSION_PATCH 0 -#define PROGRAM_VERSION_STRING "2.2.0rc6" +#define PROGRAM_VERSION_STRING "2.2.0rc7" #define PROGRAM_TITLE_STRING "Rocks'n'Diamonds" #define PROGRAM_AUTHOR_STRING "Holger Schemel" -- 2.34.1