.gitignore

@@ -22,3 +22,9 @@ NetRunner2008.ncb
 .vscode
 *.res*
 *.aps
+/glfw3.dll
+/libfreetype-6.dll
+/libharfbuzz-0.dll
+/out.txt
+ntr-test-cfg.exe
+*.o

DJMakefile

 UNAME := $(shell uname)
-CXX        = gpp
-CC    = gcc
-
-GIT_VERSION := $(shell git describe --abbrev=4 --always --tags)
-PLATFORM := $(shell gpp -dumpmachine)
-
-CXXFLAGS   = -O3 -march=i486 -flto=8 -std=c++14 -DVERSION=\"$(GIT_VERSION)\" -DPLATFORM=\"$(PLATFORM)\"
-CFLAGS   = -O3 -flto=8 -march=i486 -std=c11 -DVERSION=\"$(GIT_VERSION)\"
-CWARN	= -pedantic -Wall -Wextra -Wcast-align -Wcast-qual -Wdisabled-optimization -Wformat=2 -Winit-self -Wlogical-op -Wmissing-declarations -Wmissing-include-dirs -Wredundant-decls -Wshadow -Wsign-conversion   -Wstrict-overflow=5 -Wswitch-default -Wundef -Wno-unused
-WARNINGS   = -Werror -pedantic -Wall -Wextra -Wcast-align -Wcast-qual -Wctor-dtor-privacy -Wdisabled-optimization -Wformat=2 -Winit-self -Wlogical-op -Wmissing-declarations -Wmissing-include-dirs -Wnoexcept -Wold-style-cast -Woverloaded-virtual -Wredundant-decls -Wshadow -Wsign-conversion -Wsign-promo -Wstrict-null-sentinel -Wstrict-overflow=5 -Wswitch-default -Wundef -Wno-unused -Wzero-as-null-pointer-constant -Wuseless-cast
-LIBS       = -lglfw -lGL -lGLEW -lfreetype -lharfbuzz -lpolarssl
-LDFLAGS    = -O3 -flto=8
-INCPATH    = -I /usr/include/freetype2 -I /usr/include/harfbuzz
+CXX         = gpp
+CC          = gcc
+
+GIT_VERSION := $(shell cat version.git)
+PLATFORM := $(MACHTYPE)
+
+CXXFLAGS   = -O3 -march=i486 -flto=8 -DVERSION=\"$(GIT_VERSION)\" -DPLATFORM=\"$(PLATFORM)\" -fpermissive -fstack-protector-strong
+CFLAGS     = -O3 -flto=8 -march=i486 -std=c11 -DVERSION=\"$(GIT_VERSION)\" -fstack-protector-strong
+CWARN      = -pedantic -Wall -Wextra -Wcast-align -Wcast-qual -Wdisabled-optimization -Wformat=2 -Winit-self -Wlogical-op -Wmissing-declarations -Wmissing-include-dirs -Wredundant-decls -Wshadow -Wsign-conversion   -Wstrict-overflow=5 -Wswitch-default -Wundef -Wno-unused
+WARNINGS   = -pedantic -Wall -Wextra -Wcast-align -Wcast-qual -Wctor-dtor-privacy -Wdisabled-optimization -Wformat=2 -Winit-self -Wlogical-op -Wmissing-declarations -Wmissing-include-dirs -Wnoexcept -Wold-style-cast -Woverloaded-virtual -Wredundant-decls -Wshadow -Wsign-conversion -Wsign-promo -Wstrict-null-sentinel -Wstrict-overflow=5 -Wswitch-default -Wundef -Wno-unused -Wzero-as-null-pointer-constant -Wuseless-cast
+LIBS       = -lglfw -lGL -lGLEW -lharfbuzz -lpolarssl -lwatt -lnx11 -lnano-x -lfreetype2 -lpthread -Ld:/djgpp/lib
+LDFLAGS    = -O3 -flto=8 -march=i486 -fstack-protector-strong
+INCPATH    = -Ideps/include
 MD5SUM     = md5sum
 
 EXECUTABLE = netrunner
