From ca8ebf7fc049d1798aacd74ba683dc817d393fa7 Mon Sep 17 00:00:00 2001 From: T_chan Date: Sun, 16 Feb 2025 12:30:04 +0100 Subject: [PATCH] Change all ifdefs to support both DC & Naomi --- GL/matrix.c | 2 +- GL/platform.h | 2 +- GL/private.h | 4 ++-- GL/texture.c | 2 +- containers/aligned_vector.h | 2 +- samples/blend_test/main.c | 4 ++-- samples/cubes/main.cpp | 14 +++++++------- samples/depth_funcs/main.c | 4 ++-- samples/depth_funcs_alpha_testing/main.c | 6 +++--- samples/depth_funcs_ortho/main.c | 4 ++-- samples/lerabot01/main.c | 6 +++--- samples/lights/main.c | 6 +++--- samples/mipmap/main.c | 6 +++--- samples/multitexture_arrays/main.c | 6 +++--- samples/nehe02/main.c | 4 ++-- samples/nehe02de/main.c | 4 ++-- samples/nehe02va/main.c | 4 ++-- samples/nehe03/main.c | 4 ++-- samples/nehe04/main.c | 4 ++-- samples/nehe05/main.c | 4 ++-- samples/nehe06/main.c | 6 +++--- samples/nehe06_4444twid/main.c | 6 +++--- samples/nehe06_vq/main.c | 6 +++--- samples/nehe08/main.c | 6 +++--- samples/nehe10/main.c | 8 ++++---- samples/nehe20/main.c | 10 +++++----- samples/ortho2d/main.c | 4 ++-- samples/paletted/main.c | 6 +++--- samples/paletted_pcx/main.c | 6 +++--- samples/polygon_offset/main.c | 4 ++-- samples/polymark/main.c | 8 ++++---- samples/primitive_modes/main.c | 6 +++--- samples/prof_texture_upload/main.c | 6 +++--- samples/quadmark/main.c | 8 ++++---- samples/scissor/main.c | 4 ++-- samples/terrain/main.c | 4 ++-- samples/zclip/main.c | 6 +++--- samples/zclip_triangle/main.c | 4 ++-- samples/zclip_trianglestrip/main.c | 6 +++--- tests/zclip/main.cpp | 2 +- 40 files changed, 104 insertions(+), 104 deletions(-) diff --git a/GL/matrix.c b/GL/matrix.c index 29f980e..452fae9 100644 --- a/GL/matrix.c +++ b/GL/matrix.c @@ -181,7 +181,7 @@ void APIENTRY glRotatef(GLfloat angle, GLfloat x, GLfloat y, GLfloat z) { 0.0f, 0.0f, 0.0f, 1.0f }; -#ifdef __DREAMCAST__ +#ifdef _arch_dreamcast float s, c; fsincos(angle, &s, &c); #else diff --git a/GL/platform.h b/GL/platform.h index 2cf6055..7501c35 100644 --- a/GL/platform.h +++ b/GL/platform.h @@ -445,7 +445,7 @@ static inline void CompilePolyHeader(PolyHeader *dst, const PolyContext *src) { dst->d3 = dst->d4 = 0xffffffff; } -#if defined(__DREAMCAST__) || defined(__NAOMI__) +#ifdef _arch_dreamcast #include "platforms/sh4.h" #else #include "platforms/software.h" diff --git a/GL/private.h b/GL/private.h index 35707fd..db8fe47 100644 --- a/GL/private.h +++ b/GL/private.h @@ -224,7 +224,7 @@ GL_FORCE_INLINE float clamp(float d, float min, float max) { } GL_FORCE_INLINE void memcpy_vertex(Vertex *dest, const Vertex *src) { -#ifdef __DREAMCAST__ +#ifdef _arch_dreamcast _Complex float double_scratch; asm volatile ( @@ -260,7 +260,7 @@ do { \ memcpy_vertex(b, &c); \ } while(0) -#ifdef __DREAMCAST__ +#ifdef _arch_dreamcast #define fast_rsqrt(x) frsqrt(x) #else #define fast_rsqrt(x) (1.0f / __builtin_sqrtf(x)) diff --git a/GL/texture.c b/GL/texture.c index e546ea8..a2ad167 100644 --- a/GL/texture.c +++ b/GL/texture.c @@ -538,7 +538,7 @@ GLubyte _glInitTextures() { ALLOC_SIZE = vram_free - PVR_MEM_BUFFER_SIZE; /* Take all but 64kb VRAM */ ALLOC_BASE = GPUMemoryAlloc(ALLOC_SIZE); -#ifdef __DREAMCAST__ +#ifdef _arch_dreamcast /* Ensure memory is aligned */ gl_assert((uintptr_t) ALLOC_BASE % 32 == 0); #endif diff --git a/containers/aligned_vector.h b/containers/aligned_vector.h index 5d50956..29a0978 100644 --- a/containers/aligned_vector.h +++ b/containers/aligned_vector.h @@ -30,7 +30,7 @@ static inline void* memalign(size_t alignment, size_t size) { #define AV_NO_INLINE __attribute__((noinline)) -#ifdef __DREAMCAST__ +#ifdef _arch_dreamcast AV_FORCE_INLINE void *AV_MEMCPY4(void *dest, const void *src, size_t len) { diff --git a/samples/blend_test/main.c b/samples/blend_test/main.c index 1303f7f..7971c9a 100644 --- a/samples/blend_test/main.c +++ b/samples/blend_test/main.c @@ -5,7 +5,7 @@ * and with adapted/corrected explanation */ -#ifdef __DREAMCAST__ +#ifdef _arch_dreamcast #include #endif @@ -48,7 +48,7 @@ void ReSizeGLScene(int Width, int Height) } int check_start() { -#ifdef __DREAMCAST__ +#ifdef _arch_dreamcast maple_device_t *cont; cont_state_t *state; diff --git a/samples/cubes/main.cpp b/samples/cubes/main.cpp index b42063b..8472ee0 100644 --- a/samples/cubes/main.cpp +++ b/samples/cubes/main.cpp @@ -3,7 +3,7 @@ #include #include -#ifdef __DREAMCAST__ +#ifdef _arch_dreamcast #include float avgfps = -1; #endif @@ -123,7 +123,7 @@ float lutScaleFactors[MAX_CUBES]; void debugLog(const char* msg) { -#ifdef __DREAMCAST__ +#ifdef _arch_dreamcast dbglog(DBG_KDEBUG, "%s\n", msg); #else printf("%s\n", msg); @@ -133,7 +133,7 @@ void debugLog(const char* msg) void runningStats() { -#ifdef __DREAMCAST__ +#ifdef _arch_dreamcast pvr_stats_t stats; pvr_get_stats(&stats); @@ -147,7 +147,7 @@ void runningStats() void avgStats() { -#ifdef __DREAMCAST__ +#ifdef _arch_dreamcast dbglog(DBG_DEBUG, "Average frame rate: ~%f fps\n", avgfps); #endif } @@ -155,7 +155,7 @@ void avgStats() void stats() { -#ifdef __DREAMCAST__ +#ifdef _arch_dreamcast pvr_stats_t stats; pvr_get_stats(&stats); @@ -345,7 +345,7 @@ void updateLogic() void updateInput() { -#ifdef __DREAMCAST__ +#ifdef _arch_dreamcast static uint8_t prevButtons = 0; maple_device_t* cont; cont_state_t* state; @@ -383,7 +383,7 @@ void updateInput() void swapBuffers() { -#ifdef __DREAMCAST__ +#ifdef _arch_dreamcast glKosSwapBuffers(); #endif } diff --git a/samples/depth_funcs/main.c b/samples/depth_funcs/main.c index ec80e79..1140a42 100644 --- a/samples/depth_funcs/main.c +++ b/samples/depth_funcs/main.c @@ -1,4 +1,4 @@ -#ifdef __DREAMCAST__ +#ifdef _arch_dreamcast #include #endif @@ -39,7 +39,7 @@ void ReSizeGLScene(int Width, int Height) } int check_start() { -#ifdef __DREAMCAST__ +#ifdef _arch_dreamcast maple_device_t *cont; cont_state_t *state; diff --git a/samples/depth_funcs_alpha_testing/main.c b/samples/depth_funcs_alpha_testing/main.c index 257b093..762e0eb 100644 --- a/samples/depth_funcs_alpha_testing/main.c +++ b/samples/depth_funcs_alpha_testing/main.c @@ -1,4 +1,4 @@ -#ifdef __DREAMCAST__ +#ifdef _arch_dreamcast #include #endif @@ -9,7 +9,7 @@ //$KOS_BASE/utils/texconv/texconv --in disk.png --format ARGB4444 --preview disk_preview.png --out disk.dtex -#ifdef __DREAMCAST__ +#ifdef _arch_dreamcast extern uint8_t romdisk[]; KOS_INIT_ROMDISK(romdisk); #define IMAGE_FILENAME "/rd/disk_1555.dtex" @@ -105,7 +105,7 @@ void DrawGLScene() } int check_start() { -#ifdef __DREAMCAST__ +#ifdef _arch_dreamcast maple_device_t *cont; cont_state_t *state; diff --git a/samples/depth_funcs_ortho/main.c b/samples/depth_funcs_ortho/main.c index c2703f5..5bc1b39 100644 --- a/samples/depth_funcs_ortho/main.c +++ b/samples/depth_funcs_ortho/main.c @@ -1,4 +1,4 @@ -#ifdef __DREAMCAST__ +#ifdef _arch_dreamcast #include #endif @@ -53,7 +53,7 @@ void DrawSquare(float width, float r, float g, float b, float z) { } int check_start() { -#ifdef __DREAMCAST__ +#ifdef _arch_dreamcast maple_device_t *cont; cont_state_t *state; diff --git a/samples/lerabot01/main.c b/samples/lerabot01/main.c index d16c0a5..7971870 100644 --- a/samples/lerabot01/main.c +++ b/samples/lerabot01/main.c @@ -4,7 +4,7 @@ #include #include -#ifdef __DREAMCAST__ +#ifdef _arch_dreamcast #include #endif @@ -12,7 +12,7 @@ #include "GL/glu.h" #include "GL/glkos.h" -#ifdef __DREAMCAST__ +#ifdef _arch_dreamcast extern uint8 romdisk[]; KOS_INIT_ROMDISK(romdisk); #define IMAGE_FILENAME "/rd/flag1.bmp" @@ -120,7 +120,7 @@ void ReSizeGLScene(int Width, int Height) } int check_start() { -#ifdef __DREAMCAST__ +#ifdef _arch_dreamcast maple_device_t *cont; cont_state_t *state; diff --git a/samples/lights/main.c b/samples/lights/main.c index 223bd86..cb49534 100644 --- a/samples/lights/main.c +++ b/samples/lights/main.c @@ -3,7 +3,7 @@ #include #include -#ifdef __DREAMCAST__ +#ifdef _arch_dreamcast #include #endif @@ -12,7 +12,7 @@ #include "GL/glext.h" #include "GL/glkos.h" -#ifdef __DREAMCAST__ +#ifdef _arch_dreamcast #include extern uint8_t romdisk[]; KOS_INIT_ROMDISK(romdisk); @@ -125,7 +125,7 @@ void ReSizeGLScene(int Width, int Height) } int check_start() { -#ifdef __DREAMCAST__ +#ifdef _arch_dreamcast maple_device_t *cont; cont_state_t *state; diff --git a/samples/mipmap/main.c b/samples/mipmap/main.c index 8dc5fca..a39b55e 100644 --- a/samples/mipmap/main.c +++ b/samples/mipmap/main.c @@ -2,7 +2,7 @@ #include #include -#ifdef __DREAMCAST__ +#ifdef _arch_dreamcast #include #endif @@ -11,7 +11,7 @@ #include "GL/glext.h" #include "GL/glkos.h" -#ifdef __DREAMCAST__ +#ifdef _arch_dreamcast extern uint8_t romdisk[]; KOS_INIT_ROMDISK(romdisk); #define IMAGE_FILENAME "/rd/NeHe.bmp" @@ -87,7 +87,7 @@ void ReSizeGLScene(int Width, int Height) } int check_start() { -#ifdef __DREAMCAST__ +#ifdef _arch_dreamcast maple_device_t *cont; cont_state_t *state; diff --git a/samples/multitexture_arrays/main.c b/samples/multitexture_arrays/main.c index 44474cf..d62e30e 100644 --- a/samples/multitexture_arrays/main.c +++ b/samples/multitexture_arrays/main.c @@ -11,7 +11,7 @@ #include #include -#ifdef __DREAMCAST__ +#ifdef _arch_dreamcast #include #endif @@ -20,7 +20,7 @@ #include "GL/glkos.h" #include "GL/glext.h" -#ifdef __DREAMCAST__ +#ifdef _arch_dreamcast extern uint8_t romdisk[]; KOS_INIT_ROMDISK(romdisk); #define IMAGE1_FILENAME "/rd/wp001vq.pvr" @@ -48,7 +48,7 @@ GLfloat TEXCOORD_ARRAY[4 * 2] = { 0, 0, GLuint ARGB_ARRAY[4] = { 0xFFFF0000, 0xFF0000FF, 0xFF00FF00, 0xFFFFFF00 }; int check_start() { -#ifdef __DREAMCAST__ +#ifdef _arch_dreamcast maple_device_t *cont; cont_state_t *state; diff --git a/samples/nehe02/main.c b/samples/nehe02/main.c index 7775721..cf3240e 100644 --- a/samples/nehe02/main.c +++ b/samples/nehe02/main.c @@ -1,4 +1,4 @@ -#ifdef __DREAMCAST__ +#ifdef _arch_dreamcast #include #endif @@ -39,7 +39,7 @@ void ReSizeGLScene(int Width, int Height) } int check_start() { -#ifdef __DREAMCAST__ +#ifdef _arch_dreamcast maple_device_t *cont; cont_state_t *state; diff --git a/samples/nehe02de/main.c b/samples/nehe02de/main.c index 1aca26b..633fa81 100644 --- a/samples/nehe02de/main.c +++ b/samples/nehe02de/main.c @@ -1,4 +1,4 @@ -#ifdef __DREAMCAST__ +#ifdef _arch_dreamcast #include #endif @@ -41,7 +41,7 @@ void ReSizeGLScene(int Width, int Height) } int check_start() { -#ifdef __DREAMCAST__ +#ifdef _arch_dreamcast maple_device_t *cont; cont_state_t *state; diff --git a/samples/nehe02va/main.c b/samples/nehe02va/main.c index a89d104..0c5442e 100644 --- a/samples/nehe02va/main.c +++ b/samples/nehe02va/main.c @@ -1,4 +1,4 @@ -#ifdef __DREAMCAST__ +#ifdef _arch_dreamcast #include #endif @@ -41,7 +41,7 @@ void ReSizeGLScene(int Width, int Height) } int check_start() { -#ifdef __DREAMCAST__ +#ifdef _arch_dreamcast maple_device_t *cont; cont_state_t *state; diff --git a/samples/nehe03/main.c b/samples/nehe03/main.c index 193af39..88a0a2a 100644 --- a/samples/nehe03/main.c +++ b/samples/nehe03/main.c @@ -1,4 +1,4 @@ -#ifdef __DREAMCAST__ +#ifdef _arch_dreamcast #include #endif @@ -39,7 +39,7 @@ void ReSizeGLScene(int Width, int Height) } int check_start() { -#ifdef __DREAMCAST__ +#ifdef _arch_dreamcast maple_device_t *cont; cont_state_t *state; diff --git a/samples/nehe04/main.c b/samples/nehe04/main.c index 1715268..e37f905 100644 --- a/samples/nehe04/main.c +++ b/samples/nehe04/main.c @@ -1,4 +1,4 @@ -#ifdef __DREAMCAST__ +#ifdef _arch_dreamcast #include #endif @@ -42,7 +42,7 @@ void ReSizeGLScene(int Width, int Height) } int check_start() { -#ifdef __DREAMCAST__ +#ifdef _arch_dreamcast maple_device_t *cont; cont_state_t *state; diff --git a/samples/nehe05/main.c b/samples/nehe05/main.c index cc1499d..9cd693a 100644 --- a/samples/nehe05/main.c +++ b/samples/nehe05/main.c @@ -1,4 +1,4 @@ -#ifdef __DREAMCAST__ +#ifdef _arch_dreamcast #include #endif @@ -42,7 +42,7 @@ void ReSizeGLScene(int Width, int Height) } int check_start() { -#ifdef __DREAMCAST__ +#ifdef _arch_dreamcast maple_device_t *cont; cont_state_t *state; diff --git a/samples/nehe06/main.c b/samples/nehe06/main.c index d726289..f3a8439 100644 --- a/samples/nehe06/main.c +++ b/samples/nehe06/main.c @@ -3,7 +3,7 @@ #include #include -#ifdef __DREAMCAST__ +#ifdef _arch_dreamcast #include #endif @@ -12,7 +12,7 @@ #include "GL/glext.h" #include "GL/glkos.h" -#ifdef __DREAMCAST__ +#ifdef _arch_dreamcast extern uint8_t romdisk[]; KOS_INIT_ROMDISK(romdisk); #define IMAGE_FILENAME "/rd/NeHe.bmp" @@ -96,7 +96,7 @@ void ReSizeGLScene(int Width, int Height) } int check_start() { -#ifdef __DREAMCAST__ +#ifdef _arch_dreamcast maple_device_t *cont; cont_state_t *state; diff --git a/samples/nehe06_4444twid/main.c b/samples/nehe06_4444twid/main.c index f290c6f..fed5fdc 100644 --- a/samples/nehe06_4444twid/main.c +++ b/samples/nehe06_4444twid/main.c @@ -2,7 +2,7 @@ #include #include -#ifdef __DREAMCAST__ +#ifdef _arch_dreamcast #include #endif @@ -11,7 +11,7 @@ #include "GL/glkos.h" #include "GL/glext.h" -#ifdef __DREAMCAST__ +#ifdef _arch_dreamcast extern uint8 romdisk[]; KOS_INIT_ROMDISK(romdisk); #define IMG_PATH "/rd/NeHe.tex" @@ -199,7 +199,7 @@ void ReSizeGLScene(int Width, int Height) } int check_start() { -#ifdef __DREAMCAST__ +#ifdef _arch_dreamcast maple_device_t *cont; cont_state_t *state; diff --git a/samples/nehe06_vq/main.c b/samples/nehe06_vq/main.c index bd0df56..ac8c677 100644 --- a/samples/nehe06_vq/main.c +++ b/samples/nehe06_vq/main.c @@ -1,7 +1,7 @@ #include #include -#ifdef __DREAMCAST__ +#ifdef _arch_dreamcast #include #endif @@ -10,7 +10,7 @@ #include "GL/glkos.h" #include "GL/glext.h" -#ifdef __DREAMCAST__ +#ifdef _arch_dreamcast extern uint8 romdisk[]; KOS_INIT_ROMDISK(romdisk); #define IMG_PATH "/rd/NeHe.tex" @@ -215,7 +215,7 @@ void ReSizeGLScene(int Width, int Height) } int check_start() { -#ifdef __DREAMCAST__ +#ifdef _arch_dreamcast maple_device_t *cont; cont_state_t *state; diff --git a/samples/nehe08/main.c b/samples/nehe08/main.c index 4048b59..0069f54 100644 --- a/samples/nehe08/main.c +++ b/samples/nehe08/main.c @@ -8,7 +8,7 @@ (c)2000 Jeff Molofee */ -#ifdef __DREAMCAST__ +#ifdef _arch_dreamcast #include #endif #include @@ -26,7 +26,7 @@ blending. */ -#ifdef __DREAMCAST__ +#ifdef _arch_dreamcast extern uint8 romdisk[]; KOS_INIT_ROMDISK(romdisk); #define IMG_PATH "/rd/glass.pvr" @@ -163,7 +163,7 @@ void DrawGLScene(void) { } int ReadController(void) { -#ifdef __DREAMCAST__ +#ifdef _arch_dreamcast maple_device_t *cont; cont_state_t *state; diff --git a/samples/nehe10/main.c b/samples/nehe10/main.c index aa6c87f..ad65761 100644 --- a/samples/nehe10/main.c +++ b/samples/nehe10/main.c @@ -8,7 +8,7 @@ (c)2000 Jeff Molofee */ -#ifdef __DREAMCAST__ +#ifdef _arch_dreamcast #include #else #include @@ -25,7 +25,7 @@ #include "../loadbmp.h" -#ifdef __DREAMCAST__ +#ifdef _arch_dreamcast extern uint8 romdisk[]; KOS_INIT_ROMDISK(romdisk); #define IMG_PATH "/rd/brick.bmp" @@ -88,7 +88,7 @@ void SetupWorld() int numtriangles; FILE *filein; char oneline[255]; -#ifdef __DREAMCAST__ +#ifdef _arch_dreamcast filein = fopen("/rd/world.txt", "rt"); // File To Load World Data From #else filein = fopen("../samples/nehe10/romdisk/world.txt", "rt"); @@ -248,7 +248,7 @@ int ReadController(void) { bool right = false; -#ifdef __DREAMCAST__ +#ifdef _arch_dreamcast maple_device_t *cont; cont_state_t *state; diff --git a/samples/nehe20/main.c b/samples/nehe20/main.c index bce9182..6431176 100644 --- a/samples/nehe20/main.c +++ b/samples/nehe20/main.c @@ -12,7 +12,7 @@ #include -#ifdef __DREAMCAST__ +#ifdef _arch_dreamcast #include #endif @@ -21,7 +21,7 @@ uint32_t waittime = 1000.0f/FPS; uint32_t framestarttime = 0; int32_t delaytime; -#ifdef __DREAMCAST__ +#ifdef _arch_dreamcast extern uint8_t romdisk[]; KOS_INIT_ROMDISK(romdisk); #define IMG_LOGO_PATH "/rd/logo.bmp" @@ -57,7 +57,7 @@ KOS_INIT_ROMDISK(romdisk); #if defined(__APPLE__) && defined(__MACH__) #include // Header File For The OpenGL32 Library #include // Header File For The GLu32 Library -#elif defined(__DREAMCAST__) +#elif defined(_arch_dreamcast) #include #include // Header File For The OpenGL32 Library #include // Header File For The GLu32 Library @@ -238,7 +238,7 @@ int main(int argc, char *argv[]) InitGL(); ReSizeGLScene(640, 480); -#ifdef __DREAMCAST__ +#ifdef _arch_dreamcast maple_device_t* cont = maple_enum_type(0, MAPLE_FUNC_CONTROLLER); assert(cont); #endif @@ -246,7 +246,7 @@ int main(int argc, char *argv[]) while(1) { DrawGLScene(); -#ifdef __DREAMCAST__ +#ifdef _arch_dreamcast cont_state_t* state = (cont_state_t *)maple_dev_status(cont); if((state->buttons & CONT_A) && !sp) { diff --git a/samples/ortho2d/main.c b/samples/ortho2d/main.c index 296fefa..8f3e9db 100644 --- a/samples/ortho2d/main.c +++ b/samples/ortho2d/main.c @@ -1,4 +1,4 @@ -#ifdef __DREAMCAST__ +#ifdef _arch_dreamcast #include #endif @@ -40,7 +40,7 @@ void ReSizeGLScene(int Width, int Height) } int check_start() { -#ifdef __DREAMCAST__ +#ifdef _arch_dreamcast maple_device_t *cont; cont_state_t *state; diff --git a/samples/paletted/main.c b/samples/paletted/main.c index 50fbdf3..2564a5b 100644 --- a/samples/paletted/main.c +++ b/samples/paletted/main.c @@ -3,7 +3,7 @@ #include #include -#ifdef __DREAMCAST__ +#ifdef _arch_dreamcast #include #endif @@ -12,7 +12,7 @@ #include "GL/glu.h" #include "GL/glkos.h" -#ifdef __DREAMCAST__ +#ifdef _arch_dreamcast extern uint8_t romdisk[]; KOS_INIT_ROMDISK(romdisk); #define IMG_PATH "/rd/NeHe.tex" @@ -172,7 +172,7 @@ void ReSizeGLScene(int Width, int Height) } int check_start() { -#ifdef __DREAMCAST__ +#ifdef _arch_dreamcast maple_device_t *cont; cont_state_t *state; diff --git a/samples/paletted_pcx/main.c b/samples/paletted_pcx/main.c index a01744a..bca5dc3 100644 --- a/samples/paletted_pcx/main.c +++ b/samples/paletted_pcx/main.c @@ -4,7 +4,7 @@ #include #include -#ifdef __DREAMCAST__ +#ifdef _arch_dreamcast #include #endif @@ -16,7 +16,7 @@ /* using 4bpp textures from BMP files instead of 8bpp from PCX files */ #define USE_16C_PALETTE -#ifdef __DREAMCAST__ +#ifdef _arch_dreamcast #include extern uint8 romdisk[]; KOS_INIT_ROMDISK(romdisk); @@ -507,7 +507,7 @@ void ReSizeGLScene(int Width, int Height) } int check_start() { -#ifdef __DREAMCAST__ +#ifdef _arch_dreamcast maple_device_t *cont; cont_state_t *state; diff --git a/samples/polygon_offset/main.c b/samples/polygon_offset/main.c index a67cfe9..f6d409c 100644 --- a/samples/polygon_offset/main.c +++ b/samples/polygon_offset/main.c @@ -4,7 +4,7 @@ typedef enum true } bool; -#ifdef __DREAMCAST__ +#ifdef _arch_dreamcast #include #endif @@ -100,7 +100,7 @@ void drawPolygon() int frames = 0; int check_input() { -#ifdef __DREAMCAST__ +#ifdef _arch_dreamcast maple_device_t *cont; cont_state_t *state; diff --git a/samples/polymark/main.c b/samples/polymark/main.c index 2a58c45..0eed234 100644 --- a/samples/polymark/main.c +++ b/samples/polymark/main.c @@ -7,7 +7,7 @@ (c)2002 Dan Potter, Paul Boese */ -#ifdef __DREAMCAST__ +#ifdef _arch_dreamcast #include #endif @@ -24,7 +24,7 @@ int phase = PHASE_HALVE; float avgfps = -1; void running_stats() { -#ifdef __DREAMCAST__ +#ifdef _arch_dreamcast pvr_stats_t stats; pvr_get_stats(&stats); @@ -36,7 +36,7 @@ void running_stats() { } void stats() { -#ifdef __DREAMCAST__ +#ifdef _arch_dreamcast pvr_stats_t stats; pvr_get_stats(&stats); @@ -47,7 +47,7 @@ void stats() { int check_start() { -#ifdef __DREAMCAST__ +#ifdef _arch_dreamcast maple_device_t *cont; cont_state_t *state; diff --git a/samples/primitive_modes/main.c b/samples/primitive_modes/main.c index 5f7acab..de32c4e 100644 --- a/samples/primitive_modes/main.c +++ b/samples/primitive_modes/main.c @@ -3,7 +3,7 @@ #include #include -#ifndef __DREAMCAST__ +#ifndef _arch_dreamcast #include static SDL_Window* win_handle; #else @@ -119,7 +119,7 @@ static void DrawTriFan(float y) { } static void sample_init() { -#ifndef __DREAMCAST__ +#ifndef _arch_dreamcast SDL_Init(SDL_INIT_EVERYTHING); win_handle = SDL_CreateWindow("Shapes", 0, 0, 640, 480, SDL_WINDOW_OPENGL); SDL_GL_CreateContext(win_handle); @@ -129,7 +129,7 @@ static void sample_init() { } static int sample_should_exit() { -#ifndef __DREAMCAST__ +#ifndef _arch_dreamcast SDL_Event event; while (SDL_PollEvent(&event)) { if(event.type == SDL_QUIT) return 1; diff --git a/samples/prof_texture_upload/main.c b/samples/prof_texture_upload/main.c index 4981679..555ec7a 100644 --- a/samples/prof_texture_upload/main.c +++ b/samples/prof_texture_upload/main.c @@ -2,7 +2,7 @@ #include #include -#ifdef __DREAMCAST__ +#ifdef _arch_dreamcast #include #include "../profiler.h" #endif @@ -35,7 +35,7 @@ int main(int argc, char* argv[]) { fprintf(stderr, "Starting test run...\n"); -#ifdef __DREAMCAST__ +#ifdef _arch_dreamcast #if PROFILE profiler_init("/pc/gmon.out"); profiler_start(); @@ -51,7 +51,7 @@ int main(int argc, char* argv[]) { end = time(NULL); } -#ifdef __DREAMCAST__ +#ifdef _arch_dreamcast #if PROFILE profiler_stop(); profiler_clean_up(); diff --git a/samples/quadmark/main.c b/samples/quadmark/main.c index e1bdcc9..95fe98a 100644 --- a/samples/quadmark/main.c +++ b/samples/quadmark/main.c @@ -7,7 +7,7 @@ (c)2002 Dan Potter, Paul Boese */ -#ifdef __DREAMCAST__ +#ifdef _arch_dreamcast #include #include "../profiler.h" #endif @@ -27,7 +27,7 @@ int phase = PHASE_HALVE; float avgfps = -1; void running_stats() { -#ifdef __DREAMCAST__ +#ifdef _arch_dreamcast pvr_stats_t stats; pvr_get_stats(&stats); @@ -39,7 +39,7 @@ void running_stats() { } void stats() { -#ifdef __DREAMCAST__ +#ifdef _arch_dreamcast pvr_stats_t stats; pvr_get_stats(&stats); @@ -50,7 +50,7 @@ void stats() { int check_start() { -#ifdef __DREAMCAST__ +#ifdef _arch_dreamcast maple_device_t *cont; cont_state_t *state; diff --git a/samples/scissor/main.c b/samples/scissor/main.c index 0e1af92..4f9ee23 100644 --- a/samples/scissor/main.c +++ b/samples/scissor/main.c @@ -1,4 +1,4 @@ -#ifdef __DREAMCAST__ +#ifdef _arch_dreamcast #include #endif @@ -43,7 +43,7 @@ void ReSizeGLScene(int Width, int Height) } int check_start() { -#ifdef __DREAMCAST__ +#ifdef _arch_dreamcast maple_device_t *cont; cont_state_t *state; diff --git a/samples/terrain/main.c b/samples/terrain/main.c index d7f7545..44414dc 100644 --- a/samples/terrain/main.c +++ b/samples/terrain/main.c @@ -1,7 +1,7 @@ #include #include -#ifdef __DREAMCAST__ +#ifdef _arch_dreamcast #include #endif @@ -96,7 +96,7 @@ void ReSizeGLScene(int Width, int Height) } int check_start() { -#ifdef __DREAMCAST__ +#ifdef _arch_dreamcast maple_device_t *cont; cont_state_t *state; diff --git a/samples/zclip/main.c b/samples/zclip/main.c index 7642343..02883ba 100644 --- a/samples/zclip/main.c +++ b/samples/zclip/main.c @@ -3,7 +3,7 @@ #include #include -#ifdef __DREAMCAST__ +#ifdef _arch_dreamcast #include #endif @@ -12,7 +12,7 @@ #include "GL/glext.h" #include "GL/glkos.h" -#ifdef __DREAMCAST__ +#ifdef _arch_dreamcast #include extern uint8 romdisk[]; KOS_INIT_ROMDISK(romdisk); @@ -187,7 +187,7 @@ void ReSizeGLScene(int Width, int Height) } int check_start() { -#ifdef __DREAMCAST__ +#ifdef _arch_dreamcast maple_device_t *cont; cont_state_t *state; diff --git a/samples/zclip_triangle/main.c b/samples/zclip_triangle/main.c index 1cae41a..96be520 100644 --- a/samples/zclip_triangle/main.c +++ b/samples/zclip_triangle/main.c @@ -2,7 +2,7 @@ #include #include -#ifdef __DREAMCAST__ +#ifdef _arch_dreamcast #include #endif @@ -48,7 +48,7 @@ void ReSizeGLScene(int Width, int Height) } int check_start() { -#ifdef __DREAMCAST__ +#ifdef _arch_dreamcast maple_device_t *cont; cont_state_t *state; diff --git a/samples/zclip_trianglestrip/main.c b/samples/zclip_trianglestrip/main.c index 064add8..ce21bc9 100644 --- a/samples/zclip_trianglestrip/main.c +++ b/samples/zclip_trianglestrip/main.c @@ -2,7 +2,7 @@ #include #include -#ifdef __DREAMCAST__ +#ifdef _arch_dreamcast #include #endif @@ -47,7 +47,7 @@ void ReSizeGLScene(int Width, int Height) } int check_start() { -#ifdef __DREAMCAST__ +#ifdef _arch_dreamcast maple_device_t *cont; cont_state_t *state; @@ -68,7 +68,7 @@ static GLfloat movement = -10.0f; static GLfloat rotation = 0.0f; void update_movement() { -#ifdef __DREAMCAST__ +#ifdef _arch_dreamcast maple_device_t *cont; cont_state_t *state; diff --git a/tests/zclip/main.cpp b/tests/zclip/main.cpp index 42febee..7ef86a7 100644 --- a/tests/zclip/main.cpp +++ b/tests/zclip/main.cpp @@ -122,7 +122,7 @@ void memcpy_vertex(Vertex* dst, Vertex* src) { /* Zclipping is so difficult to get right, that self sample tests all the cases of clipping and makes sure that things work as expected */ -#ifdef __DREAMCAST__ +#ifdef _arch_dreamcast static volatile int *pvrdmacfg = (int*)0xA05F6888; static volatile int *qacr = (int*)0xFF000038; #else