diff options
| author | Andrey Nazarov <skuller@skuller.net> | 2012-12-04 00:11:34 +0400 |
|---|---|---|
| committer | Andrey Nazarov <skuller@skuller.net> | 2012-12-04 01:33:27 +0400 |
| commit | 54a9190c6bcdf9482d26042eddaff2ea8b697076 (patch) | |
| tree | 729b6df6a0a9330306821bba638a893ef6362ae3 /Makefile | |
| parent | 6ba9f07c8adc17c07d559026b07c955b3cd010bb (diff) | |
Convert image loading code to 32-bit color.
Enable linking libjpeg and libpng with software refresh. Remove colormap
and alphamap loading. Move common image processing code from GL_ into
IMG_. Remove ‘screenshotpcx’ command. Define VID_BYTES and TEX_BYTES as
4.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 30 |
1 files changed, 15 insertions, 15 deletions
@@ -354,24 +354,24 @@ ifndef CONFIG_SOFTWARE_RENDERER ifndef CONFIG_NO_MD3 CFLAGS_c += -DUSE_MD3=1 endif +endif - ifndef CONFIG_NO_TGA - CFLAGS_c += -DUSE_TGA=1 - endif +ifndef CONFIG_NO_TGA + CFLAGS_c += -DUSE_TGA=1 +endif - ifdef CONFIG_PNG - PNG_CFLAGS ?= $(shell libpng-config --cflags) - PNG_LIBS ?= $(shell libpng-config --libs) - CFLAGS_c += -DUSE_PNG=1 $(PNG_CFLAGS) - LIBS_c += $(PNG_LIBS) - endif +ifdef CONFIG_PNG + PNG_CFLAGS ?= $(shell libpng-config --cflags) + PNG_LIBS ?= $(shell libpng-config --libs) + CFLAGS_c += -DUSE_PNG=1 $(PNG_CFLAGS) + LIBS_c += $(PNG_LIBS) +endif - ifdef CONFIG_JPEG - JPG_CFLAGS ?= - JPG_LIBS ?= -ljpeg - CFLAGS_c += -DUSE_JPG=1 $(JPG_CFLAGS) - LIBS_c += $(JPG_LIBS) - endif +ifdef CONFIG_JPEG + JPG_CFLAGS ?= + JPG_LIBS ?= -ljpeg + CFLAGS_c += -DUSE_JPG=1 $(JPG_CFLAGS) + LIBS_c += $(JPG_LIBS) endif ifdef CONFIG_ANTICHEAT_SERVER |