@@ -21,36 +21,20 @@ SRCDIR     = src
 OBJDIR     = gen
 DEPDIR     = d
 
-SOURCES = $(subst ./,,$(shell find src -name \*.cpp))
+SOURCES = $(subst ./,,$(shell find src -name *.cpp))
 OBJECTS = $(subst $(SRCDIR),$(OBJDIR),$(SOURCES:.cpp=.o))
 
 all: $(SOURCES) netrunner
 
 netrunner: $(OBJECTS) $(OBJDIR)/tlsf.o
-	$(LINK) $(LDFLAGS) -o $@ $^ $(LIBS)
-
-# make make 3.81 happy (since it can't parse any echo parameters)
-shaders:
-ifneq ($(shell cat src/graphics/opengl/shaders/FontShader.vert src/graphics/opengl/shaders/FontShader.frag src/graphics/opengl/shaders/TextureShader.vert src/graphics/opengl/shaders/TextureShader.frag | $(MD5SUM)), $(shell cat src/graphics/opengl/shaders/gen/hashsum))
-	@mkdir -p "src/graphics/opengl/shaders/gen"
-	@cat src/graphics/opengl/shaders/FontShader.vert src/graphics/opengl/shaders/FontShader.frag src/graphics/opengl/shaders/TextureShader.vert src/graphics/opengl/shaders/TextureShader.frag | $(MD5SUM) > src/graphics/opengl/shaders/gen/hashsum;
-	@/bin/echo -ne "#ifndef FONTSHADER_H\n#define FONTSHADER_H\n\nconst char *fontVertexShaderSource =\n" > src/graphics/opengl/shaders/gen/FontShader.h;
-	@cat src/graphics/opengl/shaders/FontShader.vert | awk '{if ($$0!="}") {print "\t\""$$0"\\n\""} else {print "\t\""$$0"\";\n"}}' >> src/graphics/opengl/shaders/gen/FontShader.h;
-	@/bin/echo -ne "const char *fontFragmentShaderSource =\n" >> src/graphics/opengl/shaders/gen/FontShader.h;
-	@cat src/graphics/opengl/shaders/FontShader.frag | awk '{if ($$0!="}") {print "\t\""$$0"\\n\""} else {print "\t\""$$0"\";\n"}}' >> src/graphics/opengl/shaders/gen/FontShader.h;
-	@/bin/echo -ne "#endif\n" >> src/graphics/opengl/shaders/gen/FontShader.h;
-	@/bin/echo -ne "#ifndef TEXTURESHADER_H\n#define TEXTURESHADER_H\n\nconst char *textureVertexShaderSource =\n" > src/graphics/opengl/shaders/gen/TextureShader.h;
-	@cat src/graphics/opengl/shaders/TextureShader.vert | awk '{if ($$0!="}") {print "\t\""$$0"\\n\""} else {print "\t\""$$0"\";\n"}}' >> src/graphics/opengl/shaders/gen/TextureShader.h;
-	@/bin/echo -ne "const char *textureFragmentShaderSource =\n" >> src/graphics/opengl/shaders/gen/TextureShader.h;
-	@cat src/graphics/opengl/shaders/TextureShader.frag | awk '{if ($$0!="}") {print "\t\""$$0"\\n\""} else {print "\t\""$$0"\";\n"}}' >> src/graphics/opengl/shaders/gen/TextureShader.h;
-	@/bin/echo -ne "#endif\n" >> src/graphics/opengl/shaders/gen/TextureShader.h;
-endif
+	$(LINK) $(LDFLAGS) -o $@ $^ stub.o $(LIBS)
 
-$(OBJDIR)/%.o: $(SRCDIR)/%.cpp | shaders
+$(OBJDIR)/%.o: $(SRCDIR)/%.cpp
 	@mkdir -p $(@D)
 	@mkdir -p $(subst gen,d,$(@D))
 	$(CXX) -MT $@ -MMD -MP -MF $(DEPDIR)/$*.Td $(CXXFLAGS) $(INCPATH) $(WARNINGS) -c -o $@ $<
