sabijdsads

src/al-util.h

@@ -22,7 +22,7 @@
 #ifndef ALUTIL_H
 #define ALUTIL_H
 
-#include <al.h>
+#include <AL/al.h>
 #include <SDL3/SDL_audio.h>
 #include <assert.h>
 

src/alstream.h

@@ -74,7 +74,8 @@ struct ALStream
 	uint64_t procFrames;
 	AL::Buffer::ID lastBuf;
 
-	SDL_IOStream srcOps;
+	// made it pointer, idk if its right. never worked with SDL
+	SDL_IOStream* srcOps;
 
 	struct
 	{

src/bitmap.cpp

@@ -92,7 +92,7 @@ struct BitmapPrivate
 	 * getPixel calls. Is invalidated any time the bitmap
 	 * is modified */
 	SDL_Surface *surface;
-	SDL_PixelFormat *format;
+	SDL_PixelFormatDetails *format;
 
 	/* The 'tainted' area describes which parts of the
 	 * bitmap are not cleared, ie. don't have 0 opacity.

src/bitmap.h

@@ -26,6 +26,7 @@
 #include "etc-internal.h"
 #include "etc.h"
 
+// #include <sigc++/signal.h>
 #include <sigc++/signal.h>
 
 class Font;

src/disposable.h

@@ -28,8 +28,11 @@
 #include "graphics.h"
 
 #include <assert.h>
+
 #include <sigc++/signal.h>
+// #include <sigc++2.0/sigc++/signal.h>
 #include <sigc++/connection.h>
+// #include <sigc++2.0/sigc++/connection.h>
 
 class Disposable
 {

src/etc.cpp

@@ -24,7 +24,8 @@
 #include "serial-util.h"
 #include "exception.h"
 
-#include <SDL3/SDL_types.h>
+// this file doesn't exist, idk what to do if it, so i'll comment it.
+// #include <SDL3/SDL_types.h>
 #include <SDL3/SDL_pixels.h>
 
 Color::Color(double red, double green, double blue, double alpha)

src/etc.h

@@ -22,7 +22,7 @@
 #ifndef ETC_H
 #define ETC_H
 
-#include <sigc++/signal.h>
+#include <sigc++-2.0/sigc++/signal.h>
 
 #include "serializable.h"
 #include "etc-internal.h"

src/eventthread.cpp

@@ -30,8 +30,10 @@
 #include <SDL3/SDL_touch.h>
 #include <SDL3/SDL_rect.h>
 
-#include <al.h>
+// #include <al.h>
-#include <alc.h>
+#include <AL/al.h>
+// #include <alc.h>
+#include <AL/alc.h>
 
 #include "sharedstate.h"
 #include "graphics.h"
@@ -123,7 +125,7 @@ void EventThread::process(RGSSThreadData &rtData)
 
 	// XXX this function breaks input focus on OSX
 	#ifndef __APPLE__
-		SDL_SetEventFilter(eventFilter, &rtData);
+		SDL_SetEventFilter(eventFilter, (void*)&rtData);
 	#endif
 
 	fullscreen = rtData.config.fullscreen;
@@ -541,7 +543,7 @@ void EventThread::process(RGSSThreadData &rtData)
 	delete sMenu;
 }
 
-int EventThread::eventFilter(void *data, SDL_Event *event)
+bool EventThread::eventFilter(void *data, SDL_Event *event)
 {
 	RGSSThreadData &rtData = *static_cast<RGSSThreadData*>(data);
 

src/eventthread.h

@@ -110,7 +110,7 @@ public:
 	void notifyGameScreenChange(const SDL_Rect &screen);
 
 private:
-	static int eventFilter(void *, SDL_Event*);
+	static bool eventFilter(void *, SDL_Event*);
 
 	void resetInputStates();
 	void setFullscreen(SDL_Window *, bool mode);

src/filesystem.cpp

@@ -143,12 +143,12 @@ static PHYSFS_Io *createSDLRWIo(const char *filename)
 	return io;
 }
 
-static inline PHYSFS_File *sdlPHYS(SDL_IOStream *ops)
+static inline PHYSFS_File *sdlPHYS(SDL_RWops *ops)
 {
 	return static_cast<PHYSFS_File*>(ops->hidden.unknown.data1);
 }
 
-static Sint64 SDL_RWopsSize(SDL_IOStream *ops)
+static Sint64 SDL_RWopsSize(SDL_RWops *ops)
 {
 	PHYSFS_File *f = sdlPHYS(ops);
 

src/sharedstate.h

@@ -22,7 +22,8 @@
 #ifndef SHAREDSTATE_H
 #define SHAREDSTATE_H
 
-#include <sigc++/signal.h>
+// #include <sigc++/signal.h>
+#include <sigc++-2.0/sigc++/signal.h>
 
 #define shState SharedState::instance
 #define glState shState->_glState()