gyroninja
/
netrunner
4
5
Fork 2
Code Issues Releases Wiki Activity
Browse Source

Fixed DJMakefile, preparing for interface breakout

master
rick 5 years ago
parent
20ba40b061
commit
d033bd83f5
2 changed files with 9 additions and 8 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 16
      DJMakefile
  2. 1
      version.git

16
DJMakefile
Unescape View File

@ -2,15 +2,15 @@ UNAME := $(shell uname) @@ -2,15 +2,15 @@ UNAME := $(shell uname)
CXX = gpp
CC = gcc
GIT_VERSION := $(shell git describe --abbrev=4 --always --tags)
PLATFORM := $(shell gpp -dumpmachine)
GIT_VERSION := $(shell cat version.git)
PLATFORM := $(MACHTYPE)
CXXFLAGS = -O3 -march=i486 -flto=8 -DVERSION=\"$(GIT_VERSION)\" -DPLATFORM=\"$(PLATFORM)\"
CFLAGS = -O3 -flto=8 -march=i486 -std=c11 -DVERSION=\"$(GIT_VERSION)\"
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 -lfreetype -lharfbuzz -lpolarssl
LDFLAGS = -O3 -flto=8
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
@ -27,13 +27,13 @@ OBJECTS = $(subst $(SRCDIR),$(OBJDIR),$(SOURCES:.cpp=.o)) @@ -27,13 +27,13 @@ OBJECTS = $(subst $(SRCDIR),$(OBJDIR),$(SOURCES:.cpp=.o))
all: $(SOURCES) netrunner
netrunner: $(OBJECTS) $(OBJDIR)/tlsf.o
$(LINK) $(LDFLAGS) -o $@ $^ $(LIBS)
$(LINK) $(LDFLAGS) -o $@ $^ stub.o $(LIBS)
$(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 $@ $<
@move $(DEPDIR)\$*.Td $(DEPDIR)\$*.d
@mv $(DEPDIR)/$*.Td $(DEPDIR)/$*.d
touch $@
$(OBJDIR)/tlsf.o: $(SRCDIR)/tlsf.c

1
version.git
Unescape View File

@ -0,0 +1 @@ @@ -0,0 +1 @@
20ba
Write Preview
Loading…
Cancel
Save