Mercurial > hg > dmlib
diff src/dmsimple.c @ 1079:47c0514d9ba4
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 | eb2d14546a0e |
| children | e06abfde6c39 |
line wrap: on
line diff
--- 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);