Bump version and update changelog.

[quix0rs-blobwars.git] / makefile.windows

diff --git a/makefile.windows b/makefile.windows
old mode 100644 (file)
new mode 100755 (executable)
index 0f0e694..52f0ddd
--- a/makefile.windows
+++ b/makefile.windows
@@ -3,7 +3,7 @@ PAKNAME = blobwars.pak
 DOCS = doc/*
 ICONS = icons/
 
-VERSION = 1.14
+VERSION = 1.18
 RELEASE = 1
 USEPAK = 1
 
@@ -14,14 +14,16 @@ 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
 
 CXX=i586-mingw32msvc-g++
 SDLC=/home/steve/Windows/bin/sdl-config
 
 CXXFLAGS += `$(SDLC) --cflags` -DVERSION=$(VERSION) -DRELEASE=$(RELEASE) -DUSEPAK=$(USEPAK)
 CXXFLAGS += -DPAKNAME=\"$(PAKNAME)\" -DPAKLOCATION=\"\" -DGAMEPLAYMANUAL=\"doc/index.html\" -Wall
-CXXFLAGS += -DLOCALEDIR=\"\" $(CFLAGS) -pg -Werror
-LIBS = `$(SDLC) --libs` -lintl -lz -lSDL_mixer -lSDL_image -lSDL_ttf -pg -lSDLmain
+CXXFLAGS += -DLOCALEDIR=\"\" $(CFLAGS)  -DMEDAL_SERVER_HOST=\"$(MEDAL_SERVER_HOST)\" -DMEDAL_SERVER_PORT=$(MEDAL_SERVER_PORT) -Werror
+LIBS = -lmingw32 `$(SDLC) --libs` -lintl -lz -lSDL_mixer -lSDL_image -lSDL_ttf -lSDL_net -lSDL -lSDLmain -lwinmm -lgdi32 -mwindows
 
 OBJS += CAudio.o
 OBJS += CBoss.o
@@ -35,7 +37,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