diff --git a/client/makefile b/client/makefile index f40e00e..4ad74f5 100644 --- a/client/makefile +++ b/client/makefile @@ -1,7 +1,8 @@ #config LIBDIR=../libs -LIB=-lmingw32 -lSDLmain -lSDL $(LIBDIR)/out/libCodebase.a $(LIBDIR)/out/libSDL_net.a -INCLUDES=$(LIBDIR)/Codebase $(LIBDIR)/SDL_net ../common +LOCALLIBS=$(LIBDIR)/out/libCodebase.a +LIB=$(LOCALLIBS) -lSDL_net -lwsock32 -liphlpapi -lmingw32 -lSDLmain -lSDL +INCLUDES=$(LIBDIR)/Codebase ../common CXXFLAGS+=-std=c++11 -DDEBUG $(addprefix -I,$(INCLUDES)) #source diff --git a/libs/makefile b/libs/makefile index 8599d44..ad7c29e 100644 --- a/libs/makefile +++ b/libs/makefile @@ -1,8 +1,8 @@ OUTDIR=out all: $(OUTDIR) - $(MAKE) -C codebase $(MAKE) -C SDL_net + $(MAKE) -C codebase $(OUTDIR): mkdir $(OUTDIR) diff --git a/server/makefile b/server/makefile index 3df7ea7..df4b9f1 100644 --- a/server/makefile +++ b/server/makefile @@ -1,8 +1,8 @@ #config LIBDIR=../libs -LOCALLIBS=$(LIBDIR)/out/libCodebase.a $(LIBDIR)/out/libSDL_net.a -LIB=$(LOCALLIBS) -lwsock32 -liphlpapi -lmingw32 -lSDLmain -lSDL -INCLUDES=$(LIBDIR)/Codebase $(LIBDIR)/SDL_net ../common +LOCALLIBS=$(LIBDIR)/out/libCodebase.a +LIB=$(LOCALLIBS) -lSDL_net -lwsock32 -liphlpapi -lmingw32 -lSDLmain -lSDL +INCLUDES=$(LIBDIR)/Codebase ../common CXXFLAGS+=-std=c++11 -DDEBUG $(addprefix -I,$(INCLUDES)) #source