Install GRRLIB and pngu into the porlibs folder

This commit is contained in:
Crayon2000 2019-04-07 15:22:30 -04:00
parent b02e8dbda7
commit 2e2df56a61
3 changed files with 15 additions and 9 deletions

View file

@ -19,6 +19,9 @@ endif
NULLSTR := NULLSTR :=
PWD := $(subst $(NULLSTR) ,\ ,$(shell pwd)) PWD := $(subst $(NULLSTR) ,\ ,$(shell pwd))
INSTALL_INC := $(DEVKITPRO)/portlibs/ppc/include
INSTALL_LIB := $(DEVKITPRO)/portlibs/ppc/lib
INCLUDE := -I../lib/pngu -I$(PWD) -I$(LIBOGC_INC) -I$(DEVKITPRO)/portlibs/ppc/include -I$(DEVKITPRO)/portlibs/ppc/include/freetype2 INCLUDE := -I../lib/pngu -I$(PWD) -I$(LIBOGC_INC) -I$(DEVKITPRO)/portlibs/ppc/include -I$(DEVKITPRO)/portlibs/ppc/include/freetype2
CFLAGS := -O2 -Wall $(MACHDEP) $(INCLUDE) CFLAGS := -O2 -Wall $(MACHDEP) $(INCLUDE)
@ -36,7 +39,7 @@ clean :
rm -f $(OFILES) $(ARC) rm -f $(OFILES) $(ARC)
install : install :
mkdir -p $(LIBOGC_LIB) $(LIBOGC_INC) $(LIBOGC_INC)/grrlib mkdir -p $(INSTALL_LIB) $(INSTALL_INC) $(INSTALL_INC)/grrlib
cp -f $(ARC) $(LIBOGC_LIB)/ cp -f $(ARC) $(INSTALL_LIB)/
cp -f $(HDR) $(LIBOGC_INC)/ cp -f $(HDR) $(INSTALL_INC)/
cp -f $(INL) $(LIBOGC_INC)/grrlib cp -f $(INL) $(INSTALL_INC)/grrlib

View file

@ -16,6 +16,9 @@ else
include $(DEVKITPPC)/wii_rules include $(DEVKITPPC)/wii_rules
endif endif
INSTALL_INC := $(DEVKITPRO)/portlibs/ppc/include
INSTALL_LIB := $(DEVKITPRO)/portlibs/ppc/lib
INCLUDE := -I$(LIBOGC_INC) -I$(DEVKITPRO)/portlibs/ppc/include INCLUDE := -I$(LIBOGC_INC) -I$(DEVKITPRO)/portlibs/ppc/include
CFLAGS := -O2 -Wall $(MACHDEP) $(INCLUDE) CFLAGS := -O2 -Wall $(MACHDEP) $(INCLUDE)
@ -32,6 +35,6 @@ clean :
rm -f $(OFILES) $(ARC) rm -f $(OFILES) $(ARC)
install : install :
mkdir -p $(LIBOGC_LIB) $(LIBOGC_INC) mkdir -p $(INSTALL_LIB) $(INSTALL_INC)
cp -f $(ARC) $(LIBOGC_LIB)/ cp -f $(ARC) $(INSTALL_LIB)/
cp -f $(HDR) $(LIBOGC_INC)/ cp -f $(HDR) $(INSTALL_INC)/

View file

@ -9,7 +9,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <wiiuse/wpad.h> #include <wiiuse/wpad.h>
#include <math.h> #include <cmath>
#include <ogc/lwp_watchdog.h> #include <ogc/lwp_watchdog.h>
#include <vector> #include <vector>
@ -276,7 +276,7 @@ static u8 CalculateFrameRate() {
* @return Returns a clean, clamped unsigned char. * @return Returns a clean, clamped unsigned char.
*/ */
static u8 ClampVar8 (f32 Value) { static u8 ClampVar8 (f32 Value) {
Value = roundf(Value); Value = std::roundf(Value);
if (Value < 0) { if (Value < 0) {
Value = 0; Value = 0;
} }