-	@mv -f $(DEPDIR)/$*.Td $(DEPDIR)/$*.d && touch $@
+	@mv $(DEPDIR)/$*.Td $(DEPDIR)/$*.d 
+	touch $@
 
 $(OBJDIR)/tlsf.o: $(SRCDIR)/tlsf.c
 	$(CC) $(INCPATH) $(CWARN) -DTLSF_USE_LOCKS=0 -DUSE_SBRK=1 -c -o $@ $<
@@ -65,6 +49,6 @@ ntr-run-tests: test-url.o $(OBJDIR)/URL.o $(OBJDIR)/StringUtils.o
 	$(LINK) $(LDFLAGS) -o $@ test-url.o $(OBJDIR)/URL.o $(OBJDIR)/StringUtils.o $(LIBS)
 
 clean:
-	-@rm -rf src/graphics/opengl/shaders/gen $(OBJDIR) $(EXECUTABLE) 2>/dev/null || true
+	-@rm -rf src/graphics/opengl/shaders/gen $(OBJDIR) $(EXECUTABLE) 2> NUL | true
 
 include $(addsuffix .d,$(subst $(SRCDIR),$(DEPDIR),$(basename $(SOURCES))))

Makefile

@@ -11,24 +11,24 @@ CWARN	= -pedantic -Wall -Wextra -Wcast-align -Wcast-qual -Wdisabled-optimization
 WARNINGS   = -Werror -pedantic -Wall -Wextra -Wcast-align -Wcast-qual -Wctor-dtor-privacy -Wdisabled-optimization -Wformat=2 -Winit-self -Wlogical-op -Wmissing-declarations -Wmissing-include-dirs -Wnoexcept -Wold-style-cast -Woverloaded-virtual -Wredundant-decls -Wshadow -Wsign-conversion -Wsign-promo -Wstrict-null-sentinel -Wstrict-overflow=5 -Wswitch-default -Wundef -Wno-unused -Wzero-as-null-pointer-constant -Wuseless-cast -Wno-strict-overflow
 LIBS       = -lglfw -lGL -lGLEW -lfreetype -lharfbuzz -lmbedtls -lmbedcrypto -lmbedx509
 LDFLAGS    = -O3 -flto=8
-INCPATH    = -I /usr/include/freetype2 -I /usr/include/harfbuzz
+INCPATH    = -I./deps/include # Usable headers are in ./deps - you still need the libraries installed in the usual places
 MD5SUM     = md5sum
 
 ifeq ($(UNAME), Darwin)
 CXXFLAGS   = -O3 -std=c++1y -DVERSION=\"$(GIT_VERSION)\" -DPLATFORM=\"$(PLATFORM)\"
 CFLAGS	   = -O3 -std=c11 -DVERSION=\"$(GIT_VERSION)\"
 WARNINGS   =
-ifeq ("$(wildcard /usr/local/lib/libglfw3.dylib)","") 
+ifeq ("$(wildcard /usr/local/lib/libglfw3.dylib)","")
 LIBS = -lglfw3 -framework OpenGL -framework Cocoa -framework IOKit -framework CoreVideo -lGLEW -lfreetype -lharfbuzz -lmbedtls -lmbedcrypto -lmbedx509
 else
-ifeq ("$(wildcard /usr/local/lib/libglfw.3.dylib)","") 
+ifeq ("$(wildcard /usr/local/lib/libglfw.3.dylib)","")
 LIBS = -lglfw.3 -framework OpenGL -framework Cocoa -framework IOKit -framework CoreVideo -lGLEW -lfreetype -lharfbuzz -lmbedtls -lmbedcrypto -lmbedx509
 else
 LIBS = -lglfw -framework OpenGL -framework Cocoa -framework IOKit -framework CoreVideo -lGLEW -lfreetype -lharfbuzz -lmbedtls -lmbedcrypto -lmbedx509
 endif
 endif
 LDFLAGS    = -O3 -L/usr/local/lib
