fix android build also fix nosdl classes

emawind84 · Jun 13, 2024 · 9cfaccd · 9cfaccd
1 parent 977073c
commit 9cfaccd
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 1 deletion.
diff --git a/mobile/Android_src.mk b/mobile/Android_src.mk
@@ -37,6 +37,7 @@ LOCAL_C_INCLUDES := \
     	$(GZDOOM_TOP_PATH)/src/common/textures \
     	$(GZDOOM_TOP_PATH)/src/common/models \
     	$(GZDOOM_TOP_PATH)/src/common/filesystem/include \
+		$(GZDOOM_TOP_PATH)/src/common/filesystem/source \
     	$(GZDOOM_TOP_PATH)/src/common/utility \
     	$(GZDOOM_TOP_PATH)/src/common/cutscenes \
     	$(GZDOOM_TOP_PATH)/src/common/startscreen \
@@ -403,7 +404,6 @@ PCH_SOURCES = \
 	common/textures/formats/startscreentexture.cpp \
 	common/textures/formats/qoitexture.cpp \
 	common/textures/formats/webptexture.cpp \
-	common/textures/formats/jpegtexture.cpp \
 	common/textures/hires/hqresize.cpp \
 	common/models/models_md3.cpp \
 	common/models/models_md2.cpp \

diff --git a/src/posix/nosdl/gl_sysfb.h b/src/posix/nosdl/gl_sysfb.h
@@ -32,6 +32,11 @@ class SystemGLFrameBuffer : public DFrameBuffer
 
 	//SDL_Window *GetSDLWindow() { return Screen; }
 
+	void setNULLContext();
+	void setMainContext();
+	void setAuxContext(int index);
+	int numAuxContexts();
+
 	virtual int GetTrueHeight() { return GetClientHeight(); }
 
 protected:

diff --git a/src/posix/nosdl/glvideo.cpp b/src/posix/nosdl/glvideo.cpp
@@ -225,6 +225,21 @@ int SystemGLFrameBuffer::GetClientHeight()
 	return height;
 }
 
+// @Cockatrice - This is messy but these are some accessors for basic context usage
+// Aux and null contexts should only be used in texture load threads
+void SystemGLFrameBuffer::setNULLContext() {
+}
+
+void SystemGLFrameBuffer::setMainContext() {
+}
+
+void SystemGLFrameBuffer::setAuxContext(int index) {
+}
+
+int SystemGLFrameBuffer::numAuxContexts() {
+	return 4;
+}
+
 
 // each platform has its own specific version of this function.
 void I_SetWindowTitle(const char* caption)