Added .gitignore to ignore certain files + fixed access rights on Makefile* as

[quix0rs-blobwars.git] / Makefile.windows

diff --git a/Makefile.windows b/Makefile.windows
old mode 100755 (executable)
new mode 100644 (file)
index 245b951..417d6ac
--- 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
 
@@ -23,11 +23,10 @@ CXX = i686-w64-mingw32-g++
 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
+LDFLAGS = -L/your/mingw/lib
 
 OBJS += CAudio.o
 OBJS += CBoss.o
@@ -87,22 +86,22 @@ all: $(PROG) $(LOCALE_MO)
 
 # linking the program.
 $(PROG): $(GAMEOBJS)
-       $(CXX) $(LDFLAGS) $(GAMEOBJS) -o $(PROG) $(LIBS)
+       $(CXX) $(LDFLAGS) $(GAMEOBJS) -o $(PROG) $(LIBS) -mwindows -static-libgcc
 
-pak: $(PAKOBJS)
-       $(CXX) $(LDFLAGS) $(PAKOBJS) -o pak.exe $(PAKLIBS)
+pak.exe: $(PAKOBJS)
+       $(CXX) $(LDFLAGS) $(PAKOBJS) -o pak.exe $(LIBS)
 
 %.mo: %.po
        msgfmt -c -o $@ $<
 
 mapeditor.exe: $(MAPOBJS)
-       $(CXX) $(LDFLAGS) $(MAPOBJS) -o mapeditor.exe $(LIBS)
+       $(CXX) $(LDFLAGS) $(MAPOBJS) -o mapeditor.exe $(LIBS) -mwindows
 
 # cleaning everything that can be automatically recreated with "make".
 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)