TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Changed __ENV_LINUX__ to __linux__

Browse source
This commit is contained in:
Bradley Bell 2001-10-19 00:00:54 +00:00
parent 9cbcfa3821
commit 2ba5fbba92
14 changed files with 47 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
2d/linear.h
View file

@ -222,7 +222,7 @@ static inline void gr_linear_rep_movsdm_faded(void * src, void * dest, unsigned
" incl %%esi;"
" cmpb $255, %%al;"
" je 1f;"
#ifdef __ENV_LINUX__
#ifdef __linux__
" movb gr_fade_table(%%eax), %%al;"
#else
" movb _gr_fade_table(%%eax), %%al;"

5
acconfig.h
View file

@ -13,9 +13,6 @@
/* Define if you want a GGI build */
#undef GGI
/* Define if building under linux */
#undef __ENV_LINUX__
/* Define to disable asserts, int3, etc. */
#undef NDEBUG
@ -26,7 +23,7 @@
#define PIGGY_USE_PAGING 1
#define NEWDEMO 1
#ifdef __ENV_LINUX__
#ifdef __linux__
# define __SDL__ 1
# define SDL_AUDIO 1

11
arch/include/joy.h
View file

@ -13,13 +13,16 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
/*
* $Source: /cvs/cvsroot/d2x/arch/include/joy.h,v $
* $Revision: 1.3 $
* $Revision: 1.4 $
* $Author: bradleyb $
* $Date: 2001-10-12 00:18:37 $
* $Date: 2001-10-18 23:59:22 $
*
* Header for joystick functions
*
* $Log: not supported by cvs2svn $
* Revision 1.3 2001/10/12 00:18:37 bradleyb
* Switched from Cygwin to mingw32 on MS boxes. Vastly improved compilability.
*
* Revision 1.2 2001/01/29 13:36:14 bradleyb
* Removed duplicate files
*
@ -49,7 +52,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
#if defined WINDOWS
#define JOY_NUM_AXES 7
#elif defined __ENV_LINUX__
#elif defined __linux__
#define JOY_NUM_AXES 5
#else
#define JOY_NUM_AXES 4
@ -71,7 +74,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
/* not present in d2src, maybe we don't really need it? */
#define JOY_FRIENDLY_READINGS 8
#ifdef __ENV_LINUX__
#ifdef __linux__
#define MAX_BUTTONS 64
#else
#define MAX_BUTTONS 20

2
include/loadgl.h
View file

@ -1144,7 +1144,7 @@ void *dll_GetSymbol(void *dllhandle,const char *symname)
return (void *)GetProcAddress((HINSTANCE)dllhandle,symname);
}
#endif
#ifdef __ENV_LINUX__
#ifdef __linux__
#include <dlfcn.h>
void *dll_LoadModule(const char *name)
{

2
include/strutil.h
View file

@ -16,7 +16,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
char *d_strdup(char *str);
#if defined(__ENV_LINUX__)
#ifdef __linux__
#define stricmp(a,b) strcasecmp(a,b)
#define strnicmp(a,b,c) strncasecmp(a,b,c)
#elif 0

9
include/vecmat.h
View file

@ -13,13 +13,16 @@
*/
/*
* $Source: /cvs/cvsroot/d2x/include/vecmat.h,v $
* $Revision: 1.2 $
* $Revision: 1.3 $
* $Author: bradleyb $
* $Date: 2001-10-12 06:40:49 $
* $Date: 2001-10-18 23:59:22 $
*
* Header file for vector/matrix library
*
* $Log: not supported by cvs2svn $
* Revision 1.2 2001/10/12 06:40:49 bradleyb
* fix some gcc 3.0 warnings, courtesy of paoloulivi@tin.it
*
* Revision 1.1.1.1 2001/01/19 03:30:16 bradleyb
* Import of d2x-0.0.8
*
@ -230,7 +233,7 @@ __pack__ vms_matrix;
// DPH (18/9/98): Begin mod to fix linefeed problem under linux. Uses an
// inline function instead of a multi-line macro to fix CR/LF problems.
#ifdef __LINUX__
#ifdef __linux__
static inline void vm_set_identity(vms_matrix *m)
{
m->rvec.x = m->uvec.y = m->fvec.z = f1_0;

2
main/console.c
View file

@ -13,7 +13,7 @@
#include "console.h"
#include "cmd.h"
#if defined(__ENV_LINUX__) || defined(__MINGW32__)
#if defined(__linux__) || defined(__MINGW32__)
int text_console_enabled = 1;
#else
int isvga();

10
main/kconfig.c
View file

@ -16,7 +16,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
#endif
#ifdef RCS
static char rcsid[] = "$Id: kconfig.c,v 1.8 2001-10-12 00:18:39 bradleyb Exp $";
static char rcsid[] = "$Id: kconfig.c,v 1.9 2001-10-18 23:59:22 bradleyb Exp $";
#endif
#ifdef WINDOWS
@ -71,7 +71,7 @@ static char rcsid[] = "$Id: kconfig.c,v 1.8 2001-10-12 00:18:39 bradleyb Exp $";
#include "d_delay.h"
#include "collide.h"
#ifdef __ENV_LINUX__
#ifdef __linux__
#include "linux_joystick.h"
#endif
@ -2680,7 +2680,7 @@ void controls_read_all()
int idx, idy;
fix ctime;
fix mouse_axis[2];
#ifdef __ENV_LINUX__
#ifdef __linux__
int raw_joy_axis[MAX_AXES];
#else
int raw_joy_axis[JOY_NUM_AXES];
@ -2721,7 +2721,7 @@ void controls_read_all()
channel_masks = joystick_read_raw_axis( JOY_ALL_AXIS, raw_joy_axis );
for (i=0; i<6; i++ ) {
#ifndef __ENV_LINUX__
#ifndef __linux__
if (channel_masks&(1<<i)) {
#endif
int joy_null_value = 10;
@ -2742,7 +2742,7 @@ void controls_read_all()
raw_joy_axis[i] = 0;
joy_axis[i] = (raw_joy_axis[i]*FrameTime)/128;
}
#ifndef __ENV_LINUX__
#ifndef __linux__
} else {
joy_axis[i] = 0;
}

4
misc/d_glob.c
View file

@ -11,7 +11,7 @@
#include "u_mem.h"
//end addition -MM
#if defined(__DJGPP__) || defined(__ENV_LINUX__)
#if defined(__DJGPP__) || defined(__linux__)
#include <glob.h>
int d_glob(const char *pattern, d_glob_t *g)
@ -31,7 +31,7 @@ int d_glob(const char *pattern, d_glob_t *g)
void d_globfree(d_glob_t *g)
{
#ifndef __ENV_LINUX__ // Linux doesn't believe in freeing glob structures... :-)
#ifndef __linux__ // Linux doesn't believe in freeing glob structures... :-)
glob_t a;
Assert (g!=NULL);

9
texmap/tmap_inc.asm
View file

@ -10,13 +10,16 @@
;COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
;
; $Source: /cvs/cvsroot/d2x/texmap/tmap_inc.asm,v $
; $Revision: 1.1.1.1 $
; $Revision: 1.2 $
; $Author: bradleyb $
; $Date: 2001-01-19 03:30:16 $
; $Date: 2001-10-18 23:59:23 $
;
; Mike's include file for the texture mapper library.
;
; $Log: not supported by cvs2svn $
; Revision 1.1.1.1 2001/01/19 03:30:16 bradleyb
; Import of d2x-0.0.8
;
; Revision 1.1.1.1 1999/06/14 22:13:53 donut
; Import of d1x 1.37 source.
;
@ -88,7 +91,7 @@ SCREEN_HEIGHT = 480
BYTES_PER_PIXEL = 2
%endif
%ifdef __ENV_LINUX__
%ifdef __linux__
; It appears that ELF C compilers do not prefix symbols with '_', so here we
; cater for them...
%define _gr_fade_table gr_fade_table

9
texmap/tmap_per.asm
View file

@ -10,13 +10,16 @@
;COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
;
; $Source: /cvs/cvsroot/d2x/texmap/tmap_per.asm,v $
; $Revision: 1.1.1.1 $
; $Revision: 1.2 $
; $Author: bradleyb $
; $Date: 2001-01-19 03:30:16 $
; $Date: 2001-10-18 23:59:23 $
;
; Perspective texture mapper inner loop.
;
; $Log: not supported by cvs2svn $
; Revision 1.1.1.1 2001/01/19 03:30:16 bradleyb
; Import of d2x-0.0.8
;
; Revision 1.1.1.1 1999/06/14 22:14:01 donut
; Import of d1x 1.37 source.
;
@ -125,7 +128,7 @@ global asm_tmap_scanline_per
[SECTION .data]
align 4
;extern _per2_flag;:dword
%ifdef __ENV_LINUX__
%ifdef __linux__
; Cater for linux ELF compilers...
global x
%define _loop_count loop_count

4
texmap/tmappent.S
View file

@ -152,7 +152,7 @@
// (ready to start the next division)
.endm
#ifdef __ENV_LINUX__
#ifdef __linux__
.equ _pixptr, pixptr
.equ _gr_fade_table, gr_fade_table
.equ _write_buffer, write_buffer
@ -216,7 +216,7 @@ ctlwd: .word 0 // the pre-tweaked FPU control word
// void c_tmap_scanline_per(void)
//
#ifdef __ENV_LINUX__
#ifdef __linux__
asm_tmap_scanline_per:
#else
_asm_tmap_scanline_per:

4
texmap/tmapppro.S
View file

@ -142,7 +142,7 @@
.endm
#ifdef __ENV_LINUX__
#ifdef __linux__
.equ _pixptr, pixptr
.equ _gr_fade_table, gr_fade_table
.equ _write_buffer, write_buffer
@ -202,7 +202,7 @@ ctlwd: .long 0 // the pre-tweaked FPU control word
// void c_tmap_scanline_per(void)
//
#ifdef __ENV_LINUX__
#ifdef __linux__
asm_tmap_scanline_per:
#else
_asm_tmap_scanline_per:

9
video/ogl_gr.c
View file

@ -1,12 +1,15 @@
/*
* $Source: /cvs/cvsroot/d2x/video/ogl_gr.c,v $
* $Revision: 1.5 $
* $Revision: 1.6 $
* $Author: bradleyb $
* $Date: 2001-10-12 00:18:40 $
* $Date: 2001-10-18 23:59:23 $
*
* // OGL video functions. - Added 9/15/99 Matthew Mueller
*
* $Log: not supported by cvs2svn $
* Revision 1.5 2001/10/12 00:18:40 bradleyb
* Switched from Cygwin to mingw32 on MS boxes. Vastly improved compilability.
*
* Revision 1.4 2001/01/29 13:47:52 bradleyb
* Fixed build, some minor cleanups.
*
@ -241,7 +244,7 @@ int ogl_testneedmipmaps(int i){
#ifdef OGL_RUNTIME_LOAD
#if defined(__WINDOWS__) || defined(__MINGW32__)
char *OglLibPath="opengl32.dll";
#elif defined(__ENV_LINUX__)
#else
char *OglLibPath="libGL.so";
#endif