chacha/glide
1
0
Fork 0
Code Issues Pull Requests Actions Packages Releases Activity

glide3x, tests: more build fixes -- mostly for windows this time.

Browse Source
This commit is contained in:
sezero
2018-08-23 01:20:20 +03:00
parent 2ab9b505eb
commit d565bf19ef
30 changed files with 42 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
glide3x/cvg/glide3/tests/makefile.linux
View File

@@ -26,7 +26,7 @@ TOP = ../../..
CPU ?= pentium CPU ?= pentium
CC = gcc CC = gcc
CFLAGS = -Wall -O2 -ffast-math -mcpu=$(CPU) CFLAGS = -Wall -O2 -ffast-math -mtune=$(CPU)
CFLAGS += -I$(TOP)/$(FX_GLIDE_HW)/glide3/src -I$(TOP)/$(FX_GLIDE_HW)/incsrc -I$(TOP)/$(FX_GLIDE_HW)/init CFLAGS += -I$(TOP)/$(FX_GLIDE_HW)/glide3/src -I$(TOP)/$(FX_GLIDE_HW)/incsrc -I$(TOP)/$(FX_GLIDE_HW)/init
CFLAGS += -I$(TOP)/swlibs/fxmisc CFLAGS += -I$(TOP)/swlibs/fxmisc
CFLAGS += -DCVG CFLAGS += -DCVG

2
glide3x/cvg/glide3/tests/test08.c
View File

@@ -35,7 +35,7 @@ int main( int argc, char **argv) {
int frames = -1; int frames = -1;
FxBool scrgrab = FXFALSE; FxBool scrgrab = FXFALSE;
char filename[256]; char filename[256];
int ftsize = 0; FxI32 ftsize = 0;
GrFog_t *fogtable = NULL; GrFog_t *fogtable = NULL;
/* Initialize Glide */ /* Initialize Glide */

2
glide3x/cvg/glide3/tests/test22.c
View File

@@ -39,7 +39,7 @@ int main( int argc, char **argv) {
TlTexture lightTexture; TlTexture lightTexture;
unsigned int lightTextureAddr; unsigned int lightTextureAddr;
int ftsize = 0; FxI32 ftsize = 0;
GrFog_t *fogtable = NULL; GrFog_t *fogtable = NULL;
TlVertex3D srcVerts[4]; TlVertex3D srcVerts[4];

2
glide3x/cvg/glide3/tests/test23.c
View File

@@ -46,7 +46,7 @@ int main( int argc, char **argv) {
static TlVertex3D srcVerts[100]; static TlVertex3D srcVerts[100];
float angle; float angle;
int ftsize = 0; FxI32 ftsize = 0;
GrFog_t *fogtable = NULL; GrFog_t *fogtable = NULL;
FxU32 zrange[2]; FxU32 zrange[2];

2
glide3x/cvg/glide3/tests/test24.c
View File

@@ -45,7 +45,7 @@ int main( int argc, char **argv) {
static TlVertex3D srcVerts[100]; static TlVertex3D srcVerts[100];
float angle; float angle;
int ftsize = 0; FxI32 ftsize = 0;
GrFog_t *fogtable = NULL; GrFog_t *fogtable = NULL;
FxU32 wrange[2]; FxU32 wrange[2];

2
glide3x/cvg/glide3/tests/test34.c
View File

@@ -46,7 +46,7 @@ int main( int argc, char **argv) {
int frames = -1; int frames = -1;
FxBool scrgrab = FXFALSE; FxBool scrgrab = FXFALSE;
char filename[256]; char filename[256];
int ftsize = 0; FxI32 ftsize = 0;
GrFog_t *fogtable = NULL; GrFog_t *fogtable = NULL;
TlTexture baseTexture; TlTexture baseTexture;

4
glide3x/cvg/glide3/tests/tlib.c
View File

@@ -1648,7 +1648,7 @@ static int qhead = 0;
static int qtail = 0; static int qtail = 0;
static int queue[256] = {0}; static int queue[256] = {0};
int FAR PASCAL LRESULT WINAPI
MainWndproc( HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam ) MainWndproc( HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam )
{ {
PAINTSTRUCT ps; PAINTSTRUCT ps;
@@ -1687,7 +1687,7 @@ MainWndproc( HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam )
break; break;
case WM_CHAR: case WM_CHAR:
if (!isascii(wParam)) break; if ((int)wParam & ~0x7f) break;/* not ascii */
#if 0 #if 0
printf("Posting keystroke %.02x\n", wParam); printf("Posting keystroke %.02x\n", wParam);
fflush(stdout); fflush(stdout);

2
glide3x/h3/glide3/tests/Makefile.DJ
View File

@@ -27,7 +27,7 @@ TOP = ../../..
CPU ?= pentium CPU ?= pentium
CC = gcc CC = gcc
CFLAGS = -Wall -O2 -ffast-math -mcpu=$(CPU) CFLAGS = -Wall -O2 -ffast-math -mtune=$(CPU)
CFLAGS += -I$(TOP)/$(FX_GLIDE_HW)/glide3/src -I$(TOP)/$(FX_GLIDE_HW)/incsrc CFLAGS += -I$(TOP)/$(FX_GLIDE_HW)/glide3/src -I$(TOP)/$(FX_GLIDE_HW)/incsrc
CFLAGS += -I$(TOP)/swlibs/fxmisc CFLAGS += -I$(TOP)/swlibs/fxmisc
CFLAGS += -D__DOS__ -DH3 CFLAGS += -D__DOS__ -DH3

2
glide3x/h3/glide3/tests/makefile.linux
View File

@@ -30,7 +30,7 @@ CPU ?= pentium
XPATH ?= /usr/X11R6/lib XPATH ?= /usr/X11R6/lib
CC = gcc CC = gcc
CFLAGS = -Wall -O2 -ffast-math -mcpu=$(CPU) CFLAGS = -Wall -O2 -ffast-math -mtune=$(CPU)
CFLAGS += -I$(TOP)/$(FX_GLIDE_HW)/glide3/src -I$(TOP)/$(FX_GLIDE_HW)/incsrc CFLAGS += -I$(TOP)/$(FX_GLIDE_HW)/glide3/src -I$(TOP)/$(FX_GLIDE_HW)/incsrc
CFLAGS += -I$(TOP)/swlibs/fxmisc CFLAGS += -I$(TOP)/swlibs/fxmisc
CFLAGS += -DH3 CFLAGS += -DH3

2
glide3x/h3/glide3/tests/test08.c
View File

@@ -35,7 +35,7 @@ int main( int argc, char **argv) {
int frames = -1; int frames = -1;
FxBool scrgrab = FXFALSE; FxBool scrgrab = FXFALSE;
char filename[256]; char filename[256];
int ftsize = 0; FxI32 ftsize = 0;
GrFog_t *fogtable = NULL; GrFog_t *fogtable = NULL;
/* Initialize Glide */ /* Initialize Glide */

2
glide3x/h3/glide3/tests/test22.c
View File

@@ -39,7 +39,7 @@ int main( int argc, char **argv) {
TlTexture lightTexture; TlTexture lightTexture;
unsigned long lightTextureAddr; unsigned long lightTextureAddr;
int ftsize = 0; FxI32 ftsize = 0;
GrFog_t *fogtable = NULL; GrFog_t *fogtable = NULL;
TlVertex3D srcVerts[4]; TlVertex3D srcVerts[4];

2
glide3x/h3/glide3/tests/test23.c
View File

@@ -46,7 +46,7 @@ int main( int argc, char **argv) {
static TlVertex3D srcVerts[100]; static TlVertex3D srcVerts[100];
float angle; float angle;
int ftsize = 0; FxI32 ftsize = 0;
GrFog_t *fogtable = NULL; GrFog_t *fogtable = NULL;
FxU32 zrange[2]; FxU32 zrange[2];

2
glide3x/h3/glide3/tests/test24.c
View File

@@ -45,7 +45,7 @@ int main( int argc, char **argv) {
static TlVertex3D srcVerts[100]; static TlVertex3D srcVerts[100];
float angle; float angle;
int ftsize = 0; FxI32 ftsize = 0;
GrFog_t *fogtable = NULL; GrFog_t *fogtable = NULL;
FxU32 wrange[2]; FxU32 wrange[2];

2
glide3x/h3/glide3/tests/test34.c
View File

@@ -46,7 +46,7 @@ int main( int argc, char **argv) {
int frames = -1; int frames = -1;
FxBool scrgrab = FXFALSE; FxBool scrgrab = FXFALSE;
char filename[256]; char filename[256];
int ftsize = 0; FxI32 ftsize = 0;
GrFog_t *fogtable = NULL; GrFog_t *fogtable = NULL;
TlTexture baseTexture; TlTexture baseTexture;

4
glide3x/h3/glide3/tests/tlib.c
View File

@@ -1648,7 +1648,7 @@ static int qhead = 0;
static int qtail = 0; static int qtail = 0;
static int queue[256] = {0}; static int queue[256] = {0};
long FAR PASCAL LRESULT WINAPI
MainWndproc( HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam ) MainWndproc( HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam )
{ {
PAINTSTRUCT ps; PAINTSTRUCT ps;
@@ -1687,7 +1687,7 @@ MainWndproc( HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam )
break; break;
case WM_CHAR: case WM_CHAR:
if (!isascii(wParam)) break; if ((int)wParam & ~0x7f) break;/* not ascii */
#if 0 #if 0
printf("Posting keystroke %.02x\n", wParam); printf("Posting keystroke %.02x\n", wParam);
fflush(stdout); fflush(stdout);

2
glide3x/h5/glide3/tests/Makefile.mgw
View File

@@ -25,7 +25,7 @@ TOP = ../../..
CPU ?= pentium CPU ?= pentium
CC = mingw32-gcc CC = mingw32-gcc
CFLAGS = -Wall -O2 -ffast-math -mcpu=$(CPU) CFLAGS = -Wall -O2 -ffast-math -mtune=$(CPU)
CFLAGS += -I$(TOP)/$(FX_GLIDE_HW)/glide3/src -I$(TOP)/$(FX_GLIDE_HW)/incsrc CFLAGS += -I$(TOP)/$(FX_GLIDE_HW)/glide3/src -I$(TOP)/$(FX_GLIDE_HW)/incsrc
CFLAGS += -I$(TOP)/swlibs/fxmisc CFLAGS += -I$(TOP)/swlibs/fxmisc
CFLAGS += -D__WIN32__ -DH3 CFLAGS += -D__WIN32__ -DH3

2
glide3x/h5/glide3/tests/makefile.linux
View File

@@ -30,7 +30,7 @@ CPU ?= pentium
XPATH ?= /usr/X11R6/lib XPATH ?= /usr/X11R6/lib
CC = gcc CC = gcc
CFLAGS = -Wall -O2 -ffast-math -mcpu=$(CPU) CFLAGS = -Wall -O2 -ffast-math -mtune=$(CPU)
CFLAGS += -I$(TOP)/$(FX_GLIDE_HW)/glide3/src -I$(TOP)/$(FX_GLIDE_HW)/incsrc CFLAGS += -I$(TOP)/$(FX_GLIDE_HW)/glide3/src -I$(TOP)/$(FX_GLIDE_HW)/incsrc
CFLAGS += -I$(TOP)/swlibs/fxmisc CFLAGS += -I$(TOP)/swlibs/fxmisc
CFLAGS += -DH3 CFLAGS += -DH3

4
glide3x/h5/glide3/tests/test08.c
View File

@@ -51,7 +51,7 @@ int main( int argc, char **argv) {
int frames = -1; int frames = -1;
FxBool scrgrab = FXFALSE; FxBool scrgrab = FXFALSE;
char filename[256]; char filename[256];
int ftsize = 0; FxI32 ftsize = 0;
GrFog_t *fogtable = NULL; GrFog_t *fogtable = NULL;
GrContext_t gc = 0; GrContext_t gc = 0;
@@ -112,7 +112,7 @@ int main( int argc, char **argv) {
tlConSet( 0.0f, 0.0f, 1.0f, 1.0f, tlConSet( 0.0f, 0.0f, 1.0f, 1.0f,
60, 30, 0xffffff ); 60, 30, 0xffffff );
grGet(GR_FOG_TABLE_ENTRIES, 4, (FxI32 *)&ftsize); grGet(GR_FOG_TABLE_ENTRIES, 4, &ftsize);
fogtable = malloc(sizeof(GrFog_t)*ftsize); fogtable = malloc(sizeof(GrFog_t)*ftsize);
assert(fogtable); assert(fogtable);

6
glide3x/h5/glide3/tests/test22.c
View File

@@ -55,7 +55,7 @@ int main( int argc, char **argv) {
TlTexture lightTexture; TlTexture lightTexture;
unsigned long lightTextureAddr; unsigned long lightTextureAddr;
int ftsize = 0; FxI32 ftsize = 0;
GrFog_t *fogtable = NULL; GrFog_t *fogtable = NULL;
TlVertex3D srcVerts[4]; TlVertex3D srcVerts[4];
@@ -116,8 +116,8 @@ int main( int argc, char **argv) {
60, 15, 0xffffff ); 60, 15, 0xffffff );
/* Set up Render State - decal - bilinear - nearest mipmapping - fogging */ /* Set up Render State - decal - bilinear - nearest mipmapping - fogging */
grGet(GR_ZDEPTH_MIN_MAX, 8, (FxI32 *)zrange); grGet(GR_ZDEPTH_MIN_MAX, 8, (FxI32 *)zrange);
grGet(GR_FOG_TABLE_ENTRIES, 4, (FxI32 *)&ftsize); grGet(GR_FOG_TABLE_ENTRIES, 4, &ftsize);
fogtable = malloc(sizeof(GrFog_t)*ftsize); fogtable = malloc(sizeof(GrFog_t)*ftsize);
assert(fogtable); assert(fogtable);

6
glide3x/h5/glide3/tests/test23.c
View File

@@ -62,7 +62,7 @@ int main( int argc, char **argv) {
static TlVertex3D srcVerts[100]; static TlVertex3D srcVerts[100];
float angle; float angle;
int ftsize = 0; FxI32 ftsize = 0;
GrFog_t *fogtable = NULL; GrFog_t *fogtable = NULL;
FxU32 zrange[2]; FxU32 zrange[2];
GrContext_t gc = 0; GrContext_t gc = 0;
@@ -120,8 +120,8 @@ int main( int argc, char **argv) {
60, 15, 0xffffff ); 60, 15, 0xffffff );
/* Set up Render State - flat shading - alpha blending */ /* Set up Render State - flat shading - alpha blending */
grGet(GR_ZDEPTH_MIN_MAX, 8, (FxI32 *)zrange); grGet(GR_ZDEPTH_MIN_MAX, 8, (FxI32 *)zrange);
grGet(GR_FOG_TABLE_ENTRIES, 4, (FxI32 *)&ftsize); grGet(GR_FOG_TABLE_ENTRIES, 4, &ftsize);
fogtable = malloc(sizeof(GrFog_t)*ftsize); fogtable = malloc(sizeof(GrFog_t)*ftsize);
assert(fogtable); assert(fogtable);
grVertexLayout(GR_PARAM_XY, 0, GR_PARAM_ENABLE); grVertexLayout(GR_PARAM_XY, 0, GR_PARAM_ENABLE);

6
glide3x/h5/glide3/tests/test24.c
View File

@@ -61,7 +61,7 @@ int main( int argc, char **argv) {
static TlVertex3D srcVerts[100]; static TlVertex3D srcVerts[100];
float angle; float angle;
int ftsize = 0; FxI32 ftsize = 0;
GrFog_t *fogtable = NULL; GrFog_t *fogtable = NULL;
FxU32 wrange[2]; FxU32 wrange[2];
GrContext_t gc = 0; GrContext_t gc = 0;
@@ -123,8 +123,8 @@ int main( int argc, char **argv) {
grVertexLayout(GR_PARAM_A, GR_VERTEX_A_OFFSET << 2, GR_PARAM_ENABLE); grVertexLayout(GR_PARAM_A, GR_VERTEX_A_OFFSET << 2, GR_PARAM_ENABLE);
grVertexLayout(GR_PARAM_Q, GR_VERTEX_OOW_OFFSET << 2, GR_PARAM_ENABLE); grVertexLayout(GR_PARAM_Q, GR_VERTEX_OOW_OFFSET << 2, GR_PARAM_ENABLE);
grGet(GR_WDEPTH_MIN_MAX, 8, (FxI32 *)wrange); grGet(GR_WDEPTH_MIN_MAX, 8, (FxI32 *)wrange);
grGet(GR_FOG_TABLE_ENTRIES, 4, (FxI32 *)&ftsize); grGet(GR_FOG_TABLE_ENTRIES, 4, &ftsize);
fogtable = malloc(sizeof(GrFog_t)*ftsize); fogtable = malloc(sizeof(GrFog_t)*ftsize);
assert(fogtable); assert(fogtable);

4
glide3x/h5/glide3/tests/test34.c
View File

@@ -62,7 +62,7 @@ int main( int argc, char **argv) {
int frames = -1; int frames = -1;
FxBool scrgrab = FXFALSE; FxBool scrgrab = FXFALSE;
char filename[256]; char filename[256];
int ftsize = 0; FxI32 ftsize = 0;
GrFog_t *fogtable = NULL; GrFog_t *fogtable = NULL;
GrContext_t gc = 0; GrContext_t gc = 0;
@@ -144,7 +144,7 @@ int main( int argc, char **argv) {
fogext = (strncmp(extstr, "FOGCOORD", 8) == 0); fogext = (strncmp(extstr, "FOGCOORD", 8) == 0);
} }
grGet(GR_FOG_TABLE_ENTRIES, 4, (FxI32 *)&ftsize); grGet(GR_FOG_TABLE_ENTRIES, 4, &ftsize);
fogtable = malloc(sizeof(GrFog_t)*ftsize); fogtable = malloc(sizeof(GrFog_t)*ftsize);
assert(fogtable); assert(fogtable);

4
glide3x/h5/glide3/tests/tlib.c
View File

@@ -2328,7 +2328,7 @@ static int qhead = 0;
static int qtail = 0; static int qtail = 0;
static int queue[256] = {0}; static int queue[256] = {0};
long FAR PASCAL LRESULT WINAPI
MainWndproc( HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam ) MainWndproc( HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam )
{ {
PAINTSTRUCT ps; PAINTSTRUCT ps;
@@ -2409,7 +2409,7 @@ MainWndproc( HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam )
break; break;
case WM_CHAR: case WM_CHAR:
if (!isascii(wParam)) break; if ((int)wParam & ~0x7f) break;/* not ascii */
#if 0 #if 0
printf("Posting keystroke %.02x\n", wParam); printf("Posting keystroke %.02x\n", wParam);
fflush(stdout); fflush(stdout);

2
glide3x/sst1/glide3/tests/makefile.linux
View File

@@ -39,7 +39,7 @@ TOP = ../../..
CPU ?= pentium CPU ?= pentium
CC = gcc CC = gcc
CFLAGS = -Wall -O2 -ffast-math -mcpu=$(CPU) CFLAGS = -Wall -O2 -ffast-math -mtune=$(CPU)
CFLAGS += -I$(TOP)/$(FX_GLIDE_HW)/glide3/src -I$(TOP)/$(FX_GLIDE_HW)/incsrc -I$(TOP)/$(FX_GLIDE_HW)/init CFLAGS += -I$(TOP)/$(FX_GLIDE_HW)/glide3/src -I$(TOP)/$(FX_GLIDE_HW)/incsrc -I$(TOP)/$(FX_GLIDE_HW)/init
CFLAGS += -I$(TOP)/swlibs/fxmisc CFLAGS += -I$(TOP)/swlibs/fxmisc
CFLAGS += $(HWDEF) CFLAGS += $(HWDEF)

2
glide3x/sst1/glide3/tests/test08.c
View File

@@ -35,7 +35,7 @@ int main( int argc, char **argv) {
int frames = -1; int frames = -1;
FxBool scrgrab = FXFALSE; FxBool scrgrab = FXFALSE;
char filename[256]; char filename[256];
int ftsize = 0; FxI32 ftsize = 0;
GrFog_t *fogtable = NULL; GrFog_t *fogtable = NULL;
/* Initialize Glide */ /* Initialize Glide */

2
glide3x/sst1/glide3/tests/test22.c
View File

@@ -39,7 +39,7 @@ int main( int argc, char **argv) {
TlTexture lightTexture; TlTexture lightTexture;
unsigned long lightTextureAddr; unsigned long lightTextureAddr;
int ftsize = 0; FxI32 ftsize = 0;
GrFog_t *fogtable = NULL; GrFog_t *fogtable = NULL;
TlVertex3D srcVerts[4]; TlVertex3D srcVerts[4];

2
glide3x/sst1/glide3/tests/test23.c
View File

@@ -46,7 +46,7 @@ int main( int argc, char **argv) {
static TlVertex3D srcVerts[100]; static TlVertex3D srcVerts[100];
float angle; float angle;
int ftsize = 0; FxI32 ftsize = 0;
GrFog_t *fogtable = NULL; GrFog_t *fogtable = NULL;
FxU32 zrange[2]; FxU32 zrange[2];

2
glide3x/sst1/glide3/tests/test24.c
View File

@@ -47,7 +47,7 @@ int main( int argc, char **argv) {
static TlVertex3D srcVerts[100]; static TlVertex3D srcVerts[100];
float angle; float angle;
int ftsize = 0; FxI32 ftsize = 0;
GrFog_t *fogtable = NULL; GrFog_t *fogtable = NULL;
FxU32 wrange[2]; FxU32 wrange[2];

2
glide3x/sst1/glide3/tests/test34.c
View File

@@ -46,7 +46,7 @@ int main( int argc, char **argv) {
int frames = -1; int frames = -1;
FxBool scrgrab = FXFALSE; FxBool scrgrab = FXFALSE;
char filename[256]; char filename[256];
int ftsize = 0; FxI32 ftsize = 0;
GrFog_t *fogtable = NULL; GrFog_t *fogtable = NULL;
TlTexture baseTexture; TlTexture baseTexture;

4
glide3x/sst1/glide3/tests/tlib.c
View File

@@ -1648,7 +1648,7 @@ static int qhead = 0;
static int qtail = 0; static int qtail = 0;
static int queue[256] = {0}; static int queue[256] = {0};
long FAR PASCAL LRESULT WINAPI
MainWndproc( HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam ) MainWndproc( HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam )
{ {
PAINTSTRUCT ps; PAINTSTRUCT ps;
@@ -1687,7 +1687,7 @@ MainWndproc( HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam )
break; break;
case WM_CHAR: case WM_CHAR:
if (!isascii(wParam)) break; if ((int)wParam & ~0x7f) break;/* not ascii */
#if 0 #if 0
printf("Posting keystroke %.02x\n", wParam); printf("Posting keystroke %.02x\n", wParam);
fflush(stdout); fflush(stdout);