Include romdisk only if target is dreamcast

This commit is contained in:
T_chan 2022-01-25 14:41:55 +00:00
parent 9506237c47
commit 0c8e11c02a
5 changed files with 13 additions and 10 deletions

View File

@ -9,8 +9,11 @@
//$KOS_BASE/utils/texconv/texconv --in disk.png --format ARGB4444 --preview disk_preview.png --out disk.dtex //$KOS_BASE/utils/texconv/texconv --in disk.png --format ARGB4444 --preview disk_preview.png --out disk.dtex
#ifdef __DREAMCAST__
extern uint8_t romdisk[]; extern uint8_t romdisk[];
KOS_INIT_ROMDISK(romdisk); KOS_INIT_ROMDISK(romdisk);
#endif
texture t; texture t;
int blendActive = -1; int blendActive = -1;
/* floats for x rotation, y rotation, z rotation */ /* floats for x rotation, y rotation, z rotation */

View File

@ -11,10 +11,9 @@
#include "GL/glext.h" #include "GL/glext.h"
#include "GL/glkos.h" #include "GL/glkos.h"
#ifdef __DREAMCAST__
extern uint8_t romdisk[]; extern uint8_t romdisk[];
KOS_INIT_ROMDISK(romdisk); KOS_INIT_ROMDISK(romdisk);
#ifdef __DREAMCAST__
#define IMAGE_FILENAME "/rd/NeHe.bmp" #define IMAGE_FILENAME "/rd/NeHe.bmp"
#else #else
#define IMAGE_FILENAME "samples/mipmap/romdisk/NeHe.bmp" #define IMAGE_FILENAME "samples/mipmap/romdisk/NeHe.bmp"

View File

@ -21,6 +21,8 @@
#include "GL/glext.h" #include "GL/glext.h"
#ifdef __DREAMCAST__ #ifdef __DREAMCAST__
extern uint8_t romdisk[];
KOS_INIT_ROMDISK(romdisk);
#define IMAGE1_FILENAME "/rd/wp001vq.pvr" #define IMAGE1_FILENAME "/rd/wp001vq.pvr"
#define IMAGE2_FILENAME "/rd/FlareWS_256.pvr" #define IMAGE2_FILENAME "/rd/FlareWS_256.pvr"
#else #else
@ -122,9 +124,6 @@ void RenderCallback(GLuint texID0, GLuint texID1) {
glDisableClientState(GL_VERTEX_ARRAY); glDisableClientState(GL_VERTEX_ARRAY);
} }
extern uint8_t romdisk[];
KOS_INIT_ROMDISK(romdisk);
int main(int argc, char **argv) { int main(int argc, char **argv) {
/* Notice we do not init the PVR here, that is handled by Open GL */ /* Notice we do not init the PVR here, that is handled by Open GL */
glKosInit(); glKosInit();

View File

@ -26,6 +26,11 @@
blending. blending.
*/ */
#ifdef __DREAMCAST__
extern uint8 romdisk[];
KOS_INIT_ROMDISK(romdisk);
#endif
static GLfloat xrot; /* X Rotation */ static GLfloat xrot; /* X Rotation */
static GLfloat yrot; /* Y Rotation */ static GLfloat yrot; /* Y Rotation */
static GLfloat xspeed; /* X Rotation Speed */ static GLfloat xspeed; /* X Rotation Speed */
@ -115,11 +120,6 @@ void draw_gl(void) {
yrot += yspeed; yrot += yspeed;
} }
#ifdef __DREAMCAST__
extern uint8 romdisk[];
KOS_INIT_ROMDISK(romdisk);
#endif
int main(int argc, char **argv) { int main(int argc, char **argv) {
#ifdef __DREAMCAST__ #ifdef __DREAMCAST__
maple_device_t *cont; maple_device_t *cont;

View File

@ -12,8 +12,10 @@
#include "GL/glu.h" #include "GL/glu.h"
#include "GL/glkos.h" #include "GL/glkos.h"
#ifdef __DREAMCAST__
extern uint8_t romdisk[]; extern uint8_t romdisk[];
KOS_INIT_ROMDISK(romdisk); KOS_INIT_ROMDISK(romdisk);
#endif
/* floats for x rotation, y rotation, z rotation */ /* floats for x rotation, y rotation, z rotation */
float xrot, yrot, zrot; float xrot, yrot, zrot;