Skip to content

Commit 45b83b7

Browse files
committed
Made Makefile respond properly to UnitTest++.a not being present on the first build
1 parent 5e3b94f commit 45b83b7

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
export OBJ_HOME := $(realpath obj)
22
export SRC_HOME := $(realpath src)
33
export INCL_HOME := $(realpath include)
4-
export TEST_LINK_FILES := $(realpath UnitTest++/libUnitTest++.a)
4+
export TEST_LINK_FILES := $(realpath UnitTest++)/libUnitTest++.a
55
export TEST_INCLUDE := $(realpath UnitTest++/src)
66
export EXECUTABLE := warsofcatan
77
ALLFILES := $(wildcard $(SRC_HOME)/*) $(wildcard $(INCL_HOME)/*)
88
export CXX := g++
99
export LD := g++
10-
export CXXFLAGS := -g -I$(INCL_HOME) -std=c++0x -Wall -I/usr/local/include
11-
export LDFLAGS := -L/usr/local/lib -lSDL2 -lGL -lGLU -Wl,-R/usr/local/lib
10+
export CXXFLAGS := -g -I$(INCL_HOME) -std=c++0x -Wall
11+
export LDFLAGS := -L/usr/local/lib -lSDL2 -lGL -lGLU
1212

1313
.PHONY: all
1414
all: $(EXECUTABLE)

0 commit comments

Comments
 (0)