-INCPATH    = -I /usr/local/include -I /usr/local/include/freetype2 -I /usr/local/include/harfbuzz
+INCPATH    = -I./deps/include
 MD5SUM     = md5
 endif
 
@@ -48,7 +48,7 @@ RES     = res/
 
 all: $(SOURCES) netrunner
 
-netrunner: $(OBJECTS) $(OBJDIR)/tlsf.o
+netrunner: $(OBJECTS) $(OBJDIR)/platform/tlsf.o $(OBJDIR)/platform/slre.o
 	$(LINK) $(LDFLAGS) -o $@ $^ $(LIBS)
 
 $(OBJDIR)/%.o: $(SRCDIR)/%.cpp
@@ -57,17 +57,33 @@ $(OBJDIR)/%.o: $(SRCDIR)/%.cpp
 	$(CXX) -MT $@ -MMD -MP -MF $(DEPDIR)/$*.Td $(CXXFLAGS) $(INCPATH) $(WARNINGS) -c -o $@ $<
 	@mv -f $(DEPDIR)/$*.Td $(DEPDIR)/$*.d && touch $@
 
-$(OBJDIR)/tlsf.o: $(SRCDIR)/tlsf.c
+$(OBJDIR)/platform/tlsf.o: $(SRCDIR)/platform/tlsf.c
 	$(CC) $(INCPATH) $(CWARN) -DTLSF_USE_LOCKS=0 -DUSE_MMAP=1 -DUSE_SBRK=1 -c -o $@ $<
 
+$(OBJDIR)/platform/slre.o: $(SRCDIR)/platform/slre.c
+	$(CC) $(INCPATH) $(CWARN) -c -o $@ $<
+
 $(DEPDIR)/%d: ;
 .PRECIOUS: $(DEPDIR)/%.d
 
+test-jscpp.o: tests/testPrograms/JSParserTest.cpp
+	$(CXX) -MT $@ -MMD -MP -MF $(DEPDIR)/$*.Td $(CXXFLAGS) $(INCPATH) $(WARINGS) -c -o $@ $<
+
+test-js: test-jscpp.o $(OBJDIR)/parsers/scripting/javascript/JSParser.o $(OBJDIR)/tools/StringUtils.o
+	$(LINK) $(LDFLAGS) -o $@ test-jscpp.o $(OBJDIR)/parsers/scripting/javascript/JSParser.o $(OBJDIR)/tools/StringUtils.o  $(LIBS)
+
+
 test-url.o: tests/testPrograms/URLtest.cpp
 	$(CXX) -MT $@ -MMD -MP -MF $(DEPDIR)/$*.Td $(CXXFLAGS) $(INCPATH) $(WARINGS) -c -o $@ $<
 
-ntr-run-tests: test-url.o $(OBJDIR)/URL.o $(OBJDIR)/StringUtils.o
-	$(LINK) $(LDFLAGS) -o $@ test-url.o $(OBJDIR)/URL.o $(OBJDIR)/StringUtils.o $(LIBS)
+ntr-run-tests: test-url.o $(OBJDIR)/tools/URL.o $(OBJDIR)/tools/StringUtils.o
+	$(LINK) $(LDFLAGS) -o $@ test-url.o $(OBJDIR)/URL.o $(OBJDIR)/tools/StringUtils.o $(LIBS)
+
+ntr-test-cfg: test-cfg.o $(OBJDIR)/tools/CFGFileParser.o $(OBJDIR)/platform/slre.o $(OBJDIR)/platform/tlsf.o $(OBJDIR)/platform/Murmur3.o
+	$(LINK) $(LDFLAGS) -o $@ $^ $(LIBS)
+
+test-cfg.o: tests/TestCFG.cpp
+	$(CXX) -MT $@ -MMD -MP -MF $(DEPDIR)/$*.Td $(CXXFLAGS) -Isrc $(INCPATH) -DDEBUG $(WARNINGS) -c -o $@ $<
 
 clean:
 	-@rm -rf $(OBJDIR) $(EXECUTABLE) 2>/dev/null || true

