Browse Source

StringUtil into tools

Odilitime 2 weeks ago
parent
commit
ac21639f77
1 changed files with 10 additions and 3 deletions
  1. 10
    3
      Makefile

+ 10
- 3
Makefile View File

@@ -18,10 +18,10 @@ ifeq ($(UNAME), Darwin)
18 18
 CXXFLAGS   = -O3 -std=c++1y -DVERSION=\"$(GIT_VERSION)\" -DPLATFORM=\"$(PLATFORM)\"
19 19
 CFLAGS	   = -O3 -std=c11 -DVERSION=\"$(GIT_VERSION)\"
20 20
 WARNINGS   =
21
-ifeq ("$(wildcard /usr/local/lib/libglfw3.dylib)","") 
21
+ifeq ("$(wildcard /usr/local/lib/libglfw3.dylib)","")
22 22
 LIBS = -lglfw3 -framework OpenGL -framework Cocoa -framework IOKit -framework CoreVideo -lGLEW -lfreetype -lharfbuzz -lmbedtls -lmbedcrypto -lmbedx509
23 23
 else
24
-ifeq ("$(wildcard /usr/local/lib/libglfw.3.dylib)","") 
24
+ifeq ("$(wildcard /usr/local/lib/libglfw.3.dylib)","")
25 25
 LIBS = -lglfw.3 -framework OpenGL -framework Cocoa -framework IOKit -framework CoreVideo -lGLEW -lfreetype -lharfbuzz -lmbedtls -lmbedcrypto -lmbedx509
26 26
 else
27 27
 LIBS = -lglfw -framework OpenGL -framework Cocoa -framework IOKit -framework CoreVideo -lGLEW -lfreetype -lharfbuzz -lmbedtls -lmbedcrypto -lmbedx509
@@ -66,11 +66,18 @@ $(OBJDIR)/platform/slre.o: $(SRCDIR)/platform/slre.c
66 66
 $(DEPDIR)/%d: ;
67 67
 .PRECIOUS: $(DEPDIR)/%.d
68 68
 
69
+test-jscpp.o: tests/testPrograms/JSParserTest.cpp
70
+	$(CXX) -MT $@ -MMD -MP -MF $(DEPDIR)/$*.Td $(CXXFLAGS) $(INCPATH) $(WARINGS) -c -o $@ $<
71
+
72
+test-js: test-jscpp.o $(OBJDIR)/parsers/scripting/javascript/JSParser.o $(OBJDIR)/tools/StringUtils.o
73
+	$(LINK) $(LDFLAGS) -o $@ test-jscpp.o $(OBJDIR)/parsers/scripting/javascript/JSParser.o $(OBJDIR)/tools/StringUtils.o  $(LIBS)
74
+
75
+
69 76
 test-url.o: tests/testPrograms/URLtest.cpp
70 77
 	$(CXX) -MT $@ -MMD -MP -MF $(DEPDIR)/$*.Td $(CXXFLAGS) $(INCPATH) $(WARINGS) -c -o $@ $<
71 78
 
72 79
 ntr-run-tests: test-url.o $(OBJDIR)/tools/URL.o $(OBJDIR)/tools/StringUtils.o
73
-	$(LINK) $(LDFLAGS) -o $@ test-url.o $(OBJDIR)/URL.o $(OBJDIR)/StringUtils.o $(LIBS)
80
+	$(LINK) $(LDFLAGS) -o $@ test-url.o $(OBJDIR)/URL.o $(OBJDIR)/tools/StringUtils.o $(LIBS)
74 81
 
75 82
 ntr-test-cfg: test-cfg.o $(OBJDIR)/tools/CFGFileParser.o $(OBJDIR)/platform/slre.o $(OBJDIR)/platform/tlsf.o $(OBJDIR)/platform/Murmur3.o
76 83
 	$(LINK) $(LDFLAGS) -o $@ $^ $(LIBS)