diff --git a/scratchpad/multiplatform/api.h b/scratchpad/multiplatform/api.h index d0711bf..b47a4bb 100644 --- a/scratchpad/multiplatform/api.h +++ b/scratchpad/multiplatform/api.h @@ -5,4 +5,14 @@ void prSayHello(void); +#ifdef PR_PLATFORM_LINUX + #include "linux/aliases.h" + #include "linux/api.h" +#elif defined(PR_PLATFORM_MACOS) + #include "macos/aliases.h" + #include "macos/api.h" +#else + #error "Unrecognised platform" +#endif + #endif // !API_H diff --git a/scratchpad/multiplatform/base/api.c b/scratchpad/multiplatform/base/api.c deleted file mode 100644 index b252ae5..0000000 --- a/scratchpad/multiplatform/base/api.c +++ /dev/null @@ -1,9 +0,0 @@ -// vim:fileencoding=utf-8:foldmethod=marker - -#include "api.h" - -#ifdef WP_PLATFORM_LINUX -#include "../linux/api.c" -#elif defined(WP_PLATFORM_MACOS) -#include "../macos/api.c" -#endif diff --git a/scratchpad/multiplatform/base/api.h b/scratchpad/multiplatform/base/api.h deleted file mode 100644 index ec64b0b..0000000 --- a/scratchpad/multiplatform/base/api.h +++ /dev/null @@ -1,17 +0,0 @@ -// vim:fileencoding=utf-8:foldmethod=marker - -#ifndef API_H -#define API_H - -#include "../../../src/wapp/wapp.h" -#include "../api.h" - -#ifdef WP_PLATFORM_LINUX -#include "../linux/aliases.h" -#include "../linux/api.h" -#elif defined(WP_PLATFORM_MACOS) -#include "../macos/aliases.h" -#include "../macos/api.h" -#endif - -#endif // !API_H diff --git a/scratchpad/multiplatform/macos/api.h b/scratchpad/multiplatform/macos/api.h index 4bd8e0b..9b64a61 100644 --- a/scratchpad/multiplatform/macos/api.h +++ b/scratchpad/multiplatform/macos/api.h @@ -3,8 +3,6 @@ #ifndef MACOS_API_H #define MACOS_API_H -#define prSayHello prSayHelloMac - void prSayHelloMac(void); #endif // !MACOS_API_H