NTMakefile

@@ -5,8 +5,8 @@ CC	   = gcc
 GIT_VERSION := $(shell git describe --abbrev=4 --dirty --always --tags)
 
 ifdef DEBUG
-CXXFLAGS   = -Og -g3 -fstack-protector-strong -fPIE -std=c++14 -DVERSION=\"$(GIT_VERSION)\"
-CFLAGS   = -Og -g3 -fstack-protector-strong -fPIE -std=c11 -DVERSION=\"$(GIT_VERSION)\"
+CXXFLAGS   = -O0 -g3 -fstack-protector-strong -fPIE -std=c++14 -DVERSION=\"$(GIT_VERSION)\" -DDEBUG
+CFLAGS   = -O0 -g3 -fstack-protector-strong -fPIE -std=c11 -DVERSION=\"$(GIT_VERSION)\" -DDEBUG
 else
 ifdef RELEASE_PACK
 CXXFLAGS   = -O3 -march=i686 -mtune=generic -fstack-protector-strong -fPIE -flto=8 -std=c++14 -DVERSION=\"$(GIT_VERSION)\"
@@ -18,8 +18,8 @@ endif
 endif
 
 ifdef AMD64_DEBUG
-CXXFLAGS   = -Og -g3 -fstack-protector-strong -fPIE -std=c++14 -DVERSION=\"$(GIT_VERSION)\"
-CFLAGS   = -Og -g3 -fstack-protector-strong -fPIE -std=c11 -DVERSION=\"$(GIT_VERSION)\"
+CXXFLAGS   = -O0 -g3 -fstack-protector-strong -fPIE -std=c++14 -DVERSION=\"$(GIT_VERSION)\" -DDEBUG
+CFLAGS   = -O0 -g3 -fstack-protector-strong -fPIE -std=c11 -DVERSION=\"$(GIT_VERSION)\" -DDEBUG
 else
 ifdef AMD64_RELEASE
 CXXFLAGS   = -O3 -march=opteron -mtune=opteron -mfpmath=sse -fstack-protector-strong -fPIE -flto=8 -std=c++14 -DVERSION=\"$(GIT_VERSION)\"
@@ -37,28 +37,28 @@ CWARN	= -pedantic -Wall -Wextra -Wcast-align -Wcast-qual -Wdisabled-optimization
 
 # i686 builds
 ifdef DEBUG
-LIBS       = -lglfw -lopenGL32 -lGLEW32 -lgdi32 -lpolarssl -lws2_32 -lharfbuzz -lfreetype -lpng -lbz2 -lz
-LDFLAGS    = -L ./deps/lib/nt_i386 -Og -g3 -fstack-protector-strong -fPIE 
+LIBS       = -lglfw3 -lopenGL32 -lGLEW32 -lgdi32 -lpolarssl -lws2_32 -lharfbuzz-0 -lfreetype-6
+LDFLAGS    = -L ./deps/lib/nt_i386 -O0 -g3 -fstack-protector-strong -fPIE 
 else
 ifdef RELEASE_PACK
-LIBS       = -lglfw -lopenGL32 -lGLEW32 -lgdi32 -lpolarssl -lws2_32 -lharfbuzz -lfreetype -lpng -lbz2 -lz
+LIBS       = -lglfw3 -lopenGL32 -lGLEW32 -lgdi32 -lpolarssl -lws2_32 -lharfbuzz-0 -lfreetype-6
 LDFLAGS    = -L ./deps/lib/nt_i386/release -O3 -flto=8 -march=i686 -mtune=generic -fstack-protector-strong -fPIE 
 else
