projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20131024-1-src
[rocksndiamonds.git]
/
src
/
Makefile
diff --git
a/src/Makefile
b/src/Makefile
index 646631a83456276606e42305da8080c2331faee1..ba62729531060854df71a8cf061bcdc671ffe93d 100644
(file)
--- a/
src/Makefile
+++ b/
src/Makefile
@@
-30,9
+30,11
@@
RANLIB = ranlib
ETAGS = etags
RM = rm -f
ETAGS = etags
RM = rm -f
-BMP2ICO = bmp2ico
+CONVERT = convert
WINDRES = windres
WINDRES = windres
+CONVERT_ICON_ARGS = -transparent black -background transparent
+
PROGBASE = rocksndiamonds
ifdef SPECIAL_EDITION # create special edition
PROGBASE = rocksndiamonds
ifdef SPECIAL_EDITION # create special edition
@@
-108,7
+110,7
@@
endif
ifeq ($(TARGET),sdl-static) # compiling for SDL target (static)
SYS_CFLAGS = -DTARGET_SDL $(shell sdl-config --cflags)
ifeq ($(TARGET),sdl-static) # compiling for SDL target (static)
SYS_CFLAGS = -DTARGET_SDL $(shell sdl-config --cflags)
-SDL_LIBS = -lSDL_image -lSDL_mixer -lSDL_net -lsmpeg
+SDL_LIBS = -lSDL_image -lSDL_mixer -lSDL_net -lsmpeg
-lmikmod
SYS_LDFLAGS = $(SDL_LIBS) $(shell sdl-config --static-libs)
endif
SYS_LDFLAGS = $(SDL_LIBS) $(shell sdl-config --static-libs)
endif
@@
-235,13
+237,16
@@
RNDLIBS = $(LIBGAME) $(GAME_EM) $(GAME_SP)
AUTOCONF = conf_gfx.h conf_snd.h conf_mus.h
ICONBASE = windows_icon
AUTOCONF = conf_gfx.h conf_snd.h conf_mus.h
ICONBASE = windows_icon
+ICON_BASEPATH = ../Special/Icons/windows_icons
ifeq ($(PLATFORM),cross-win32)
ifdef SPECIAL_EDITION
ifeq ($(PLATFORM),cross-win32)
ifdef SPECIAL_EDITION
-ICONSUFFIX = 32x32_$(SPECIAL_EDITION)
+# ICONSUFFIX = 32x32_$(SPECIAL_EDITION)
+ICON_PATH = $(ICON_BASEPATH)/$(SPECIAL_EDITION)
else
else
-ICONSUFFIX = 32x32
+# ICONSUFFIX = 32x32
+ICON_PATH = $(ICON_BASEPATH)/default
endif
endif
-ICON32X32 = ../graphics/$(ICONBASE)_$(ICONSUFFIX).bmp
+
#
ICON32X32 = ../graphics/$(ICONBASE)_$(ICONSUFFIX).bmp
ICON = $(ICONBASE).o
endif
ICON = $(ICONBASE).o
endif
@@
-291,7
+296,8
@@
$(TIMESTAMP_FILE): $(SRCS) $(LIBGAME) $(GAME_EM) $(GAME_SP)
> $(TIMESTAMP_FILE)
$(ICON):
> $(TIMESTAMP_FILE)
$(ICON):
- $(BMP2ICO) -transparent $(ICONBASE).ico $(ICON32X32)
+# $(CONVERT) $(ICON32X32) $(CONVERT_ICON_ARGS) $(ICONBASE).ico
+ $(CONVERT) $(ICON_PATH)/*.png $(CONVERT_ICON_ARGS) $(ICONBASE).ico
echo "$(ICONBASE) ICON $(ICONBASE).ico" | $(WINDRES) -o $(ICON)
.c.o:
echo "$(ICONBASE) ICON $(ICONBASE).ico" | $(WINDRES) -o $(ICON)
.c.o: