Skip to content

Commit 52cdcb3

Browse files
committed
Bump version for release and use DESTDIR for pacman packaging
1 parent 5e1bc20 commit 52cdcb3

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ endif
99
include $(DEVKITARM)/3ds_rules
1010

1111
export CITRO3D_MAJOR := 1
12-
export CITRO3D_MINOR := 3
13-
export CITRO3D_PATCH := 1
12+
export CITRO3D_MINOR := 4
13+
export CITRO3D_PATCH := 0
1414

1515
VERSION := $(CITRO3D_MAJOR).$(CITRO3D_MINOR).$(CITRO3D_PATCH)
1616

@@ -100,8 +100,8 @@ dist-src:
100100
dist: dist-src dist-bin
101101

102102
install: dist-bin
103-
mkdir -p $(DEVKITPRO)/libctru
104-
bzip2 -cd citro3d-$(VERSION).tar.bz2 | tar -xf - -C $(DEVKITPRO)/libctru
103+
mkdir -p $(DESTDIR)$(DEVKITPRO)/libctru
104+
bzip2 -cd citro3d-$(VERSION).tar.bz2 | tar -xf - -C $(DESTDIR)$(DEVKITPRO)/libctru
105105

106106
lib:
107107
@[ -d $@ ] || mkdir -p $@

test/pc/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ OFILES := $(addprefix build/,$(CXXFILES:.cpp=.o)) \
77
DFILES := $(wildcard build/*.d)
88

99
CFLAGS := -Wall -g -pipe -I../../include --coverage
10-
CXXFLAGS := $(CFLAGS) -std=gnu++11 -DGLM_FORCE_RADIANS
10+
CXXFLAGS := $(CFLAGS) $(CPPFLAGS) -std=gnu++11 -DGLM_FORCE_RADIANS
1111
LDFLAGS := $(ARCH) -pipe -lm --coverage
1212

1313
.PHONY: all clean lcov

0 commit comments

Comments
 (0)