Removed LIBOGC stuff from the makefile

This commit is contained in:
Maschell 2018-02-16 17:43:29 +01:00
parent 5c39bd2a3e
commit 0b6b8683c2
10 changed files with 20 additions and 49 deletions

View File

@ -12,8 +12,6 @@ ifeq ($(strip $(DEVKITPRO)),)
$(error "Please set DEVKITPRO in your environment. export DEVKITPRO=<path to>devkitPRO") $(error "Please set DEVKITPRO in your environment. export DEVKITPRO=<path to>devkitPRO")
endif endif
export PATH := $(DEVKITPPC)/bin:$(PORTLIBS)/bin:$(PATH) export PATH := $(DEVKITPPC)/bin:$(PORTLIBS)/bin:$(PATH)
export LIBOGC_INC := $(DEVKITPRO)/libogc/include
export LIBOGC_LIB := $(DEVKITPRO)/libogc/lib/wii
export PORTLIBS := $(DEVKITPRO)/portlibs/ppc export PORTLIBS := $(DEVKITPRO)/portlibs/ppc
PREFIX := powerpc-eabi- PREFIX := powerpc-eabi-
@ -129,7 +127,7 @@ export OFILES := $(CPPFILES:.cpp=.o) $(CFILES:.c=.o) \
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
export INCLUDE := $(foreach dir,$(INCLUDES),-I$(CURDIR)/$(dir)) \ export INCLUDE := $(foreach dir,$(INCLUDES),-I$(CURDIR)/$(dir)) \
$(foreach dir,$(LIBDIRS),-I$(dir)/include) \ $(foreach dir,$(LIBDIRS),-I$(dir)/include) \
-I$(CURDIR)/$(BUILD) -I$(LIBOGC_INC) \ -I$(CURDIR)/$(BUILD) \
-I$(PORTLIBS)/include -I$(PORTLIBS)/include/freetype2\ -I$(PORTLIBS)/include -I$(PORTLIBS)/include/freetype2\
-I$(PORTLIBS)/include/libutils -I$(PORTLIBS)/include/libgui -I$(PORTLIBS)/include/libutils -I$(PORTLIBS)/include/libgui
@ -137,7 +135,7 @@ export INCLUDE := $(foreach dir,$(INCLUDES),-I$(CURDIR)/$(dir)) \
# build a list of library paths # build a list of library paths
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
export LIBPATHS := $(foreach dir,$(LIBDIRS),-L$(dir)/lib) \ export LIBPATHS := $(foreach dir,$(LIBDIRS),-L$(dir)/lib) \
-L$(LIBOGC_LIB) -L$(PORTLIBS)/lib -L$(PORTLIBS)/lib
export OUTPUT := $(CURDIR)/$(TARGET) export OUTPUT := $(CURDIR)/$(TARGET)
.PHONY: $(BUILD) clean install .PHONY: $(BUILD) clean install

BIN
gettext-bin/libexpat.dll Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
gettext-bin/libiconv2.dll Normal file

Binary file not shown.

BIN
gettext-bin/libintl3.dll Normal file

Binary file not shown.

BIN
gettext-bin/msgmerge.exe Normal file

Binary file not shown.

BIN
gettext-bin/xgettext.exe Normal file

Binary file not shown.

View File

