Skip to content

Commit

Permalink
Removed build dependency on brainslug.
Browse files Browse the repository at this point in the history 
 * BSLUG_DIR was set to the install directory of Brainslug in modules, but this application is standalone.
 * Made clean recursive.
  • Loading branch information
@Chadderz121
Chadderz121 committed Jan 13, 2015
1 parent daab091 commit 96fd794
Show file tree
Hide file tree
Showing 10 changed files with 22 additions and 20 deletions.
1 change: 1 addition & 0 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,7 @@ list : $(LIST)
PHONY += clean
clean :
$Qrm -rf $(wildcard $(BUILD) $(BIN) $(RELEASE))
$Q$(MAKE) -C modules clean

###############################################################################
# Phony targets
Expand Down
4 changes: 2 additions & 2 deletions modules/console-gx/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@ ifeq ($(strip $(DEVKITPPC)),)
$(error "Please set DEVKITPPC in your environment. export DEVKITPPC=<path to>devkitPPC")
endif

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

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

include makefile.mk

Expand Down
4 changes: 2 additions & 2 deletions modules/console-sd/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@ ifeq ($(strip $(DEVKITPPC)),)
$(error "Please set DEVKITPPC in your environment. export DEVKITPPC=<path to>devkitPPC")
endif

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

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

include makefile.mk

Expand Down
4 changes: 2 additions & 2 deletions modules/gecko/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@ ifeq ($(strip $(DEVKITPPC)),)
$(error "Please set DEVKITPPC in your environment. export DEVKITPPC=<path to>devkitPPC")
endif

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

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

include makefile.mk

Expand Down
4 changes: 2 additions & 2 deletions modules/https/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@ ifeq ($(strip $(DEVKITPPC)),)
$(error "Please set DEVKITPPC in your environment. export DEVKITPPC=<path to>devkitPPC")
endif

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

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

include makefile.mk

Expand Down
4 changes: 2 additions & 2 deletions modules/libfat-sd/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@ ifeq ($(strip $(DEVKITPPC)),)
$(error "Please set DEVKITPPC in your environment. export DEVKITPPC=<path to>devkitPPC")
endif

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

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

include makefile.mk

Expand Down
4 changes: 2 additions & 2 deletions modules/libfat/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@ ifeq ($(strip $(DEVKITPPC)),)
$(error "Please set DEVKITPPC in your environment. export DEVKITPPC=<path to>devkitPPC")
endif

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

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

include makefile.mk

Expand Down
4 changes: 2 additions & 2 deletions modules/libsd/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@ ifeq ($(strip $(DEVKITPPC)),)
$(error "Please set DEVKITPPC in your environment. export DEVKITPPC=<path to>devkitPPC")
endif

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

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

include makefile.mk

Expand Down
9 changes: 5 additions & 4 deletions modules/netslug_main/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,13 @@ ifeq ($(strip $(DEVKITPPC)),)
$(error "Please set DEVKITPPC in your environment. export DEVKITPPC=<path to>devkitPPC")
endif

BSLUGDIR := $(DEVKITPRO)/bslug
BSLUGDIR := ../../
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 \
../../bslug_include
LIB_INC_DIRS := $(DEVKITPPC)/lib/gcc/powerpc-eabi/$(GCC_VER)/include \
$(DEVKITPPC)/lib/gcc/powerpc-eabi/$(GCC_VER)/include-fixed \
$(BSLUGDIR)/bslug_include

include makefile.mk

Expand Down
4 changes: 2 additions & 2 deletions modules/template/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@ ifeq ($(strip $(DEVKITPPC)),)
$(error "Please set DEVKITPPC in your environment. export DEVKITPPC=<path to>devkitPPC")
endif

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

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

include makefile.mk

Expand Down

0 comments on commit 96fd794

Please sign in to comment.