diff --git a/Makefile b/Makefile index d205e24..f45b001 100644 --- a/Makefile +++ b/Makefile @@ -9,8 +9,8 @@ endif include $(DEVKITARM)/3ds_rules export CITRO3D_MAJOR := 1 -export CITRO3D_MINOR := 3 -export CITRO3D_PATCH := 1 +export CITRO3D_MINOR := 4 +export CITRO3D_PATCH := 0 VERSION := $(CITRO3D_MAJOR).$(CITRO3D_MINOR).$(CITRO3D_PATCH) @@ -100,8 +100,8 @@ dist-src: dist: dist-src dist-bin install: dist-bin - mkdir -p $(DEVKITPRO)/libctru - bzip2 -cd citro3d-$(VERSION).tar.bz2 | tar -xf - -C $(DEVKITPRO)/libctru + mkdir -p $(DESTDIR)$(DEVKITPRO)/libctru + bzip2 -cd citro3d-$(VERSION).tar.bz2 | tar -xf - -C $(DESTDIR)$(DEVKITPRO)/libctru lib: @[ -d $@ ] || mkdir -p $@ diff --git a/test/pc/Makefile b/test/pc/Makefile index b3a670f..870f93d 100644 --- a/test/pc/Makefile +++ b/test/pc/Makefile @@ -7,7 +7,7 @@ OFILES := $(addprefix build/,$(CXXFILES:.cpp=.o)) \ DFILES := $(wildcard build/*.d) CFLAGS := -Wall -g -pipe -I../../include --coverage -CXXFLAGS := $(CFLAGS) -std=gnu++11 -DGLM_FORCE_RADIANS +CXXFLAGS := $(CFLAGS) $(CPPFLAGS) -std=gnu++11 -DGLM_FORCE_RADIANS LDFLAGS := $(ARCH) -pipe -lm --coverage .PHONY: all clean lcov