r374 - trunk
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Fri Nov 23 23:46:06 EST 2007
Author: icculus
Date: 2007-11-23 23:46:06 -0500 (Fri, 23 Nov 2007)
New Revision: 374
Modified:
trunk/CMakeLists.txt
trunk/stb_image.c
Log:
Glued stb_image into build process.
Modified: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt 2007-11-24 04:30:28 UTC (rev 373)
+++ trunk/CMakeLists.txt 2007-11-24 04:46:06 UTC (rev 374)
@@ -223,6 +223,10 @@
${LUA_DIR}/src/loadlib.c
)
+SET(STBIMAGE_SRCS
+ stb_image.c
+)
+
# Disabling the parser cuts the Lua binary bits by about 35%, plus .luac files
# are almost always smaller than the original scripts. The downside is you
# (and end users in the field) can't just tweak a script without recompiling
@@ -454,6 +458,50 @@
ENDIF(MOJOSETUP_ARCHIVE_TAR)
+# Image decoders for GUIs...
+
+OPTION(MOJOSETUP_IMAGE_JPG "Enable JPG support" TRUE)
+IF(MOJOSETUP_IMAGE_JPG)
+ ADD_DEFINITIONS(-DSUPPORT_JPG=1)
+ SET(MOJOSETUP_NEED_STBIMAGE TRUE)
+ENDIF(MOJOSETUP_IMAGE_JPG)
+
+OPTION(MOJOSETUP_IMAGE_PNG "Enable PNG support" TRUE)
+IF(MOJOSETUP_IMAGE_PNG)
+ ADD_DEFINITIONS(-DSUPPORT_PNG=1)
+ SET(MOJOSETUP_NEED_STBIMAGE TRUE)
+ENDIF(MOJOSETUP_IMAGE_PNG)
+
+OPTION(MOJOSETUP_IMAGE_TGA "Enable TGA support" FALSE)
+IF(MOJOSETUP_IMAGE_TGA)
+ ADD_DEFINITIONS(-DSUPPORT_TGA=1)
+ SET(MOJOSETUP_NEED_STBIMAGE TRUE)
+ENDIF(MOJOSETUP_IMAGE_TGA)
+
+OPTION(MOJOSETUP_IMAGE_BMP "Enable BMP support" FALSE)
+IF(MOJOSETUP_IMAGE_BMP)
+ ADD_DEFINITIONS(-DSUPPORT_BMP=1)
+ SET(MOJOSETUP_NEED_STBIMAGE TRUE)
+ENDIF(MOJOSETUP_IMAGE_BMP)
+
+OPTION(MOJOSETUP_IMAGE_PSD "Enable PSD support" FALSE)
+IF(MOJOSETUP_IMAGE_PSD)
+ ADD_DEFINITIONS(-DSUPPORT_PSD=1)
+ SET(MOJOSETUP_NEED_STBIMAGE TRUE)
+ENDIF(MOJOSETUP_IMAGE_PSD)
+
+OPTION(MOJOSETUP_IMAGE_HDR "Enable HDR support" FALSE)
+IF(MOJOSETUP_IMAGE_HDR)
+ ADD_DEFINITIONS(-DSUPPORT_HDR=1)
+ SET(MOJOSETUP_NEED_STBIMAGE TRUE)
+ENDIF(MOJOSETUP_IMAGE_HDR)
+
+IF(MOJOSETUP_NEED_STBIMAGE)
+ ADD_DEFINITIONS(-DSUPPORT_STBIMAGE=1)
+ SET(OPTIONAL_SRCS ${OPTIONAL_SRCS} ${STBIMAGE_SRCS})
+ENDIF(MOJOSETUP_NEED_STBIMAGE)
+
+
# Networking...
# BINARY SIZE += 5 ...plus libfetch
Modified: trunk/stb_image.c
===================================================================
--- trunk/stb_image.c 2007-11-24 04:30:28 UTC (rev 373)
+++ trunk/stb_image.c 2007-11-24 04:46:06 UTC (rev 374)
@@ -70,22 +70,22 @@
# define STBI_NO_WRITE 1
# define STBI_NO_STDIO 1
# define STBI_NO_FAILURE_STRINGS 1
-# if !MOJOSETUP_SUPPORT_HDR
+# if !SUPPORT_HDR
# define STBI_NO_HDR 1
# endif
-# if !MOJOSETUP_SUPPORT_TGA
+# if !SUPPORT_TGA
# define STBI_NO_TGA 1
# endif
-# if !MOJOSETUP_SUPPORT_JPG
+# if !SUPPORT_JPG
# define STBI_NO_JPEG 1
# endif
-# if !MOJOSETUP_SUPPORT_BMP
+# if !SUPPORT_BMP
# define STBI_NO_BMP 1
# endif
-# if !MOJOSETUP_SUPPORT_PSD
+# if !SUPPORT_PSD
# define STBI_NO_PSD 1
# endif
-# if !MOJOSETUP_SUPPORT_PNG
+# if !SUPPORT_PNG
# define STBI_NO_PNG 1
# define STBI_NO_ZLIB 1
# endif
More information about the mojosetup-commits
mailing list