Fixed a makefile

2015-08-14 22:42:48 +10:00
parent b33fb66d2a
commit 68eddcfcbb
2 changed files with 1 additions and 6 deletions
@@ -8,7 +8,6 @@ all: $(OUTDIR)
 	$(MAKE) -C graphics
 	$(MAKE) -C map
 	$(MAKE) -C network
-	$(MAKE) -C ui
 	$(MAKE) -C utilities

 debug: export CXXFLAGS+=-g
@@ -10,13 +10,9 @@ CXXSRC=$(wildcard *.cpp)
 OBJDIR=obj
 OBJ+=$(addprefix $(OBJDIR)/,$(CXXSRC:.cpp=.o))

-#output
-OUTDIR=../$(OUTDIR)
-OUT=../$(OUT)
-
 #targets
 all: $(OBJ) $(OUT)
-	ar -crs $(OUT) $(OBJ)
+	ar -crs ../$(OUT) $(OBJ)

 $(OBJ): | $(OBJDIR)