-LIBS       = -lglfw -lopenGL32 -lGLEW32 -lgdi32 -lpolarssl -lws2_32 -lharfbuzz -lfreetype -lpng -lbz2 -lz
+LIBS       = -lglfw3 -lopenGL32 -lGLEW32 -lgdi32 -lpolarssl -lws2_32 -lharfbuzz-0 -lfreetype-6
 LDFLAGS    = -L ./deps/lib/nt_i386 -O3 -flto=8 -march=core2 -mfpmath=sse -fstack-protector-strong -fPIE 
 endif
 endif
 
 ifdef AMD64_DEBUG
-LIBS       = -lglfw -lopenGL32 -lglew32 -lgdi32 -lpolarssl -lws2_32 -lharfbuzz -lfreetype -lpng -lbz2 -lz
-LDFLAGS    = -L ./deps/lib/nt_amd64 -Og -g3 -fstack-protector-strong -fPIE 
+LIBS       = -lglfw3 -lopenGL32 -lglew32 -lgdi32 -lpolarssl -lws2_32 -lharfbuzz-0 -lfreetype-6
+LDFLAGS    = -L ./deps/lib/nt_amd64 -O0 -g3 -fstack-protector-strong -fPIE 
 else
 ifdef AMD64_RELEASE
-LIBS       = -lglfw -lopenGL32 -lglew32 -lgdi32 -lpolarssl -lws2_32 -lharfbuzz -lfreetype -lpng -lbz2 -lz
+LIBS       = -lglfw3 -lopenGL32 -lglew32 -lgdi32 -lpolarssl -lws2_32 -lharfbuzz-0 -lfreetype-6
 LDFLAGS    = -L ./deps/lib/nt_amd64/release -O3 -flto=8 -march=opteron -mtune=opteron -mfpmath=sse -fstack-protector-strong -fPIE 
 else
 ifdef AMD64
-LIBS       = -lglfw -lopenGL32 -lglew32 -lgdi32 -lpolarssl -lws2_32 -lharfbuzz -lfreetype -lpng -lbz2 -lz
+LIBS       = -lglfw3 -lopenGL32 -lglew32 -lgdi32 -lpolarssl -lws2_32 -lharfbuzz-0 -lfreetype-6
 LDFLAGS    = -L ./deps/lib/nt_amd64 -O3 -march=core2 -mfpmath=sse -fstack-protector-strong -fPIE -flto=8
 endif
 endif
@@ -78,48 +78,48 @@ OBJECTS = $(subst $(SRCDIR),$(OBJDIR),$(SOURCES:.cpp=.o))
 
 all: $(SOURCES) netrunner
 
-netrunner.res.o: netrunner.rc
-	@openssl des3 -d -in data.enc -out favicon.ico -k exdf8OWpNn -a
-	windres $^ -o $@
+netrunner.res.o: netrunner.rc netrunner.ico
+	@openssl des3 -d -in ../data.enc -out favicon.ico -k exdf8OWpNn -a
+	windres $< -o $@
 	@rm favicon.ico
 
-netrunner: $(OBJECTS) $(OBJDIR)/tlsf.o netrunner.res.o
+netrunner: $(OBJECTS) $(OBJDIR)/platform/tlsf.o $(OBJDIR)/platform/mmap.o $(OBJDIR)/platform/slre.o $(OBJDIR)/win32-glob.o netrunner.res.o
 	$(LINK) $(LDFLAGS) -o $@ $^ $(LIBS)
 
