Skip to content

Commit

Permalink
Fixed hard coded GCC version.
Browse files Browse the repository at this point in the history 
 * Path to includes for modules was hard coded when it should be relative to version of GCC.
 * Now compute GCC version at compile time.
  • Loading branch information
@Chadderz121
Chadderz121 committed Jan 13, 2015
1 parent 98f5da0 commit 4fa7f9b
Show file tree
Hide file tree
Showing 8 changed files with 24 additions and 16 deletions.
5 changes: 3 additions & 2 deletions modules/console-gx/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,11 @@ ifeq ($(strip $(DEVKITPPC)),)
endif

BSLUGDIR := $(DEVKITPRO)/bslug
GCC_VER := $(shell $(DEVKITPPC)/bin/powerpc-eabi-gcc -dumpversion)

PATH := $(DEVKITPPC)/bin:$(PATH)
LIB_INC_DIRS := $(DEVKITPPC)/lib/gcc/powerpc-eabi/4.6.3/include \
$(DEVKITPPC)/lib/gcc/powerpc-eabi/4.6.3/include-fixed \
LIB_INC_DIRS := $(DEVKITPPC)/lib/gcc/powerpc-eabi/$(GCC_VER)/include \
$(DEVKITPPC)/lib/gcc/powerpc-eabi/$(GCC_VER)/include-fixed \
$(BSLUGDIR)/include

include makefile.mk
Expand Down
5 changes: 3 additions & 2 deletions modules/console-sd/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,11 @@ ifeq ($(strip $(DEVKITPPC)),)
endif

BSLUGDIR := $(DEVKITPRO)/bslug
GCC_VER := $(shell $(DEVKITPPC)/bin/powerpc-eabi-gcc -dumpversion)

PATH := $(DEVKITPPC)/bin:$(PATH)
LIB_INC_DIRS := $(DEVKITPPC)/lib/gcc/powerpc-eabi/4.6.3/include \
$(DEVKITPPC)/lib/gcc/powerpc-eabi/4.6.3/include-fixed \
LIB_INC_DIRS := $(DEVKITPPC)/lib/gcc/powerpc-eabi/$(GCC_VER)/include \
$(DEVKITPPC)/lib/gcc/powerpc-eabi/$(GCC_VER)/include-fixed \
$(BSLUGDIR)/include

include makefile.mk
Expand Down
5 changes: 3 additions & 2 deletions modules/gecko/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,11 @@ ifeq ($(strip $(DEVKITPPC)),)
endif

BSLUGDIR := $(DEVKITPRO)/bslug
GCC_VER := $(shell $(DEVKITPPC)/bin/powerpc-eabi-gcc -dumpversion)

PATH := $(DEVKITPPC)/bin:$(PATH)
LIB_INC_DIRS := $(DEVKITPPC)/lib/gcc/powerpc-eabi/4.6.3/include \
$(DEVKITPPC)/lib/gcc/powerpc-eabi/4.6.3/include-fixed \
LIB_INC_DIRS := $(DEVKITPPC)/lib/gcc/powerpc-eabi/$(GCC_VER)/include \
$(DEVKITPPC)/lib/gcc/powerpc-eabi/$(GCC_VER)/include-fixed \
$(BSLUGDIR)/include

include makefile.mk
Expand Down
5 changes: 3 additions & 2 deletions modules/https/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,11 @@ ifeq ($(strip $(DEVKITPPC)),)
endif

BSLUGDIR := $(DEVKITPRO)/bslug
GCC_VER := $(shell $(DEVKITPPC)/bin/powerpc-eabi-gcc -dumpversion)

PATH := $(DEVKITPPC)/bin:$(PATH)
LIB_INC_DIRS := $(DEVKITPPC)/lib/gcc/powerpc-eabi/4.6.3/include \
$(DEVKITPPC)/lib/gcc/powerpc-eabi/4.6.3/include-fixed \
LIB_INC_DIRS := $(DEVKITPPC)/lib/gcc/powerpc-eabi/$(GCC_VER)/include \
$(DEVKITPPC)/lib/gcc/powerpc-eabi/$(GCC_VER)/include-fixed \
$(BSLUGDIR)/include

