Mercurial > hg > dmlib

changeset 1079:47c0514d9ba4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make the built in setup font/screen image/bar bitmap optional.
author Matti Hamalainen <ccr@tnsp.org>
date Mon, 02 Mar 2015 04:57:18 +0200
parents a3ef48c7e9d3
children 76b7d1d20545
files Makefile.gen config.mak.in src/dmsimple.c
diffstat 3 files changed, 29 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile.gen	Mon Mar 02 04:47:27 2015 +0200
+++ b/Makefile.gen	Mon Mar 02 04:57:18 2015 +0200
@@ -22,6 +22,7 @@
 EXTRA_CFLAGS=-O3 -march=core2
 endif
 
+
 ###
 ### Extra debug messages etc?
 ###
@@ -33,6 +34,7 @@
 JSS_DEBUG=yes
 endif
 
+
 ###
 ### Build demo target?
 ###
@@ -40,6 +42,10 @@
 BINARIES += $(DEMO_BIN)
 endif
 
+ifeq ($(DM_BUILT_IN_SETUP),yes)
+DM_CFLAGS += -DDM_BUILT_IN_SETUP
+endif
+
 
 ###
 ### Editor
--- a/config.mak.in	Mon Mar 02 04:47:27 2015 +0200
+++ b/config.mak.in	Mon Mar 02 04:57:18 2015 +0200
@@ -3,6 +3,9 @@
 DM_BUILD_TESTS=yes
 DM_BUILD_TOOLS=yes
 
+# Include built-in setup menu image, font and bar bitmaps
+DM_BUILT_IN_SETUP=no
+
 # Build with additional error messages
 DM_DEBUG=yes
 
--- a/src/dmsimple.c	Mon Mar 02 04:47:27 2015 +0200
+++ b/src/dmsimple.c	Mon Mar 02 04:57:18 2015 +0200
@@ -11,8 +11,11 @@
 #include "dmtext.h"
 #include "dmimage.h"
 #include "setupfont.h"
-#include "setupimage.h"
-#include "setupmenubar.h"
+
+#ifdef DM_BUILT_IN_SETUP
+#    include "setupimage.h"
+#    include "setupmenubar.h"
+#endif
 
 static const char *engineSetupDataName = "SetupData.txt";
 static const char *engineSetupImageName = "SetupImage.png";
@@ -356,15 +359,21 @@
         goto out;
 
     // Fetch and decompress setup image, try regular resources first
-    if ((result = dmf_open(engine.resources, engineSetupImageName, &file)) == DMERR_OK ||
-        (result = dmf_create_memio(NULL, engineSetupImageName, engineSetupImage, sizeof(engineSetupImage), &file)) == DMERR_OK)
+    if ((result = dmf_open(engine.resources, engineSetupImageName, &file)) == DMERR_OK
+#ifdef DM_BUILT_IN_SETUP
+        || (result = dmf_create_memio(NULL, engineSetupImageName, engineSetupImage, sizeof(engineSetupImage), &file)) == DMERR_OK
+#endif
+        )
     {
         menuBgImage = dmLoadImage(file);
         dmf_close(file);
     }
 
-    if ((result = dmf_open(engine.resources, engineSetupMenuBarName, &file)) == DMERR_OK ||
-        (result = dmf_create_memio(NULL, engineSetupMenuBarName, engineSetupMenuBar, sizeof(engineSetupMenuBar), &file)) == DMERR_OK)
+    if ((result = dmf_open(engine.resources, engineSetupMenuBarName, &file)) == DMERR_OK
+#ifdef DM_BUILT_IN_SETUP
+        || (result = dmf_create_memio(NULL, engineSetupMenuBarName, engineSetupMenuBar, sizeof(engineSetupMenuBar), &file)) == DMERR_OK
+#endif
+        )
     {
         menuBarImage = dmLoadImage(file);
         dmf_close(file);
@@ -391,8 +400,11 @@
 
 
     // Load up the bitmap font
-    if ((result = dmf_open(engine.resources, engineSetupFontName, &file)) == DMERR_OK ||
-        (result = dmf_create_memio(NULL, engineSetupFontName, engineSetupFont, sizeof(engineSetupFont), &file)) == DMERR_OK)
+    if ((result = dmf_open(engine.resources, engineSetupFontName, &file)) == DMERR_OK
+#ifdef DM_BUILT_IN_SETUP
+        || (result = dmf_create_memio(NULL, engineSetupFontName, engineSetupFont, sizeof(engineSetupFont), &file)) == DMERR_OK
+#endif
+        )
     {
         result = dmLoadBitmapFont(file, &menuFont);
         dmf_close(file);