@ -45,7 +45,9 @@
<Unit filename="build/ContentNetworkHelp.d" /> <Unit filename="build/ContentNetworkHelp.d" />
<Unit filename="build/ContentSettings.d" /> <Unit filename="build/ContentSettings.d" />
<Unit filename="build/DefaultGuiCheckBox.d" /> <Unit filename="build/DefaultGuiCheckBox.d" />
<Unit filename="build/DefaultGuiSelectBox.d" />
<Unit filename="build/DefaultGuiSwitch.d" /> <Unit filename="build/DefaultGuiSwitch.d" />
<Unit filename="build/DefaultSelectBox.d" />
<Unit filename="build/GuiControllerInputDisplay.d" /> <Unit filename="build/GuiControllerInputDisplay.d" />
<Unit filename="build/InputGetterMenu.d" /> <Unit filename="build/InputGetterMenu.d" />
<Unit filename="build/MainWindow.d" /> <Unit filename="build/MainWindow.d" />
@ -61,62 +63,24 @@
<Unit filename="build/TVControllerBanner.d" /> <Unit filename="build/TVControllerBanner.d" />
<Unit filename="build/entry.d" /> <Unit filename="build/entry.d" />
<Unit filename="build/filelist.d" /> <Unit filename="build/filelist.d" />
<Unit filename="build/gettext.d" />
<Unit filename="build/hid_controller_function_patcher.d" /> <Unit filename="build/hid_controller_function_patcher.d" />
<Unit filename="build/main.d" /> <Unit filename="build/main.d" />
<Unit filename="build/retain_vars.d" /> <Unit filename="build/retain_vars.d" />
<Unit filename="libcontrollerpatcher/release/CPRetainVars.d" />
<Unit filename="libcontrollerpatcher/release/ConfigParser.d" />
<Unit filename="libcontrollerpatcher/release/ConfigReader.d" />
<Unit filename="libcontrollerpatcher/release/ConfigValues.d" />
<Unit filename="libcontrollerpatcher/release/ControllerPatcher.d" />
<Unit filename="libcontrollerpatcher/release/ControllerPatcherHID.d" />
<Unit filename="libcontrollerpatcher/release/ControllerPatcherNet.d" />
<Unit filename="libcontrollerpatcher/release/ControllerPatcherUtils.d" />
<Unit filename="libcontrollerpatcher/release/PadConst.d" />
<Unit filename="libcontrollerpatcher/release/TCPServer.d" />
<Unit filename="libcontrollerpatcher/release/UDPClient.d" />
<Unit filename="libcontrollerpatcher/release/UDPServer.d" />
<Unit filename="libcontrollerpatcher/source/ConfigReader.cpp" />
<Unit filename="libcontrollerpatcher/source/ConfigReader.hpp" />
<Unit filename="libcontrollerpatcher/source/ControllerPatcher.cpp" />
<Unit filename="libcontrollerpatcher/source/ControllerPatcher.hpp" />
<Unit filename="libcontrollerpatcher/source/ControllerPatcherDefs.h" />
<Unit filename="libcontrollerpatcher/source/ControllerPatcherIncludes.hpp" />
<Unit filename="libcontrollerpatcher/source/config/ConfigParser.cpp" />
<Unit filename="libcontrollerpatcher/source/config/ConfigValues.cpp" />
<Unit filename="libcontrollerpatcher/source/config/configparser.hpp" />
<Unit filename="libcontrollerpatcher/source/config/configvalues.hpp" />
<Unit filename="libcontrollerpatcher/source/network/ControllerPatcherNet.cpp" />
<Unit filename="libcontrollerpatcher/source/network/ControllerPatcherNet.hpp" />
<Unit filename="libcontrollerpatcher/source/network/TCPServer.cpp" />
<Unit filename="libcontrollerpatcher/source/network/UDPClient.cpp" />
<Unit filename="libcontrollerpatcher/source/network/UDPClient.hpp" />
<Unit filename="libcontrollerpatcher/source/network/UDPServer.cpp" />
<Unit filename="libcontrollerpatcher/source/network/UDPServer.hpp" />
<Unit filename="libcontrollerpatcher/source/network/tcpserver.hpp" />
<Unit filename="libcontrollerpatcher/source/patcher/ControllerPatcherHID.cpp" />
<Unit filename="libcontrollerpatcher/source/patcher/ControllerPatcherHID.hpp" />
<Unit filename="libcontrollerpatcher/source/patcher/ControllerPatcherUtils.cpp" />
<Unit filename="libcontrollerpatcher/source/patcher/ControllerPatcherUtils.hpp" />
<Unit filename="libcontrollerpatcher/source/utils/CPRetainVars.cpp" />
<Unit filename="libcontrollerpatcher/source/utils/CPRetainVars.hpp" />
<Unit filename="libcontrollerpatcher/source/utils/PadConst.cpp" />
<Unit filename="libcontrollerpatcher/source/utils/PadConst.hpp" />
<Unit filename="src/Application.cpp" /> <Unit filename="src/Application.cpp" />
<Unit filename="src/Application.h" /> <Unit filename="src/Application.h" />
<Unit filename="src/common/common.h" /> <Unit filename="src/common/common.h" />
<Unit filename="src/common/retain_vars.cpp" /> <Unit filename="src/common/retain_vars.cpp" />
<Unit filename="src/common/retain_vars.h" /> <Unit filename="src/common/retain_vars.h" />
<Unit filename="src/custom/gui/DefaultGuiSelectBox.cpp" />
<Unit filename="src/custom/gui/DefaultGuiSelectBox.h" />
<Unit filename="src/custom/gui/DefaultGuiSwitch.cpp" />
<Unit filename="src/custom/gui/DefaultGuiSwitch.h" />
<Unit filename="src/custom/gui/GuiConfigurationScreen.h" />
<Unit filename="src/custom/gui/GuiControllerInputDisplay.cpp" />
<Unit filename="src/custom/gui/GuiControllerInputDisplay.h" />
<Unit filename="src/entry.c"> <Unit filename="src/entry.c">
<Option compilerVar="CC" /> <Option compilerVar="CC" />
</Unit> </Unit>
<Unit filename="src/gui/DefaultGuiCheckBox.cpp" />
<Unit filename="src/gui/DefaultGuiCheckBox.h" />
<Unit filename="src/gui/DefaultGuiSwitch.cpp" />
<Unit filename="src/gui/DefaultGuiSwitch.h" />
<Unit filename="src/gui/GuiControllerInputDisplay.cpp" />
<Unit filename="src/gui/GuiControllerInputDisplay.h" />
<Unit filename="src/main.cpp" /> <Unit filename="src/main.cpp" />
<Unit filename="src/main.h" /> <Unit filename="src/main.h" />
<Unit filename="src/menu/InputGetterMenu.cpp" /> <Unit filename="src/menu/InputGetterMenu.cpp" />
@ -156,6 +120,15 @@
<Unit filename="src/menu/tv/TVButtonController.h" /> <Unit filename="src/menu/tv/TVButtonController.h" />
<Unit filename="src/menu/tv/TVControllerBanner.cpp" /> <Unit filename="src/menu/tv/TVControllerBanner.cpp" />
<Unit filename="src/menu/tv/TVControllerBanner.h" /> <Unit filename="src/menu/tv/TVControllerBanner.h" />
<Unit filename="src/mygui/DefaultGuiCheckBox.cpp" />
<Unit filename="src/mygui/DefaultGuiCheckBox.h" />
<Unit filename="src/mygui/DefaultGuiSwitch.cpp" />
<Unit filename="src/mygui/DefaultGuiSwitch.h" />
<Unit filename="src/mygui/DefaultSelectBox.cpp" />
<Unit filename="src/mygui/DefaultSelectBox.h" />
<Unit filename="src/mygui/GuiConfigurationScreen.h" />
<Unit filename="src/mygui/GuiControllerInputDisplay.cpp" />
<Unit filename="src/mygui/GuiControllerInputDisplay.h" />
<Unit filename="src/patcher/hid_controller_function_patcher.cpp" /> <Unit filename="src/patcher/hid_controller_function_patcher.cpp" />
<Unit filename="src/patcher/hid_controller_function_patcher.hpp" /> <Unit filename="src/patcher/hid_controller_function_patcher.hpp" />
<Unit filename="src/resources/filelist.cpp" /> <Unit filename="src/resources/filelist.cpp" />