Stop rely on wut for building the WUPS library

This commit is contained in:
Maschell 2018-06-20 16:16:16 +02:00
parent 6e6c727b12
commit fc36464c55
4 changed files with 14 additions and 9 deletions

View File

@ -7,10 +7,6 @@ ifeq ($(strip $(DEVKITPPC)),)
$(error "Please set DEVKITPPC in your environment. export DEVKITPPC=<path to>devkitPPC) $(error "Please set DEVKITPPC in your environment. export DEVKITPPC=<path to>devkitPPC)
endif endif
ifeq ($(strip $(WUT_ROOT)),)
$(error "Please set DEVKITPPC in your environment. export DEVKITPPC=<path to>devkitPPC)
endif
export PATH := $(DEVKITPPC)/bin:$(PORTLIBS)/bin:$(PATH) export PATH := $(DEVKITPPC)/bin:$(PORTLIBS)/bin:$(PATH)
export PORTLIBS := $(DEVKITPRO)/portlibs/ppc export PORTLIBS := $(DEVKITPRO)/portlibs/ppc
@ -64,7 +60,7 @@ LIBS :=
# list of directories containing libraries, this must be the top level containing # list of directories containing libraries, this must be the top level containing
# include and lib # include and lib
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
LIBDIRS := $(WUT_ROOT) LIBDIRS :=
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
# no real need to edit anything past this point unless you need to add additional # no real need to edit anything past this point unless you need to add additional

View File

@ -10,7 +10,16 @@
#include <unistd.h> #include <unistd.h>
#include <dirent.h> #include <dirent.h>
#include <wups.h> #include <wups.h>
#include <coreinit/screen.h>
extern void (*OSScreenInit)(void);
extern void (*OSScreenShutdown)(void);
extern uint32_t (*OSScreenGetBufferSizeEx)(uint32_t bufferNum);
extern int32_t (*OSScreenSetBufferEx)(uint32_t bufferNum, void * addr);
extern int32_t (*OSScreenClearBufferEx)(uint32_t bufferNum, uint32_t temp);
extern int32_t (*OSScreenFlipBuffersEx)(uint32_t bufferNum);
extern int32_t (*OSScreenPutFontEx)(uint32_t bufferNum, uint32_t posX, uint32_t posY, const char * buffer);
extern int32_t (*OSScreenEnableEx)(uint32_t bufferNum, int32_t enable);
extern uint32_t (*OSScreenPutPixelEx)(uint32_t bufferNum, uint32_t posX, uint32_t posY, uint32_t color);
static void * overlayfunction_ptr __attribute__((section(".data"))) = NULL; static void * overlayfunction_ptr __attribute__((section(".data"))) = NULL;

View File

@ -33,6 +33,7 @@
#include <fcntl.h> #include <fcntl.h>
#include <unistd.h> #include <unistd.h>
#include <dirent.h> #include <dirent.h>
#include <stdbool.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

View File

@ -18,7 +18,6 @@
#ifndef WUPS_HOOKS_DEF_H_ #ifndef WUPS_HOOKS_DEF_H_
#define WUPS_HOOKS_DEF_H_ #define WUPS_HOOKS_DEF_H_
#include <wut_types.h>
#include "common.h" #include "common.h"
#ifdef __cplusplus #ifdef __cplusplus
@ -78,8 +77,8 @@ typedef struct wups_loader_init_fs_args_t {
typedef struct wups_loader_app_started_args_t { typedef struct wups_loader_app_started_args_t {
BOOL sd_mounted; bool sd_mounted;
BOOL usb_mounted; bool usb_mounted;
} wups_loader_app_started_args_t; } wups_loader_app_started_args_t;