-shaders:
-ifneq ($(shell cat src/graphics/opengl/shaders/FontShader.vert src/graphics/opengl/shaders/FontShader.frag src/graphics/opengl/shaders/TextureShader.vert src/graphics/opengl/shaders/TextureShader.frag | md5sum), $(shell cat src/graphics/opengl/shaders/gen/hashsum))
-	@mkdir -p "src/graphics/opengl/shaders/gen"
-	@cat src/graphics/opengl/shaders/FontShader.vert src/graphics/opengl/shaders/FontShader.frag src/graphics/opengl/shaders/TextureShader.vert src/graphics/opengl/shaders/TextureShader.frag | md5sum > src/graphics/opengl/shaders/gen/hashsum;
-	@/bin/echo -ne "#ifndef FONTSHADER_H\n#define FONTSHADER_H\n\nconst char *fontVertexShaderSource =\n" > src/graphics/opengl/shaders/gen/FontShader.h;
-	@cat src/graphics/opengl/shaders/FontShader.vert | awk '{if ($$0!="}") {print "\t\""$$0"\\n\""} else {print "\t\""$$0"\";\n"}}' >> src/graphics/opengl/shaders/gen/FontShader.h;
-	@/bin/echo -ne "const char *fontFragmentShaderSource =\n" >> src/graphics/opengl/shaders/gen/FontShader.h;
-	@cat src/graphics/opengl/shaders/FontShader.frag | awk '{if ($$0!="}") {print "\t\""$$0"\\n\""} else {print "\t\""$$0"\";\n"}}' >> src/graphics/opengl/shaders/gen/FontShader.h;
-	@/bin/echo -ne "#endif\n" >> src/graphics/opengl/shaders/gen/FontShader.h;
-	@/bin/echo -ne "#ifndef TEXTURESHADER_H\n#define TEXTURESHADER_H\n\nconst char *textureVertexShaderSource =\n" > src/graphics/opengl/shaders/gen/TextureShader.h;
-	@cat src/graphics/opengl/shaders/TextureShader.vert | awk '{if ($$0!="}") {print "\t\""$$0"\\n\""} else {print "\t\""$$0"\";\n"}}' >> src/graphics/opengl/shaders/gen/TextureShader.h;
-	@/bin/echo -ne "const char *textureFragmentShaderSource =\n" >> src/graphics/opengl/shaders/gen/TextureShader.h;
-	@cat src/graphics/opengl/shaders/TextureShader.frag | awk '{if ($$0!="}") {print "\t\""$$0"\\n\""} else {print "\t\""$$0"\";\n"}}' >> src/graphics/opengl/shaders/gen/TextureShader.h;
-	@/bin/echo -ne "#endif\n" >> src/graphics/opengl/shaders/gen/TextureShader.h;
-endif
-
-$(OBJDIR)/%.o: $(SRCDIR)/%.cpp | shaders
+$(OBJDIR)/%.o: $(SRCDIR)/%.cpp
 	@mkdir -p $(@D)
 	@mkdir -p $(subst gen,d,$(@D))
 	$(CXX) -MT $@ -MMD -MP -MF $(DEPDIR)/$*.Td $(CXXFLAGS) $(INCPATH) $(WARNINGS) -c -o $@ $<
 	@mv -f $(DEPDIR)/$*.Td $(DEPDIR)/$*.d && touch $@
 
-$(OBJDIR)/tlsf.o: $(SRCDIR)/tlsf.c
-	$(CC) $(INCPATH) $(CWARN) -DTLSF_USE_LOCKS=0  -DUSE_SBRK=1 -c -o $@ $<
+$(OBJDIR)/platform/tlsf.o: $(SRCDIR)/platform/tlsf.c
+	$(CC) $(INCPATH) $(CWARN) -DTLSF_USE_LOCKS=0  -DUSE_MMAP=1 -c -o $@ $<
+
+$(OBJDIR)/win32-glob.o: $(SRCDIR)/win32-glob.c
+	$(CC) $(INCPATH) $(CWARN) -c -o $@ $<
+
+$(OBJDIR)/platform/slre.o: $(SRCDIR)/platform/slre.c
+	$(CC) $(INCPATH) $(CWARN) -c -o $@ $<
+
+$(OBJDIR)/platform/mmap.o: $(SRCDIR)/platform/mmap.c
+	$(CC) $(INCPATH) $(CWARN) -c -o $@ $<
+
 
 $(DEPDIR)/%d: ;
 .PRECIOUS: $(DEPDIR)/%.d
 
 test-url.o: tests/testPrograms/URLtest.cpp
