Fix building pak.exe.

[quix0rs-blobwars.git] / Makefile.windows

diff --git a/Makefile.windows b/Makefile.windows
index ec57cef1b1df1228bf6db2c86696911f610b253b..33db16f6e7b75e39596c88cdfc866eab1ee259d8 100755 (executable)
--- a/Makefile.windows
+++ b/Makefile.windows
@@ -4,7 +4,7 @@ DOCS = doc/*
 ICONS = icons/
 DATA = data gfx sound music
 
-VERSION = 1.19
+VERSION = 2.00
 RELEASE ?= 1
 USEPAK ?= 1
 
@@ -20,13 +20,12 @@ MEDAL_SERVER_PORT = 80
 
 CXX = i686-w64-mingw32-g++
 
-CXXFLAGS += -std=c++11 -Dmain=SDL_main
+CXXFLAGS += -Dmain=SDL_main
 CXXFLAGS += -I/your/mingw/include
 CXXFLAGS += -DVERSION=$(VERSION) -DRELEASE=$(RELEASE) -DUSEPAK=$(USEPAK)
-CXXFLAGS += -DPAKNAME=\"$(PAKNAME)\" -DPAKLOCATION=\"\" -DGAMEPLAYMANUAL=\"doc/index.html\" -Wall
+CXXFLAGS += -DPAKNAME=\"$(PAKNAME)\" -DPAKLOCATION=\".\" -DGAMEPLAYMANUAL=\"doc/index.html\" -Wall
 CXXFLAGS += -DLOCALEDIR=\"\" $(CFLAGS)  -DMEDAL_SERVER_HOST=\"$(MEDAL_SERVER_HOST)\" -DMEDAL_SERVER_PORT=$(MEDAL_SERVER_PORT) -Werror
 LIBS = -lmingw32 -lz -lSDL2_mixer -lSDL2_image -lSDL2_ttf -lSDL2_net -lSDL2main -lSDL2 -lwinmm -lgdi32
-PAKLIBS = -lmingw32 -lz
 LDFLAGS = -L/your/mingw/lib -mwindows
 
 OBJS += CAudio.o
@@ -89,8 +88,8 @@ all: $(PROG) $(LOCALE_MO)
 $(PROG): $(GAMEOBJS)
        $(CXX) $(LDFLAGS) $(GAMEOBJS) -o $(PROG) $(LIBS)
 
-pak: $(PAKOBJS)
-       $(CXX) $(LDFLAGS) $(PAKOBJS) -o pak.exe $(PAKLIBS)
+pak.exe: $(PAKOBJS)
+       $(CXX) $(LDFLAGS) $(PAKOBJS) -o pak.exe $(LIBS)
 
 %.mo: %.po
        msgfmt -c -o $@ $<
@@ -102,7 +101,7 @@ mapeditor.exe: $(MAPOBJS)
 clean:
        $(RM) $(GAMEOBJS) mapEditor.o pak.o $(PROG) $(PAKNAME) pak.exe mapeditor.exe $(LOCALE_MO)
 
-$(PAKNAME): pak
+$(PAKNAME): pak.exe
        ./pak $(DATA) $(PAKNAME)
 
 buildpak: $(PAKNAME)