diff --git a/modules/console-gx/Makefile b/modules/console-gx/Makefile index 1af1a7d..e8c57ec 100644 --- a/modules/console-gx/Makefile +++ b/modules/console-gx/Makefile @@ -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 diff --git a/modules/console-sd/Makefile b/modules/console-sd/Makefile index 1af1a7d..e8c57ec 100644 --- a/modules/console-sd/Makefile +++ b/modules/console-sd/Makefile @@ -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 diff --git a/modules/gecko/Makefile b/modules/gecko/Makefile index 1af1a7d..e8c57ec 100644 --- a/modules/gecko/Makefile +++ b/modules/gecko/Makefile @@ -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 diff --git a/modules/https/Makefile b/modules/https/Makefile index b3bd016..5aab63b 100644 --- a/modules/https/Makefile +++ b/modules/https/Makefile @@ -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 diff --git a/modules/libfat-sd/Makefile b/modules/libfat-sd/Makefile index 1af1a7d..e8c57ec 100644 --- a/modules/libfat-sd/Makefile +++ b/modules/libfat-sd/Makefile @@ -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 diff --git a/modules/libfat/Makefile b/modules/libfat/Makefile index 1af1a7d..e8c57ec 100644 --- a/modules/libfat/Makefile +++ b/modules/libfat/Makefile @@ -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 diff --git a/modules/libsd/Makefile b/modules/libsd/Makefile index 1af1a7d..e8c57ec 100644 --- a/modules/libsd/Makefile +++ b/modules/libsd/Makefile @@ -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 diff --git a/modules/template/Makefile b/modules/template/Makefile index 1af1a7d..e8c57ec 100644 --- a/modules/template/Makefile +++ b/modules/template/Makefile @@ -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