Revert "Fix compiling on latest devkitpro version"

This reverts commit 24fe38cb0c.
This commit is contained in:
Maschell 2019-05-14 20:28:10 +02:00
parent 24fe38cb0c
commit fa4115712c
10 changed files with 11 additions and 12 deletions

View File

@ -8,9 +8,8 @@ $(error "Please set DEVKITPPC in your environment. export DEVKITPPC=<path to>dev
endif endif
ifeq ($(PLATFORM),wiiu) ifeq ($(PLATFORM),wiiu)
MACHDEP = -DESPRESSO -mcpu=750 -meabi -mhard-float MACHDEP = -DESPRESSO -mwup -mcpu=750 -meabi -mhard-float
include $(DEVKITPPC)/base_rules include $(DEVKITPPC)/base_rules
export PORTLIBS := $(DEVKITPRO)/portlibs/ppc
endif endif
ifeq ($(PLATFORM),wii) ifeq ($(PLATFORM),wii)

View File

@ -35,9 +35,9 @@
EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#if defined (ESPRESSO) #if defined (__wiiu__)
#elif defined(__gamecube__) || defined (ESPRESSO) #elif defined(__gamecube__) || defined (__wii__)
#include <ogc/lwp_watchdog.h> #include <ogc/lwp_watchdog.h>
#endif #endif
#include <string.h> #include <string.h>

View File

@ -43,7 +43,7 @@
#include <stddef.h> #include <stddef.h>
#include <stdint.h> #include <stdint.h>
#if defined (ESPRESSO) #if defined (__wiiu__)
#include <iosuhax_disc_interface.h> #include <iosuhax_disc_interface.h>
typedef uint8_t u8; typedef uint8_t u8;
typedef uint16_t u16; typedef uint16_t u16;

View File

@ -69,7 +69,7 @@ extern char *strsep(char **stringp, const char *delim);
#define O_BINARY 0 /* unix is binary by default */ #define O_BINARY 0 /* unix is binary by default */
#endif #endif
#if defined(GEKKO) || defined (ESPRESSO) #if defined(GEKKO) || defined (__wiiu__)
#include "mem_allocate.h" #include "mem_allocate.h"

View File

@ -66,7 +66,7 @@
#include <sys/xattr.h> #include <sys/xattr.h>
#endif #endif
#if defined(ESPRESSO) #if defined(__wiiu__)
#define major(dev) ((int)(((unsigned int) (dev) >> 8) & 0xff)) #define major(dev) ((int)(((unsigned int) (dev) >> 8) & 0xff))
#define minor(dev) ((int)((dev) & 0xff)) #define minor(dev) ((int)((dev) & 0xff))
#endif // defined #endif // defined

View File

@ -28,7 +28,7 @@
#include "types.h" #include "types.h"
#include "cache2.h" #include "cache2.h"
#if defined (ESPRESSO) #if defined (__wiiu__)
#include <iosuhax_disc_interface.h> #include <iosuhax_disc_interface.h>
typedef uint8_t u8; typedef uint8_t u8;
typedef uint16_t u16; typedef uint16_t u16;

View File

@ -52,7 +52,7 @@ static inline void _NTFS_unlock(mutex_t *mutex)
LWP_MutexUnlock(*mutex); LWP_MutexUnlock(*mutex);
} }
/* //not working. /* //not working.
#elif defined(ESPRESSO) #elif defined(__wiiu__)
#ifndef mutex_t #ifndef mutex_t
typedef int mutex_t; typedef int mutex_t;
#endif #endif

View File

@ -52,7 +52,7 @@ const INTERFACE_ID ntfs_disc_interfaces[] = {
{ NULL, NULL } { NULL, NULL }
}; };
#elif defined (ESPRESSO) #elif defined (__wiiu__)
#include <iosuhax_disc_interface.h> #include <iosuhax_disc_interface.h>
const INTERFACE_ID ntfs_disc_interfaces[] = { const INTERFACE_ID ntfs_disc_interfaces[] = {

View File

@ -41,7 +41,7 @@
#include "lock.h" #include "lock.h"
#include "unistr.h" #include "unistr.h"
#if defined (ESPRESSO) #if defined (__wiiu__)
#include <iosuhax_disc_interface.h> #include <iosuhax_disc_interface.h>
typedef uint8_t u8; typedef uint8_t u8;
typedef uint16_t u16; typedef uint16_t u16;

View File

@ -40,7 +40,7 @@
/* /*
* assume "struct timespec" is not defined if st_mtime is not defined * assume "struct timespec" is not defined if st_mtime is not defined
*/ */
#if !defined(st_mtime) & !defined(__timespec_defined) & !defined(ESPRESSO) #if !defined(st_mtime) & !defined(__timespec_defined) & !defined(__wiiu__)
struct timespec { struct timespec {
time_t tv_sec; time_t tv_sec;
long tv_nsec; long tv_nsec;