From 87d49881e02bfd0ada60d183c71737205e688e9d Mon Sep 17 00:00:00 2001 From: Guus Sliepen Date: Sat, 21 Nov 2015 20:45:17 +0100 Subject: [PATCH] Fix building pak.exe. --- Makefile.windows | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Makefile.windows b/Makefile.windows index d4adc68..33db16f 100755 --- a/Makefile.windows +++ b/Makefile.windows @@ -26,7 +26,6 @@ CXXFLAGS += -DVERSION=$(VERSION) -DRELEASE=$(RELEASE) -DUSEPAK=$(USEPAK) 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) -- 2.39.5