Merge remote-tracking branch 'upstream/master'

Joshyfishy22 · Oct 28, 2023 · c33fad1 · c33fad1
2 parents bbbf803 + 7ece36c
commit c33fad1
Show file tree

Hide file tree

Showing 13 changed files with 1,857 additions and 20 deletions.
diff --git a/Makefile b/Makefile
@@ -155,18 +155,22 @@ irix:
 #  separate makefiles to avoid having one giant messy makefile
 psp:
 	$(MAKE) -f src/Makefile_PSP PLAT=psp
+vita:
+	$(MAKE) -f src/Makefile_vita PLAT=vita
+ps3:
+	$(MAKE) -f src/Makefile_PS3 PLAT=ps3
 3ds:
 	$(MAKE) -f src/Makefile_3DS PLAT=3ds
 wii:
 	$(MAKE) -f src/Makefile_wii PLAT=wii
 gamecube:
 	$(MAKE) -f src/Makefile_gamecube PLAT=gamecube
-xbox:
-	$(MAKE) -f src/Makefile_xbox PLAT=xbox
-vita:
-	$(MAKE) -f src/Makefile_vita PLAT=vita
 dreamcast:
 	$(MAKE) -f src/Makefile_dreamcast PLAT=dreamcast
+xbox:
+	$(MAKE) -f src/Makefile_xbox PLAT=xbox
+xbox360:
+	$(MAKE) -f src/Makefile_xbox PLAT=xbox360
 
 clean:
 	$(DEL) $(OBJECTS)

diff --git a/misc/D3D11ShaderGen.c → misc/windows/D3D11ShaderGen.c b/misc/D3D11ShaderGen.c → misc/windows/D3D11ShaderGen.c
diff --git a/src/Core.h b/src/Core.h
@@ -129,6 +129,14 @@ typedef cc_uint8  cc_bool;
 	#define CC_BUILD_LOWMEM
 	#define CC_BUILD_HTTPCLIENT
 	#undef CC_BUILD_FREETYPE
+#elif defined XENON
+	/* libxenon also defines __linux__ (yes, really) */
+	#define CC_BUILD_XBOX360
+	#define CC_BUILD_NOMUSIC
+	#define CC_BUILD_NOSOUNDS
+	#define CC_BUILD_LOWMEM
+	#define CC_BUILD_HTTPCLIENT
+	#undef CC_BUILD_FREETYPE
 #elif defined _WIN32
 	#define CC_BUILD_WIN
 	#define CC_BUILD_D3D9
@@ -284,6 +292,12 @@ typedef cc_uint8  cc_bool;
 	#define CC_BUILD_DREAMCAST
 	#define CC_BUILD_LOWMEM
 	#undef CC_BUILD_FREETYPE
+#elif defined PLAT_PS3
+	#define CC_BUILD_HTTPCLIENT
+	#define CC_BUILD_OPENAL
+	#define CC_BUILD_PS3
+	#define CC_BUILD_LOWMEM
+	#undef CC_BUILD_FREETYPE
 #endif
 #endif
 

diff --git a/src/Graphics_Dreamcast.c b/src/Graphics_Dreamcast.c
@@ -142,8 +142,6 @@ void Gfx_EndFrame(void) {
 }
 
 void Gfx_OnWindowResize(void) {
-	/* TODO: Eliminate this nasty hack.. */
-	Game_UpdateDimensions();
 	glViewport(0, 0, Game.Width, Game.Height);
 }