Browse Source

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
Daniel Gibson 2 years ago
parent
commit
63d3fb469d

+ 2 - 2
CMakeLists.txt

@@ -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)

+ 0 - 2
include/SDL3/SDL_main_impl.h

@@ -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>

+ 1 - 1
src/audio/haiku/SDL_haikuaudio.cc

@@ -27,7 +27,7 @@
 #include <SoundPlayer.h>
 #include <signal.h>
 
-#include "../../main/haiku/SDL_BeApp.h"
+#include "../../core/haiku/SDL_BeApp.h"
 
 extern "C"
 {

+ 0 - 0
src/main/haiku/SDL_BApp.h → src/core/haiku/SDL_BApp.h


+ 0 - 0
src/main/haiku/SDL_BeApp.cc → src/core/haiku/SDL_BeApp.cc


+ 0 - 0
src/main/haiku/SDL_BeApp.h → src/core/haiku/SDL_BeApp.h


+ 1 - 1
src/video/haiku/SDL_BWin.h

@@ -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
 {

+ 1 - 1
src/video/haiku/SDL_bframebuffer.cc

@@ -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" {

+ 1 - 1
src/video/haiku/SDL_bmessagebox.cc

@@ -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>

+ 1 - 1
src/video/haiku/SDL_bmodes.cc

@@ -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" {

+ 1 - 1
src/video/haiku/SDL_bopengl.cc

@@ -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" {

+ 1 - 1
src/video/haiku/SDL_bvideo.cc

@@ -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
 

+ 1 - 1
src/video/haiku/SDL_bvideo.h

@@ -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);