Updated PNG icon files.

[quix0rs-blobwars.git] / makefile

diff --git a/makefile b/makefile
index c59443cadbdb7c1dc8a51f22e08c5068cd5beccf..104ef0a54881e7c7962a4972be1e007125b6b794 100755 (executable)
--- a/makefile
+++ b/makefile
@@ -4,7 +4,7 @@ DOCS = doc/*
 ICONS = icons/
 DATA = data gfx sound music
 
-VERSION = 1.18
+VERSION = 1.19
 RELEASE ?= 0
 USEPAK ?= 0
 
@@ -23,6 +23,7 @@ CXXFLAGS += -DPAKNAME=\"$(PAKNAME)\" -DPAKLOCATION=\"$(DATADIR)\" -DUNIX -DGAMEP
 CXXFLAGS += -DLOCALEDIR=\"$(LOCALEDIR)\" -DMEDAL_SERVER_HOST=\"$(MEDAL_SERVER_HOST)\" -DMEDAL_SERVER_PORT=$(MEDAL_SERVER_PORT)
 CXXFLAGS += $(CFLAGS) -Werror
 LIBS = `sdl-config --libs` -lSDL_mixer -lSDL_image -lSDL_ttf -lSDL_net -lz
+PAKLIBS = -lz
 
 OBJS += CAudio.o
 OBJS += CBoss.o
@@ -82,16 +83,16 @@ all: $(ALL)
 
 # linking the program.
 $(PROG): $(GAMEOBJS)
-       $(CXX) $(LIBS) $(GAMEOBJS) -o $(PROG)
+       $(CXX) $(LDFLAGS) $(GAMEOBJS) -o $(PROG) $(LIBS)
        
 pak: $(PAKOBJS)
-       $(CXX) $(LIBS) $(PAKOBJS) -o pak
+       $(CXX) $(LDFLAGS) $(PAKOBJS) -o pak $(PAKLIBS)
 
 %.mo: %.po
        msgfmt -c -o $@ $<
 
 mapeditor: $(MAPOBJS)
-       $(CXX) $(LIBS) $(MAPOBJS) -o mapeditor
+       $(CXX) $(LDFLAGS) $(MAPOBJS) -o mapeditor $(LIBS)
 
 # cleaning everything that can be automatically recreated with "make".
 clean:
@@ -109,6 +110,7 @@ install: $(ALL)
        mkdir -p $(DESTDIR)$(DOCDIR)
        mkdir -p $(DESTDIR)$(ICONDIR)16x16/apps
        mkdir -p $(DESTDIR)$(ICONDIR)32x32/apps
+       mkdir -p $(DESTDIR)$(ICONDIR)48x48/apps
        mkdir -p $(DESTDIR)$(ICONDIR)64x64/apps
        mkdir -p $(DESTDIR)$(DESKTOPDIR)
 
@@ -118,9 +120,11 @@ ifeq ($(USEPAK), 1)
 else
        cp -pr $(DATA) $(DESTDIR)$(DATADIR)
 endif
-       cp -p $(ICONS)$(PROG).png $(DESTDIR)$(ICONDIR)32x32/apps/
-       cp -p $(ICONS)$(PROG)-mini.png $(DESTDIR)$(ICONDIR)16x16/apps/$(PROG).png
-       cp -p $(ICONS)$(PROG)-large.png $(DESTDIR)$(ICONDIR)64x64/apps/$(PROG).png
+       cp -p $(DOCS) $(DESTDIR)$(DOCDIR)
+       cp -p $(ICONS)$(PROG)16x16.png $(DESTDIR)$(ICONDIR)16x16/apps/$(PROG).png
+       cp -p $(ICONS)$(PROG)32x32.png $(DESTDIR)$(ICONDIR)32x32/apps/$(PROG).png
+       cp -p $(ICONS)$(PROG)48x48.png $(DESTDIR)$(ICONDIR)48x48/apps/$(PROG).png
+       cp -p $(ICONS)$(PROG)64x64.png $(DESTDIR)$(ICONDIR)64x64/apps/$(PROG).png
        cp -p $(ICONS)$(PROG).desktop $(DESTDIR)$(DESKTOPDIR)
 
        @for f in $(LOCALE_MO); do \