Cleanup .desktop file

[quix0rs-blobwars.git] / makefile

diff --git a/makefile b/makefile
old mode 100644 (file)
new mode 100755 (executable)
index eda1533..50e77e3
--- a/makefile
+++ b/makefile
@@ -3,9 +3,9 @@ PAKNAME = blobwars.pak
 DOCS = doc/*
 ICONS = icons/
 
-VERSION = 1.14
+VERSION = 1.18
 RELEASE = 1
-USEPAK = 1
+USEPAK = 0
 
 PREFIX=$(DESTDIR)/usr
 BINDIR = $(PREFIX)/games/
@@ -14,12 +14,14 @@ DOCDIR = $(PREFIX)/share/doc/$(PROG)/
 ICONDIR = $(PREFIX)/share/icons/hicolor/
 DESKTOPDIR = $(PREFIX)/share/applications/
 LOCALEDIR = $(PREFIX)/share/locale/
+MEDAL_SERVER_HOST = www.parallelrealities.co.uk
+MEDAL_SERVER_PORT = 80
 
 CXXFLAGS += `sdl-config --cflags` -DVERSION=$(VERSION) -DRELEASE=$(RELEASE) -DUSEPAK=$(USEPAK)
 CXXFLAGS += -DPAKNAME=\"$(PAKNAME)\" -DPAKLOCATION=\"$(DATADIR)\" -DUNIX -DGAMEPLAYMANUAL=\"$(DOCDIR)index.html\" -Wall
-CXXFLAGS += -DLOCALEDIR=\"$(LOCALEDIR)\"
+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 -lz
+LIBS = `sdl-config --libs` -lSDL_mixer -lSDL_image -lSDL_ttf -lSDL_net -lz
 
 OBJS += CAudio.o
 OBJS += CBoss.o
@@ -33,7 +35,7 @@ OBJS += CKeyboard.o
 OBJS += CJoystick.o 
 OBJS += CLineDef.o
 OBJS += CList.o
-OBJS += CMap.o CMath.o
+OBJS += CMap.o CMath.o CMedalServer.o
 OBJS += CObjective.o
 OBJS += CPak.o CParticle.o CPersistant.o CPersistData.o
 OBJS += CRadarBlip.o CReplayData.o
@@ -89,7 +91,7 @@ mapeditor: $(MAPOBJS)
 clean:
        $(RM) $(GAMEOBJS) mapEditor.o pak.o $(PROG) $(PAKNAME) pak mapeditor $(LOCALE_MO)
        
-buildpak:
+buildpak: pak
        ./pak data gfx music sound $(PAKNAME)
 
 # install
@@ -105,9 +107,8 @@ install:
        mkdir -p $(ICONDIR)64x64/apps
        mkdir -p $(DESKTOPDIR)
 
-       install -o root -g games -m 755 $(PROG) $(BINDIR)$(PROG)
-       install -o root -g games -m 644 $(PAKNAME) $(DATADIR)$(PAKNAME)
-       install -o root -g games -m 644 $(DOCS) $(DOCDIR)
+       install -m 755 $(PROG) $(BINDIR)$(PROG)
+       install -m 644 $(PAKNAME) $(DATADIR)$(PAKNAME)
        cp $(ICONS)$(PROG).png $(ICONDIR)32x32/apps/
        cp $(ICONS)$(PROG)-mini.png $(ICONDIR)16x16/apps/$(PROG).png
        cp $(ICONS)$(PROG)-large.png $(ICONDIR)64x64/apps/$(PROG).png