mirror of
https://github.com/shadps4-emu/ext-SDL.git
synced 2025-02-19 18:21:21 +00:00
Move src/main/haiku/ to src/core/
turns out that this wasn't even built as a static libSDLmain, but as part of the (possibly dynamic) libSDL3
This commit is contained in:
parent
989a8ca90e
commit
63d3fb469d
@ -2350,8 +2350,8 @@ elseif(HAIKU)
|
||||
set(HAVE_SDL_LOCALE TRUE)
|
||||
endif()
|
||||
|
||||
file(GLOB MAIN_SOURCES ${SDL3_SOURCE_DIR}/src/main/haiku/*.cc)
|
||||
list(APPEND SOURCE_FILES ${MAIN_SOURCES})
|
||||
file(GLOB HAIKU_CORE_SOURCES ${SDL3_SOURCE_DIR}/src/core/haiku/*.cc)
|
||||
list(APPEND SOURCE_FILES ${HAIKU_CORE_SOURCES})
|
||||
|
||||
CheckPTHREAD()
|
||||
list(APPEND EXTRA_LIBS root be media game device textencoding)
|
||||
|
@ -169,8 +169,6 @@ TInt E32Main()
|
||||
|
||||
/* end of __NGAGE__ impl */
|
||||
|
||||
/* TODO: remaining platforms */
|
||||
|
||||
#else /* platforms that use a standard main() and just call SDL_RunApp(), like iOS and 3DS */
|
||||
|
||||
#include <SDL3/begin_code.h>
|
||||
|
@ -27,7 +27,7 @@
|
||||
#include <SoundPlayer.h>
|
||||
#include <signal.h>
|
||||
|
||||
#include "../../main/haiku/SDL_BeApp.h"
|
||||
#include "../../core/haiku/SDL_BeApp.h"
|
||||
|
||||
extern "C"
|
||||
{
|
||||
|
@ -42,7 +42,7 @@ extern "C" {
|
||||
#if SDL_VIDEO_OPENGL
|
||||
#include <opengl/GLView.h>
|
||||
#endif
|
||||
#include "../../main/haiku/SDL_BApp.h"
|
||||
#include "../../core/haiku/SDL_BApp.h"
|
||||
|
||||
enum WinCommands
|
||||
{
|
||||
|
@ -29,7 +29,7 @@
|
||||
#include "SDL_bmodes.h"
|
||||
#include "SDL_BWin.h"
|
||||
|
||||
#include "../../main/haiku/SDL_BApp.h"
|
||||
#include "../../core/haiku/SDL_BApp.h"
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
|
@ -26,7 +26,7 @@
|
||||
|
||||
|
||||
/* For application signature. */
|
||||
#include "../../main/haiku/SDL_BeApp.h"
|
||||
#include "../../core/haiku/SDL_BeApp.h"
|
||||
|
||||
#include <Alert.h>
|
||||
#include <Application.h>
|
||||
|
@ -31,7 +31,7 @@
|
||||
#include "SDL_bopengl.h"
|
||||
#endif
|
||||
|
||||
#include "../../main/haiku/SDL_BApp.h"
|
||||
#include "../../core/haiku/SDL_BApp.h"
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
|
@ -28,7 +28,7 @@
|
||||
#include <KernelKit.h>
|
||||
#include <OpenGLKit.h>
|
||||
#include "SDL_BWin.h"
|
||||
#include "../../main/haiku/SDL_BApp.h"
|
||||
#include "../../core/haiku/SDL_BApp.h"
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
|
@ -20,7 +20,7 @@
|
||||
*/
|
||||
|
||||
#include "SDL_internal.h"
|
||||
#include "../../main/haiku/SDL_BApp.h"
|
||||
#include "../../core/haiku/SDL_BApp.h"
|
||||
|
||||
#if SDL_VIDEO_DRIVER_HAIKU
|
||||
|
||||
|
@ -26,7 +26,7 @@
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
#include "../../main/haiku/SDL_BeApp.h"
|
||||
#include "../../core/haiku/SDL_BeApp.h"
|
||||
#include "../SDL_sysvideo.h"
|
||||
|
||||
extern void HAIKU_VideoQuit(_THIS);
|
||||
|
Loading…
x
Reference in New Issue
Block a user