include makefile.mk
Expand Down
5 changes: 3 additions & 2 deletions modules/libfat-sd/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,11 @@ ifeq ($(strip $(DEVKITPPC)),)
endif

BSLUGDIR := $(DEVKITPRO)/bslug
GCC_VER := $(shell $(DEVKITPPC)/bin/powerpc-eabi-gcc -dumpversion)

PATH := $(DEVKITPPC)/bin:$(PATH)
LIB_INC_DIRS := $(DEVKITPPC)/lib/gcc/powerpc-eabi/4.6.3/include \
$(DEVKITPPC)/lib/gcc/powerpc-eabi/4.6.3/include-fixed \
LIB_INC_DIRS := $(DEVKITPPC)/lib/gcc/powerpc-eabi/$(GCC_VER)/include \
$(DEVKITPPC)/lib/gcc/powerpc-eabi/$(GCC_VER)/include-fixed \
$(BSLUGDIR)/include

include makefile.mk
Expand Down
5 changes: 3 additions & 2 deletions modules/libfat/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,11 @@ ifeq ($(strip $(DEVKITPPC)),)
endif

BSLUGDIR := $(DEVKITPRO)/bslug
GCC_VER := $(shell $(DEVKITPPC)/bin/powerpc-eabi-gcc -dumpversion)

PATH := $(DEVKITPPC)/bin:$(PATH)
LIB_INC_DIRS := $(DEVKITPPC)/lib/gcc/powerpc-eabi/4.6.3/include \
$(DEVKITPPC)/lib/gcc/powerpc-eabi/4.6.3/include-fixed \
LIB_INC_DIRS := $(DEVKITPPC)/lib/gcc/powerpc-eabi/$(GCC_VER)/include \
$(DEVKITPPC)/lib/gcc/powerpc-eabi/$(GCC_VER)/include-fixed \
$(BSLUGDIR)/include

include makefile.mk
Expand Down
5 changes: 3 additions & 2 deletions modules/libsd/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,11 @@ ifeq ($(strip $(DEVKITPPC)),)
endif

BSLUGDIR := $(DEVKITPRO)/bslug
GCC_VER := $(shell $(DEVKITPPC)/bin/powerpc-eabi-gcc -dumpversion)

PATH := $(DEVKITPPC)/bin:$(PATH)
LIB_INC_DIRS := $(DEVKITPPC)/lib/gcc/powerpc-eabi/4.6.3/include \
$(DEVKITPPC)/lib/gcc/powerpc-eabi/4.6.3/include-fixed \
LIB_INC_DIRS := $(DEVKITPPC)/lib/gcc/powerpc-eabi/$(GCC_VER)/include \
$(DEVKITPPC)/lib/gcc/powerpc-eabi/$(GCC_VER)/include-fixed \
$(BSLUGDIR)/include

include makefile.mk
Expand Down
5 changes: 3 additions & 2 deletions modules/template/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,11 @@ ifeq ($(strip $(DEVKITPPC)),)
endif

BSLUGDIR := $(DEVKITPRO)/bslug
GCC_VER := $(shell $(DEVKITPPC)/bin/powerpc-eabi-gcc -dumpversion)

PATH := $(DEVKITPPC)/bin:$(PATH)
LIB_INC_DIRS := $(DEVKITPPC)/lib/gcc/powerpc-eabi/4.6.3/include \
$(DEVKITPPC)/lib/gcc/powerpc-eabi/4.6.3/include-fixed \
LIB_INC_DIRS := $(DEVKITPPC)/lib/gcc/powerpc-eabi/$(GCC_VER)/include \
$(DEVKITPPC)/lib/gcc/powerpc-eabi/$(GCC_VER)/include-fixed \
$(BSLUGDIR)/include

include makefile.mk
Expand Down

0 comments on commit 4fa7f9b

Please sign in to comment.