-	$(CXX) -MT $@ -MMD -MP -MF $(DEPDIR)/$*.Td $(CXXFLAGS) $(INCPATH) $(WARINGS) -c -o $@ $<
+	$(CXX) -MT $@ -MMD -MP -MF $(DEPDIR)/$*.Td $(CXXFLAGS) $(INCPATH) $(WARNINGS) -c -o $@ $<
+
+test-cfg.o: tests/TestCFG.cpp
+	$(CXX) -MT $@ -MMD -MP -MF $(DEPDIR)/$*.Td $(CXXFLAGS) -Isrc $(INCPATH) -DDEBUG $(WARNINGS) -c -o $@ $<
 
 ntr-run-tests: test-url.o $(OBJDIR)/URL.o $(OBJDIR)/StringUtils.o
 	$(LINK) $(LDFLAGS) -o $@ test-url.o $(OBJDIR)/URL.o $(OBJDIR)/StringUtils.o $(LIBS)
 
+ntr-test-cfg: test-cfg.o $(OBJDIR)/CFGFileParser.o $(OBJDIR)/slre.o $(OBJDIR)/tlsf.o $(OBJDIR)/Murmur3.o
+	$(LINK) $(LDFLAGS) -o $@ $^ $(LIBS)
+
 clean:
 	-@rm -rf src/graphics/opengl/shaders/gen $(OBJDIR) $(EXECUTABLE) 2>/dev/null || true
 

README.md

@@ -36,6 +36,7 @@ Looks like on Ubuntu, only zesty and newer have 2.4+ of mbedtls
 `sudo pacman -Suy glew glfw freetype2 harfbuzz mbedtls`
 
 #### Void
+Note: glew maybe 1.1 here, we need 2.0
 `sudo xbps-install -S glew glfw harfbuzz-devel`
 
 #### Gentoo
@@ -51,7 +52,7 @@ Be sure to use gmake too
 
 ## Binaries
 ### Linux
-[2017-09-03 binary package](https://my.mixtape.moe/hgfrjt.tar.gz)
+[2017-09-04 binary package](https://my.mixtape.moe/faniov.tar.gz)
 
 GyroNinja.net is back online
 
@@ -60,18 +61,15 @@ GyroNinja.net is back online
 [Jenkins](https://gyroninja.net:1615/job/NetRunner/)
 
 ### OSX
-[2017-09-03 binary package](https://my.mixtape.moe/ysyoee.zip)
+[2017-09-03 binary package](https://my.mixtape.moe/hkacfz.zip)
 
 ### Windows
-[2017-08-20 binary package](https://my.mixtape.moe/exebyr.zip)
 
-[32bit nightly package](https://nt-build-bot.rvx86.net/job/netrunner-winnt-i686/lastSuccessfulBuild/artifact/*zip*/archive.z)
+[32bit nightly package](https://nt-build-bot.rvx86.net/job/netrunner-winnt-i686/lastSuccessfulBuild/artifact/*zip*/archive.zip)
 
-[64bit nightly package](https://nt-build-bot.rvx86.net/job/netrunner-winnt-amd64/lastSuccessfulBuild/artifact/*zip*/archive.z)
+[64bit nightly package](https://nt-build-bot.rvx86.net/job/netrunner-winnt-amd64/lastSuccessfulBuild/artifact/*zip*/archive.zip)
 
-[Jenkins 32bit](https://nt-build-bot.rvx86.net/job/netrunner-winnt-i686/)
 
-[Jenkins 64bit](https://nt-build-bot.rvx86.net/job/netrunner-winnt-amd64/)
 
 ## Milestones
 - Browse 4chan /g/ board
@@ -147,11 +145,12 @@ We coordinate on [irc.rizon.net](https://www.rizon.net/chat) #/g/netrunner or [O
 ### Overview
 - networking - downloads requested files
 - html - HTML parser
-- graphics - has the various interface interface
-  - opengl - our opengl Renderer
-  - text - our text rasterizer
+- interface - has the various interface interface
   - component - our renderer classes
   - element - our DOM tree classes
+  - graphical
+    - glfw - our opengl Renderer
+    - font - our text rasterizer
 
 ### Class Types
 - Nodes: DOM tree objects