forked from OctaForge/OctaBuild
no need to link against stdthreads
parent
20d423b594
commit
0a10de5880
4
Makefile
4
Makefile
|
@ -10,7 +10,7 @@ OB_CXXFLAGS += -std=c++14 -I. -I$(CUBESCRIPT_PATH) -I$(OCTASTD_PATH) -pthread
|
||||||
all: obuild
|
all: obuild
|
||||||
|
|
||||||
obuild: $(FILES)
|
obuild: $(FILES)
|
||||||
$(CXX) $(CXXFLAGS) $(OB_CXXFLAGS) $(LDFLAGS) -lstdthreads -o obuild $(FILES)
|
$(CXX) $(CXXFLAGS) $(OB_CXXFLAGS) $(LDFLAGS) -o obuild $(FILES)
|
||||||
|
|
||||||
.cc.o:
|
.cc.o:
|
||||||
$(CXX) $(CXXFLAGS) $(OB_CXXFLAGS) -c -o $@ $<
|
$(CXX) $(CXXFLAGS) $(OB_CXXFLAGS) -c -o $@ $<
|
||||||
|
@ -27,4 +27,4 @@ main.o: $(CUBESCRIPT_PATH)/cubescript.hh
|
||||||
globs.o: globs.hh
|
globs.o: globs.hh
|
||||||
globs.o: $(CUBESCRIPT_PATH)/cubescript.hh
|
globs.o: $(CUBESCRIPT_PATH)/cubescript.hh
|
||||||
|
|
||||||
cubescript.o: $(CUBESCRIPT_PATH)/cubescript.hh
|
cubescript.o: $(CUBESCRIPT_PATH)/cubescript.hh
|
||||||
|
|
|
@ -11,7 +11,7 @@ OB_CXXFLAGS = [@OB_CXXFLAGS -std=c++14 -I. -I@CS_PATH -I@OS_PATH -pthread]
|
||||||
|
|
||||||
rule obuild $FILES [
|
rule obuild $FILES [
|
||||||
echo " LD" $target
|
echo " LD" $target
|
||||||
shell $CXX $OB_CXXFLAGS -lstdthreads -o obuild_ob $sources
|
shell $CXX $OB_CXXFLAGS -o obuild_ob $sources
|
||||||
]
|
]
|
||||||
|
|
||||||
rule %_ob.o %.cc [
|
rule %_ob.o %.cc [
|
||||||
|
@ -30,4 +30,4 @@ depend main_ob.o globs.hh [@CS_PATH/cubescript.hh]
|
||||||
depend globs_ob.o globs.hh [@CS_PATH/cubescript.hh]
|
depend globs_ob.o globs.hh [@CS_PATH/cubescript.hh]
|
||||||
depend cubescript_ob.o [@CS_PATH/cubescript.hh]
|
depend cubescript_ob.o [@CS_PATH/cubescript.hh]
|
||||||
|
|
||||||
rule default obuild
|
rule default obuild
|
||||||
|
|
Loading…
Reference in New Issue