From 091220944b04eae4346e18f2ad6f5448dc00e163 Mon Sep 17 00:00:00 2001 From: Bradley Bell Date: Fri, 12 Oct 2001 06:40:49 +0000 Subject: [PATCH 01/16] fix some gcc 3.0 warnings, courtesy of paoloulivi@tin.it --- aclocal.m4 | 2 +- conf.h.in | 2 +- include/vecmat.h | 39 +++++++++++++++++++++------------------ main/collide.c | 4 ++-- main/kludge.c | 1 + main/piggy.h | 2 +- 6 files changed, 27 insertions(+), 23 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index a60c657f..2f8342ea 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,4 +1,4 @@ -dnl aclocal.m4 generated automatically by aclocal 1.4 +dnl aclocal.m4 generated automatically by aclocal 1.4-p4 dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation diff --git a/conf.h.in b/conf.h.in index a533786f..e2ff5292 100644 --- a/conf.h.in +++ b/conf.h.in @@ -1,4 +1,4 @@ -/* conf.h.in. Generated automatically from configure.in by autoheader. */ +/* conf.h.in. Generated automatically from configure.in by autoheader 2.13. */ /* Define if you have the ANSI C header files. */ #undef STDC_HEADERS diff --git a/include/vecmat.h b/include/vecmat.h index 4158025a..81a2c049 100644 --- a/include/vecmat.h +++ b/include/vecmat.h @@ -13,13 +13,16 @@ */ /* * $Source: /cvs/cvsroot/d2x/include/vecmat.h,v $ - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * $Author: bradleyb $ - * $Date: 2001-01-19 03:30:16 $ + * $Date: 2001-10-12 06:40:49 $ * * Header file for vector/matrix 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:02:28 donut * Import of d1x 1.37 source. * @@ -247,8 +250,8 @@ vms_vector * vm_vec_make (vms_vector * v, fix x, fix y, fix z); #ifdef __WATCOMC__ #pragma aux vm_vec_make "*_" parm [eax] [edx] [ebx] [ecx] value [eax] modify exact [] = \ -"mov 0[eax],edx" \ -"mov 4[eax],ebx" \ +"mov 0[eax],edx" \ +"mov 4[eax],ebx" \ "mov 8[eax],ecx"; #endif @@ -258,8 +261,8 @@ vms_angvec * vm_angvec_make (vms_angvec * v, fixang p, fixang b, fixang h); #ifdef __WATCOMC__ #pragma aux vm_angvec_make "*_" parm [eax] [dx] [bx] [cx] value [eax] modify exact [] = \ -"mov 0[eax],dx" \ -"mov 2[eax],bx" \ +"mov 0[eax],dx" \ +"mov 2[eax],bx" \ "mov 4[eax],cx"; #endif @@ -470,20 +473,20 @@ fix vm_vec_dotprod (vms_vector * v0, vms_vector * v1); #ifdef INLINE #ifdef __WATCOMC__ #pragma aux vm_vec_dotprod parm [esi] [edi] value [eax] modify exact [eax ebx ecx edx] = \ -"mov eax,[esi]" \ -"imul dword ptr [edi]" \ -"mov ebx,eax" \ -"mov ecx,edx" \ +"mov eax,[esi]" \ +"imul dword ptr [edi]" \ +"mov ebx,eax" \ +"mov ecx,edx" \ \ -"mov eax,4[esi]" \ -"imul dword ptr 4[edi]" \ -"add ebx,eax" \ -"adc ecx,edx" \ +"mov eax,4[esi]" \ +"imul dword ptr 4[edi]" \ +"add ebx,eax" \ +"adc ecx,edx" \ \ -"mov eax,8[esi]" \ -"imul dword ptr 8[edi]" \ -"add eax,ebx" \ -"adc edx,ecx" \ +"mov eax,8[esi]" \ +"imul dword ptr 8[edi]" \ +"add eax,ebx" \ +"adc edx,ecx" \ \ "shrd eax,edx,16"; diff --git a/main/collide.c b/main/collide.c index 1aab1ceb..4994e7ef 100644 --- a/main/collide.c +++ b/main/collide.c @@ -16,7 +16,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #endif #ifdef RCS -static char rcsid[] = "$Id: collide.c,v 1.4 2001-01-31 15:17:49 bradleyb Exp $"; +static char rcsid[] = "$Id: collide.c,v 1.5 2001-10-12 06:40:49 bradleyb Exp $"; #endif #include // for memset @@ -559,7 +559,7 @@ int check_effect_blowup(segment *seg,int side,vms_vector *pnt, object *blower, i if ((((ec=TmapInfo[tm].eclip_num)!=-1) && ((db=Effects[ec].dest_bm_num)!=-1 && !(Effects[ec].flags&EF_ONE_SHOT))) || (ec==-1 && (TmapInfo[tm].destroyed!=-1))) { fix u,v; grs_bitmap *bm = &GameBitmaps[Textures[tm].index]; - int x,y,t; + int x=0,y=0,t; PIGGY_PAGE_IN(Textures[tm]); diff --git a/main/kludge.c b/main/kludge.c index f92dc8dc..cf6c9ebe 100644 --- a/main/kludge.c +++ b/main/kludge.c @@ -2,6 +2,7 @@ #include #include #include +#include #include "gr.h" #include "pstypes.h" #include "maths.h" diff --git a/main/piggy.h b/main/piggy.h index 718908b8..bf48e44e 100644 --- a/main/piggy.h +++ b/main/piggy.h @@ -75,7 +75,7 @@ static inline void _piggy_page_in(bitmap_index bmp) { #define PIGGY_PAGE_IN(bmp) \ do { \ if ( GameBitmaps[(bmp).index].bm_flags & BM_FLAG_PAGED_OUT ) {\ - piggy_bitmap_page_in( bmp ); \ + piggy_bitmap_page_in( bmp ); \ } \ } while(0) /* mprintf(( 0, "Paging in '%s' from file '%s', line %d\n", #bmp, __FILE__,__LINE__ )); \ */ -- 2.39.2 From 85f617794fc5356f507b97cd5d59b3ba0f8f5bbf Mon Sep 17 00:00:00 2001 From: Bradley Bell Date: Fri, 12 Oct 2001 10:03:32 +0000 Subject: [PATCH 02/16] Changed __ENV_DJGPP__ to __DJGPP__, since it's built-in. --- 2d/2dsline.c | 18 +++++++++--------- 2d/bitblt.c | 12 ++++++------ 2d/box.c | 4 ++-- 2d/canvas.c | 6 +++--- 2d/gpixel.c | 10 +++++----- 2d/line.c | 4 ++-- 2d/pixel.c | 4 ++-- aclocal.m4 | 2 +- conf.h.in | 5 +---- configure.in | 1 - include/pstypes.h | 2 +- include/strutil.h | 2 +- include/timer.h | 13 ++++++++----- main/digi.h | 9 ++++++--- main/kludge.c | 4 ++-- main/object.c | 4 ++-- main/render.c | 4 ++-- misc/d_glob.c | 2 +- misc/d_io.c | 2 +- misc/strutil.c | 2 +- 20 files changed, 56 insertions(+), 54 deletions(-) diff --git a/2d/2dsline.c b/2d/2dsline.c index 558e2637..ce3ca1f8 100644 --- a/2d/2dsline.c +++ b/2d/2dsline.c @@ -19,7 +19,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "gr.h" #include "grdef.h" -#ifdef __ENV_DJGPP__ +#ifdef __DJGPP__ #include "modex.h" #include "vesa.h" #endif @@ -98,13 +98,13 @@ void gr_linear_darken(ubyte * dest, int darkening_level, int count, ubyte * fade void gr_uscanline( int x1, int x2, int y ) { if (Gr_scanline_darkening_level >= GR_FADE_LEVELS ) { -#ifdef __ENV_DJGPP__ +#ifdef __DJGPP__ switch(TYPE) { case BM_LINEAR: #endif gr_linear_stosd( DATA + ROWSIZE*y + x1, (unsigned char)COLOR, x2-x1+1); -#ifdef __ENV_DJGPP__ +#ifdef __DJGPP__ break; case BM_MODEX: gr_modex_uscanline( x1+XOFFSET, x2+XOFFSET, y+YOFFSET, COLOR ); @@ -115,13 +115,13 @@ void gr_uscanline( int x1, int x2, int y ) } #endif } else { -#ifdef __ENV_DJGPP__ +#ifdef __DJGPP__ switch(TYPE) { case BM_LINEAR: #endif gr_linear_darken( DATA + ROWSIZE*y + x1, Gr_scanline_darkening_level, x2-x1+1, gr_fade_table); -#ifdef __ENV_DJGPP__ +#ifdef __DJGPP__ break; case BM_MODEX: gr_modex_uscanline( x1+XOFFSET, x2+XOFFSET, y+YOFFSET, COLOR ); @@ -147,13 +147,13 @@ void gr_scanline( int x1, int x2, int y ) if (x2 > MAXX) x2 = MAXX; if (Gr_scanline_darkening_level >= GR_FADE_LEVELS ) { -#ifdef __ENV_DJGPP__ +#ifdef __DJGPP__ switch(TYPE) { case BM_LINEAR: #endif gr_linear_stosd( DATA + ROWSIZE*y + x1, (unsigned char)COLOR, x2-x1+1); -#ifdef __ENV_DJGPP__ +#ifdef __DJGPP__ break; case BM_MODEX: gr_modex_uscanline( x1+XOFFSET, x2+XOFFSET, y+YOFFSET, COLOR ); @@ -164,13 +164,13 @@ void gr_scanline( int x1, int x2, int y ) } #endif } else { -#ifdef __ENV_DJGPP__ +#ifdef __DJGPP__ switch(TYPE) { case BM_LINEAR: #endif gr_linear_darken( DATA + ROWSIZE*y + x1, Gr_scanline_darkening_level, x2-x1+1, gr_fade_table); -#ifdef __ENV_DJGPP__ +#ifdef __DJGPP__ break; case BM_MODEX: gr_modex_uscanline( x1+XOFFSET, x2+XOFFSET, y+YOFFSET, COLOR ); diff --git a/2d/bitblt.c b/2d/bitblt.c index 98354231..d4558216 100644 --- a/2d/bitblt.c +++ b/2d/bitblt.c @@ -144,7 +144,7 @@ void gr_ubitmap00m( int x, int y, grs_bitmap *bm ) //" jne alignstart " //"aligned4: " -#ifdef __ENV_DJGPP__ +#ifdef __DJGPP__ // From Linear to ModeX void gr_bm_ubitblt01(int w, int h, int dx, int dy, int sx, int sy, grs_bitmap * src, grs_bitmap * dest) { @@ -313,7 +313,7 @@ void gr_ubitmap( int x, int y, grs_bitmap *bm ) Win32_BlitLinearToDirectX_bm(bm, 0, 0, bm->bm_w, bm->bm_h, x, y, 0); return; #endif -#ifdef __ENV_DJGPP__ +#ifdef __DJGPP__ case BM_SVGA: if ( bm->bm_flags & BM_FLAG_RLE ) gr_bm_ubitblt0x_rle(bm->bm_w, bm->bm_h, x, y, 0, 0, bm, &grd_curcanv->cv_bitmap, 0 ); @@ -368,7 +368,7 @@ void gr_ubitmapm( int x, int y, grs_bitmap *bm ) Win32_BlitLinearToDirectX_bm(bm, 0, 0, bm->bm_w, bm->bm_h, x, y, 1); return; #endif -#ifdef __ENV_DJGPP__ +#ifdef __DJGPP__ case BM_SVGA: gr_ubitmapGENERICm(x, y, bm); return; @@ -386,7 +386,7 @@ void gr_ubitmapm( int x, int y, grs_bitmap *bm ) } -#ifdef __ENV_DJGPP__ +#ifdef __DJGPP__ // From linear to SVGA void gr_bm_ubitblt02(int w, int h, int dx, int dy, int sx, int sy, grs_bitmap * src, grs_bitmap * dest) { @@ -483,7 +483,7 @@ void gr_bm_ubitblt20(int w, int h, int dx, int dy, int sx, int sy, grs_bitmap * } } -#endif // __ENV_DJGPP__ +#endif // __DJGPP__ //@extern int Interlacing_on; // From Linear to Linear @@ -634,7 +634,7 @@ void gr_bm_ubitblt(int w, int h, int dx, int dy, int sx, int sy, grs_bitmap * sr gr_bm_ubitblt0x_rle(w, h, dx, dy, sx, sy, src, dest, 0 ); return; } -#ifdef __ENV_DJGPP__ +#ifdef __DJGPP__ if ( (src->bm_type == BM_LINEAR) && (dest->bm_type == BM_SVGA )) { gr_bm_ubitblt02( w, h, dx, dy, sx, sy, src, dest ); diff --git a/2d/box.c b/2d/box.c index bb6f08b7..a091c780 100644 --- a/2d/box.c +++ b/2d/box.c @@ -103,7 +103,7 @@ void gr_ubox(int left,int top,int right,int bot) if (TYPE==BM_LINEAR) gr_ubox0( left, top, right, bot ); -#ifdef __ENV_DJGPP__ +#ifdef __DJGPP__ else if ( TYPE == BM_MODEX ) gr_ubox12( left, top, right, bot ); #endif @@ -117,7 +117,7 @@ void gr_box(int left,int top,int right,int bot) if (TYPE==BM_LINEAR) gr_box0( left, top, right, bot ); -#ifdef __ENV_DJGPP__ +#ifdef __DJGPP__ else if ( TYPE == BM_MODEX ) gr_box12( left, top, right, bot ); #endif diff --git a/2d/canvas.c b/2d/canvas.c index 0b7956c6..fc117954 100644 --- a/2d/canvas.c +++ b/2d/canvas.c @@ -24,7 +24,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "gr.h" #include "grdef.h" -#ifdef __ENV_DJGPP__ +#ifdef __DJGPP__ #include "modex.h" #include "vesa.h" #endif @@ -72,7 +72,7 @@ void gr_init_canvas(grs_canvas *canv, unsigned char * pixdata, int pixtype, int canv->cv_font_bg_color = 0; -#ifndef __ENV_DJGPP__ +#ifndef __DJGPP__ wreal = w; #else wreal = (pixtype == BM_MODEX) ? w / 4 : w; @@ -106,7 +106,7 @@ int gr_wait_for_retrace = 1; void gr_show_canvas( grs_canvas *canv ) { -#ifdef __ENV_DJGPP__ +#ifdef __DJGPP__ if (canv->cv_bitmap.bm_type == BM_MODEX ) gr_modex_setstart( canv->cv_bitmap.bm_x, canv->cv_bitmap.bm_y, gr_wait_for_retrace ); diff --git a/2d/gpixel.c b/2d/gpixel.c index d2389c81..d8fb3948 100644 --- a/2d/gpixel.c +++ b/2d/gpixel.c @@ -19,20 +19,20 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "gr.h" #include "grdef.h" -#ifdef __ENV_DJGPP__ +#ifdef __DJGPP__ #include "modex.h" #include "vesa.h" #endif unsigned char gr_ugpixel( grs_bitmap * bitmap, int x, int y ) { -#ifdef __ENV_DJGPP__ +#ifdef __DJGPP__ switch(bitmap->bm_type) { case BM_LINEAR: #endif return bitmap->bm_data[ bitmap->bm_rowsize*y + x ]; -#ifdef __ENV_DJGPP__ +#ifdef __DJGPP__ case BM_MODEX: x += bitmap->bm_x; y += bitmap->bm_y; @@ -53,13 +53,13 @@ unsigned char gr_ugpixel( grs_bitmap * bitmap, int x, int y ) unsigned char gr_gpixel( grs_bitmap * bitmap, int x, int y ) { if ((x<0) || (y<0) || (x>=bitmap->bm_w) || (y>=bitmap->bm_h)) return 0; -#ifdef __ENV_DJGPP__ +#ifdef __DJGPP__ switch(bitmap->bm_type) { case BM_LINEAR: #endif return bitmap->bm_data[ bitmap->bm_rowsize*y + x ]; -#ifdef __ENV_DJGPP__ +#ifdef __DJGPP__ case BM_MODEX: x += bitmap->bm_x; y += bitmap->bm_y; diff --git a/2d/line.c b/2d/line.c index 5b0fd553..44746586 100644 --- a/2d/line.c +++ b/2d/line.c @@ -29,7 +29,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "clip.h" -#ifdef __ENV_DJGPP__ +#ifdef __DJGPP__ #include "modex.h" #endif #ifdef OGL @@ -282,7 +282,7 @@ int gr_uline(fix _a1, fix _b1, fix _a2, fix _b2) gr_linear_line( a1, b1, a2, b2 ); #endif return 0; -#ifdef __ENV_DJGPP__ +#ifdef __DJGPP__ case BM_MODEX: modex_line_x1 = a1+XOFFSET; modex_line_y1 = b1+YOFFSET; diff --git a/2d/pixel.c b/2d/pixel.c index 6bb05bf0..2ddbb5db 100644 --- a/2d/pixel.c +++ b/2d/pixel.c @@ -44,7 +44,7 @@ void gr_upixel( int x, int y ) case BM_LINEAR: DATA[ ROWSIZE*y+x ] = COLOR; return; -#ifdef __ENV_DJGPP__ +#ifdef __DJGPP__ case BM_MODEX: gr_modex_setplane( (x+XOFFSET) & 3 ); gr_video_memory[(ROWSIZE * (y+YOFFSET)) + ((x+XOFFSET)>>2)] = COLOR; @@ -76,7 +76,7 @@ inline void gr_bm_upixel( grs_bitmap * bm, int x, int y, unsigned char color ) case BM_LINEAR: bm->bm_data[ bm->bm_rowsize*y+x ] = color; return; -#ifdef __ENV_DJGPP__ +#ifdef __DJGPP__ case BM_MODEX: x += bm->bm_x; y += bm->bm_y; diff --git a/aclocal.m4 b/aclocal.m4 index 2f8342ea..a60c657f 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,4 +1,4 @@ -dnl aclocal.m4 generated automatically by aclocal 1.4-p4 +dnl aclocal.m4 generated automatically by aclocal 1.4 dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation diff --git a/conf.h.in b/conf.h.in index e2ff5292..1971146c 100644 --- a/conf.h.in +++ b/conf.h.in @@ -1,4 +1,4 @@ -/* conf.h.in. Generated automatically from configure.in by autoheader 2.13. */ +/* conf.h.in. Generated automatically from configure.in by autoheader. */ /* Define if you have the ANSI C header files. */ #undef STDC_HEADERS @@ -21,9 +21,6 @@ /* Define if building under linux */ #undef __ENV_LINUX__ -/* Define if building under msdos */ -#undef __ENV_DJGPP__ - /* Define to disable asserts, int3, etc. */ #undef NDEBUG diff --git a/configure.in b/configure.in index e3f36f1f..d0413e4c 100644 --- a/configure.in +++ b/configure.in @@ -63,7 +63,6 @@ AM_CONDITIONAL(ENV_DJGPP, test "$host_os" = "msdosdjgpp") if test "$host_os" = "msdosdjgpp"; then CFLAGS="-I \$(top_srcdir)/arch/dos/include $CFLAGS" - AC_DEFINE(__ENV_DJGPP__) AC_PATH_PROG(NASM, nasm, no) TARGETS=d2x diff --git a/include/pstypes.h b/include/pstypes.h index a8d49b5c..d21722b8 100644 --- a/include/pstypes.h +++ b/include/pstypes.h @@ -40,7 +40,7 @@ typedef uint32_t u_int32_t; # define _MAX_PATH 1024 # define _MAX_DIR 256 -#elif defined __ENV_DJGPP__ +#elif defined __DJGPP__ # include # define _MAX_PATH 255 # define _MAX_DIR 63 diff --git a/include/strutil.h b/include/strutil.h index ff945cda..ca0e50af 100644 --- a/include/strutil.h +++ b/include/strutil.h @@ -25,7 +25,7 @@ extern int strnicmp(char *str1, char *str2, int n); #endif #ifndef __MINGW32__ -#ifndef __ENV_DJGPP__ +#ifndef __DJGPP__ void strupr( char *s1 ); void strlwr( char *s1 ); #endif diff --git a/include/timer.h b/include/timer.h index 682d265b..f3e38f11 100644 --- a/include/timer.h +++ b/include/timer.h @@ -12,13 +12,16 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. */ /* * $Source: /cvs/cvsroot/d2x/include/timer.h,v $ - * $Revision: 1.1.1.2 $ + * $Revision: 1.2 $ * $Author: bradleyb $ - * $Date: 2001-01-19 03:34:09 $ + * $Date: 2001-10-12 10:03:32 $ * * Header for timer functions * * $Log: not supported by cvs2svn $ + * Revision 1.1.1.2 2001/01/19 03:34:09 bradleyb + * Import of d2x-0.0.9-pre1 + * * Revision 1.1.1.1 1999/06/14 22:02:21 donut * Import of d1x 1.37 source. * @@ -89,7 +92,7 @@ extern void timer_set_function( void _far * function ); // 1 hr, respectively. extern fix timer_get_fixed_seconds(); // Rolls about every 9 hours... -#ifdef __ENV_DJGPP__ +#ifdef __DJGPP__ extern fix timer_get_fixed_secondsX(); // Assume interrupts already disabled extern fix timer_get_approx_seconds(); // Returns time since program started... accurate to 1/120th of a second extern void timer_set_joyhandler( void (*joy_handler)() ); @@ -106,11 +109,11 @@ extern void timer_set_joyhandler( void (*joy_handler)() ); //========================================================================== // Use to access the BIOS ticker... ie... i = TICKER -#ifndef __ENV_DJGPP__ +#ifndef __DJGPP__ #define TICKER (timer_get_fixed_seconds()) #endif -#ifdef __ENV_DJGPP__ +#ifdef __DJGPP__ #ifndef __GNUC__ #define TICKER (*(volatile int *)0x46C) diff --git a/main/digi.h b/main/digi.h index c65eee1c..85702b63 100644 --- a/main/digi.h +++ b/main/digi.h @@ -12,13 +12,16 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. */ /* * $Source: /cvs/cvsroot/d2x/main/digi.h,v $ - * $Revision: 1.1.1.2 $ + * $Revision: 1.2 $ * $Author: bradleyb $ - * $Date: 2001-01-19 03:33:43 $ + * $Date: 2001-10-12 10:03:32 $ * * Include file for sound hardware. * * $Log: not supported by cvs2svn $ + * Revision 1.1.1.2 2001/01/19 03:33:43 bradleyb + * Import of d2x-0.0.9-pre1 + * * Revision 1.2 1999/11/15 10:43:15 sekmu * added freq/br to digi_sound struct for alt sounds * @@ -164,7 +167,7 @@ typedef struct digi_sound { -#ifdef __ENV_DJGPP__ +#ifdef __DJGPP__ extern int digi_driver_board; extern int digi_driver_port; extern int digi_driver_irq; diff --git a/main/kludge.c b/main/kludge.c index cf6c9ebe..c78df2aa 100644 --- a/main/kludge.c +++ b/main/kludge.c @@ -20,7 +20,7 @@ int Dont_start_sound_objects = 1; int Window_clip_left,Window_clip_top,Window_clip_right,Window_clip_bot; char CDROM_dir[40] = "."; -#ifndef __ENV_DJGPP__ +#ifndef __DJGPP__ int gr_check_mode(u_int32_t a) { return 0; @@ -35,7 +35,7 @@ void gr_copy_palette(ubyte *gr_palette, ubyte *pal, int size) Num_computed_colors = 0; } -#ifndef __ENV_DJGPP__ +#ifndef __DJGPP__ void joy_set_btn_values( int btn, int state, int time_down, int downcount, int upcount ) { diff --git a/main/object.c b/main/object.c index 89e45dd1..5e3dab3f 100644 --- a/main/object.c +++ b/main/object.c @@ -16,7 +16,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #endif #ifdef RCS -static char rcsid[] = "$Id: object.c,v 1.5 2001-01-31 15:17:56 bradleyb Exp $"; +static char rcsid[] = "$Id: object.c,v 1.6 2001-10-12 10:03:32 bradleyb Exp $"; #endif #ifdef WINDOWS @@ -1992,7 +1992,7 @@ void object_move_one( object * obj ) default: -#ifdef __ENV_DJGPP__ +#ifdef __DJGPP__ Error("Unknown control type %d in object %li, sig/type/id = %i/%i/%i",obj->control_type, obj-Objects, obj->signature, obj->type, obj->id); #else Error("Unknown control type %d in object %i, sig/type/id = %i/%i/%i",obj->control_type, obj-Objects, obj->signature, obj->type, obj->id); diff --git a/main/render.c b/main/render.c index 4aed06f0..ac9b300c 100644 --- a/main/render.c +++ b/main/render.c @@ -16,7 +16,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #endif #ifdef RCS -static char rcsid[] = "$Id: render.c,v 1.4 2001-01-31 15:17:57 bradleyb Exp $"; +static char rcsid[] = "$Id: render.c,v 1.5 2001-10-12 10:03:32 bradleyb Exp $"; #endif #include @@ -629,7 +629,7 @@ im_so_ashamed: ; } } else -#ifdef __ENV_DJGPP__ +#ifdef __DJGPP__ Error("Illegal side type in render_side, type = %i, segment # = %li, side # = %i\n", sidep->type, segp-Segments, sidenum); #else Error("Illegal side type in render_side, type = %i, segment # = %i, side # = %i\n", sidep->type, segp-Segments, sidenum); diff --git a/misc/d_glob.c b/misc/d_glob.c index 0a5a4aa0..3e70edd3 100644 --- a/misc/d_glob.c +++ b/misc/d_glob.c @@ -11,7 +11,7 @@ #include "u_mem.h" //end addition -MM -#if defined(__ENV_DJGPP__) || defined(__ENV_LINUX__) +#if defined(__DJGPP__) || defined(__ENV_LINUX__) #include int d_glob(const char *pattern, d_glob_t *g) diff --git a/misc/d_io.c b/misc/d_io.c index a68f9758..b23abec9 100644 --- a/misc/d_io.c +++ b/misc/d_io.c @@ -8,7 +8,7 @@ #include #include #include "d_io.h" -#ifdef __ENV_DJGPP__ +#ifdef __DJGPP__ #include "dos_disk.h" #endif //added 05/17/99 Matt Mueller diff --git a/misc/strutil.c b/misc/strutil.c index 434533e4..c523b935 100644 --- a/misc/strutil.c +++ b/misc/strutil.c @@ -62,7 +62,7 @@ int strnicmp( char *s1, char *s2, int n ) #endif #ifndef __MINGW32__ -#ifndef __ENV_DJGPP__ +#ifndef __DJGPP__ void strlwr( char *s1 ) { while( *s1 ) { -- 2.39.2 From 615b3a230c219991b6bc1c8cba19c206e503cb86 Mon Sep 17 00:00:00 2001 From: Bradley Bell Date: Fri, 12 Oct 2001 10:20:06 +0000 Subject: [PATCH 03/16] remove superfluous files --- acconfig.h | 3 - aclocal.m4 | 352 ----------------------------------------------------- conf.h.in | 63 ---------- 3 files changed, 418 deletions(-) delete mode 100644 aclocal.m4 delete mode 100644 conf.h.in diff --git a/acconfig.h b/acconfig.h index ec853811..7cc1d3ff 100644 --- a/acconfig.h +++ b/acconfig.h @@ -16,9 +16,6 @@ /* Define if building under linux */ #undef __ENV_LINUX__ -/* Define if building under msdos */ -#undef __ENV_DJGPP__ - /* Define to disable asserts, int3, etc. */ #undef NDEBUG diff --git a/aclocal.m4 b/aclocal.m4 deleted file mode 100644 index a60c657f..00000000 --- a/aclocal.m4 +++ /dev/null @@ -1,352 +0,0 @@ -dnl aclocal.m4 generated automatically by aclocal 1.4 - -dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -dnl This program is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without -dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A -dnl PARTICULAR PURPOSE. - -# Like AC_CONFIG_HEADER, but automatically create stamp file. - -AC_DEFUN(AM_CONFIG_HEADER, -[AC_PREREQ([2.12]) -AC_CONFIG_HEADER([$1]) -dnl When config.status generates a header, we must update the stamp-h file. -dnl This file resides in the same directory as the config header -dnl that is generated. We must strip everything past the first ":", -dnl and everything past the last "/". -AC_OUTPUT_COMMANDS(changequote(<<,>>)dnl -ifelse(patsubst(<<$1>>, <<[^ ]>>, <<>>), <<>>, -<>CONFIG_HEADERS" || echo timestamp > patsubst(<<$1>>, <<^\([^:]*/\)?.*>>, <<\1>>)stamp-h<<>>dnl>>, -<>; do - case " <<$>>CONFIG_HEADERS " in - *" <<$>>am_file "*<<)>> - echo timestamp > `echo <<$>>am_file | sed -e 's%:.*%%' -e 's%[^/]*$%%'`stamp-h$am_indx - ;; - esac - am_indx=`expr "<<$>>am_indx" + 1` -done<<>>dnl>>) -changequote([,]))]) - -# Do all the work for Automake. This macro actually does too much -- -# some checks are only needed if your package does certain things. -# But this isn't really a big deal. - -# serial 1 - -dnl Usage: -dnl AM_INIT_AUTOMAKE(package,version, [no-define]) - -AC_DEFUN(AM_INIT_AUTOMAKE, -[AC_REQUIRE([AC_PROG_INSTALL]) -PACKAGE=[$1] -AC_SUBST(PACKAGE) -VERSION=[$2] -AC_SUBST(VERSION) -dnl test to see if srcdir already configured -if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then - AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) -fi -ifelse([$3],, -AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) -AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])) -AC_REQUIRE([AM_SANITY_CHECK]) -AC_REQUIRE([AC_ARG_PROGRAM]) -dnl FIXME This is truly gross. -missing_dir=`cd $ac_aux_dir && pwd` -AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir) -AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir) -AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir) -AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir) -AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir) -AC_REQUIRE([AC_PROG_MAKE_SET])]) - -# -# Check to make sure that the build environment is sane. -# - -AC_DEFUN(AM_SANITY_CHECK, -[AC_MSG_CHECKING([whether build environment is sane]) -# Just in case -sleep 1 -echo timestamp > conftestfile -# Do `set' in a subshell so we don't clobber the current shell's -# arguments. Must try -L first in case configure is actually a -# symlink; some systems play weird games with the mod time of symlinks -# (eg FreeBSD returns the mod time of the symlink's containing -# directory). -if ( - set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null` - if test "[$]*" = "X"; then - # -L didn't work. - set X `ls -t $srcdir/configure conftestfile` - fi - if test "[$]*" != "X $srcdir/configure conftestfile" \ - && test "[$]*" != "X conftestfile $srcdir/configure"; then - - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken -alias in your environment]) - fi - - test "[$]2" = conftestfile - ) -then - # Ok. - : -else - AC_MSG_ERROR([newly created file is older than distributed files! -Check your system clock]) -fi -rm -f conftest* -AC_MSG_RESULT(yes)]) - -dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY) -dnl The program must properly implement --version. -AC_DEFUN(AM_MISSING_PROG, -[AC_MSG_CHECKING(for working $2) -# Run test in a subshell; some versions of sh will print an error if -# an executable is not found, even if stderr is redirected. -# Redirect stdin to placate older versions of autoconf. Sigh. -if ($2 --version) < /dev/null > /dev/null 2>&1; then - $1=$2 - AC_MSG_RESULT(found) -else - $1="$3/missing $2" - AC_MSG_RESULT(missing) -fi -AC_SUBST($1)]) - -# Add --enable-maintainer-mode option to configure. -# From Jim Meyering - -# serial 1 - -AC_DEFUN(AM_MAINTAINER_MODE, -[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) - dnl maintainer-mode is disabled by default - AC_ARG_ENABLE(maintainer-mode, -[ --enable-maintainer-mode enable make rules and dependencies not useful - (and sometimes confusing) to the casual installer], - USE_MAINTAINER_MODE=$enableval, - USE_MAINTAINER_MODE=no) - AC_MSG_RESULT($USE_MAINTAINER_MODE) - AM_CONDITIONAL(MAINTAINER_MODE, test $USE_MAINTAINER_MODE = yes) - MAINT=$MAINTAINER_MODE_TRUE - AC_SUBST(MAINT)dnl -] -) - -# Define a conditional. - -AC_DEFUN(AM_CONDITIONAL, -[AC_SUBST($1_TRUE) -AC_SUBST($1_FALSE) -if $2; then - $1_TRUE= - $1_FALSE='#' -else - $1_TRUE='#' - $1_FALSE= -fi]) - -#serial 1 -# This test replaces the one in autoconf. -# Currently this macro should have the same name as the autoconf macro -# because gettext's gettext.m4 (distributed in the automake package) -# still uses it. Otherwise, the use in gettext.m4 makes autoheader -# give these diagnostics: -# configure.in:556: AC_TRY_COMPILE was called before AC_ISC_POSIX -# configure.in:556: AC_TRY_RUN was called before AC_ISC_POSIX - -undefine([AC_ISC_POSIX]) - -AC_DEFUN([AC_ISC_POSIX], - [ - dnl This test replaces the obsolescent AC_ISC_POSIX kludge. - AC_CHECK_LIB(cposix, strerror, [LIBS="$LIBS -lcposix"]) - ] -) - -# Configure paths for SDL -# Sam Lantinga 9/21/99 -# stolen from Manish Singh -# stolen back from Frank Belew -# stolen from Manish Singh -# Shamelessly stolen from Owen Taylor - -dnl AM_PATH_SDL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) -dnl Test for SDL, and define SDL_CFLAGS and SDL_LIBS -dnl -AC_DEFUN(AM_PATH_SDL, -[dnl -dnl Get the cflags and libraries from the sdl-config script -dnl -AC_ARG_WITH(sdl-prefix,[ --with-sdl-prefix=PFX Prefix where SDL is installed (optional)], - sdl_prefix="$withval", sdl_prefix="") -AC_ARG_WITH(sdl-exec-prefix,[ --with-sdl-exec-prefix=PFX Exec prefix where SDL is installed (optional)], - sdl_exec_prefix="$withval", sdl_exec_prefix="") -AC_ARG_ENABLE(sdltest, [ --disable-sdltest Do not try to compile and run a test SDL program], - , enable_sdltest=yes) - - if test x$sdl_exec_prefix != x ; then - sdl_args="$sdl_args --exec-prefix=$sdl_exec_prefix" - if test x${SDL_CONFIG+set} != xset ; then - SDL_CONFIG=$sdl_exec_prefix/bin/sdl-config - fi - fi - if test x$sdl_prefix != x ; then - sdl_args="$sdl_args --prefix=$sdl_prefix" - if test x${SDL_CONFIG+set} != xset ; then - SDL_CONFIG=$sdl_prefix/bin/sdl-config - fi - fi - - AC_PATH_PROG(SDL_CONFIG, sdl-config, no) - min_sdl_version=ifelse([$1], ,0.11.0,$1) - AC_MSG_CHECKING(for SDL - version >= $min_sdl_version) - no_sdl="" - if test "$SDL_CONFIG" = "no" ; then - no_sdl=yes - else - SDL_CFLAGS=`$SDL_CONFIG $sdlconf_args --cflags` - SDL_LIBS=`$SDL_CONFIG $sdlconf_args --libs` - - sdl_major_version=`$SDL_CONFIG $sdl_args --version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` - sdl_minor_version=`$SDL_CONFIG $sdl_args --version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` - sdl_micro_version=`$SDL_CONFIG $sdl_config_args --version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` - if test "x$enable_sdltest" = "xyes" ; then - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $SDL_CFLAGS" - LIBS="$LIBS $SDL_LIBS" -dnl -dnl Now check if the installed SDL is sufficiently new. (Also sanity -dnl checks the results of sdl-config to some extent -dnl - rm -f conf.sdltest - AC_TRY_RUN([ -#include -#include -#include -#include "SDL.h" - -char* -my_strdup (char *str) -{ - char *new_str; - - if (str) - { - new_str = (char *)malloc ((strlen (str) + 1) * sizeof(char)); - strcpy (new_str, str); - } - else - new_str = NULL; - - return new_str; -} - -int main (int argc, char *argv[]) -{ - int major, minor, micro; - char *tmp_version; - - /* This hangs on some systems (?) - system ("touch conf.sdltest"); - */ - { FILE *fp = fopen("conf.sdltest", "a"); if ( fp ) fclose(fp); } - - /* HP/UX 9 (%@#!) writes to sscanf strings */ - tmp_version = my_strdup("$min_sdl_version"); - if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { - printf("%s, bad version string\n", "$min_sdl_version"); - exit(1); - } - - if (($sdl_major_version > major) || - (($sdl_major_version == major) && ($sdl_minor_version > minor)) || - (($sdl_major_version == major) && ($sdl_minor_version == minor) && ($sdl_micro_version >= micro))) - { - return 0; - } - else - { - printf("\n*** 'sdl-config --version' returned %d.%d.%d, but the minimum version\n", $sdl_major_version, $sdl_minor_version, $sdl_micro_version); - printf("*** of SDL required is %d.%d.%d. If sdl-config is correct, then it is\n", major, minor, micro); - printf("*** best to upgrade to the required version.\n"); - printf("*** If sdl-config was wrong, set the environment variable SDL_CONFIG\n"); - printf("*** to point to the correct copy of sdl-config, and remove the file\n"); - printf("*** config.cache before re-running configure\n"); - return 1; - } -} - -],, no_sdl=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - if test "x$no_sdl" = x ; then - AC_MSG_RESULT(yes) - ifelse([$2], , :, [$2]) - else - AC_MSG_RESULT(no) - if test "$SDL_CONFIG" = "no" ; then - echo "*** The sdl-config script installed by SDL could not be found" - echo "*** If SDL was installed in PREFIX, make sure PREFIX/bin is in" - echo "*** your path, or set the SDL_CONFIG environment variable to the" - echo "*** full path to sdl-config." - else - if test -f conf.sdltest ; then - : - else - echo "*** Could not run SDL test program, checking why..." - CFLAGS="$CFLAGS $SDL_CFLAGS" - LIBS="$LIBS $SDL_LIBS" - AC_TRY_LINK([ -#include -#include "SDL.h" - -int main(int argc, char *argv[]) -{ return 0; } -#undef main -#define main K_and_R_C_main -], [ return 0; ], - [ echo "*** The test program compiled, but did not run. This usually means" - echo "*** that the run-time linker is not finding SDL or finding the wrong" - echo "*** version of SDL. If it is not finding SDL, you'll need to set your" - echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" - echo "*** to the installed location Also, make sure you have run ldconfig if that" - echo "*** is required on your system" - echo "***" - echo "*** If you have an old version installed, it is best to remove it, although" - echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"], - [ echo "*** The test program failed to compile or link. See the file config.log for the" - echo "*** exact error that occured. This usually means SDL was incorrectly installed" - echo "*** or that you have moved SDL since it was installed. In the latter case, you" - echo "*** may want to edit the sdl-config script: $SDL_CONFIG" ]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - SDL_CFLAGS="" - SDL_LIBS="" - ifelse([$3], , :, [$3]) - fi - AC_SUBST(SDL_CFLAGS) - AC_SUBST(SDL_LIBS) - rm -f conf.sdltest -]) - diff --git a/conf.h.in b/conf.h.in deleted file mode 100644 index 1971146c..00000000 --- a/conf.h.in +++ /dev/null @@ -1,63 +0,0 @@ -/* conf.h.in. Generated automatically from configure.in by autoheader. */ - -/* Define if you have the ANSI C header files. */ -#undef STDC_HEADERS - -/* Define if you want an assembler free build */ -#undef NO_ASM - -/* Define if you want a network build */ -#undef NETWORK - -/* Define if you want an OpenGL build */ -#undef OGL - -/* Define if you want an SVGALib build */ -#undef SVGA - -/* 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 - -/* Define if you have the header file. */ -#undef HAVE_NETIPX_IPX_H - -/* Name of package */ -#undef PACKAGE - -/* Version number of package */ -#undef VERSION - - -/* General defines */ -#define NMONO 1 -#define PIGGY_USE_PAGING 1 -#define NEWDEMO 1 - -#ifdef __ENV_LINUX__ -# define __SDL__ 1 -# define SDL_AUDIO 1 - -# ifdef OGL -# define SDL_GL_VIDEO 1 -# define SDL_INPUT 1 -# else -# ifdef GGI -# define GGI_VIDEO 1 -# define GII_INPUT 1 -# else -# ifdef SVGA -# define SVGALIB_VIDEO 1 -# define SVGALIB_INPUT 1 -# else -# define SDL_VIDEO 1 -# define SDL_INPUT 1 -# endif -# endif -# endif -#endif -- 2.39.2 From 32634b77ae0b7a18a3f20fce94fcb6f0d0304549 Mon Sep 17 00:00:00 2001 From: Bradley Bell Date: Fri, 12 Oct 2001 10:21:44 +0000 Subject: [PATCH 04/16] Changed __ENV_DJGPP__ to __DJGPP__, since it's built-in. --- acconfig.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/acconfig.h b/acconfig.h index 7cc1d3ff..8385b2db 100644 --- a/acconfig.h +++ b/acconfig.h @@ -44,7 +44,7 @@ # else # define SDL_VIDEO 1 # define SDL_INPUT 1 -# endif +# endif # endif # endif #endif -- 2.39.2 From 98439a61605f9cbed6ab558c689d9478b88b7d53 Mon Sep 17 00:00:00 2001 From: Bradley Bell Date: Sat, 13 Oct 2001 01:31:41 +0000 Subject: [PATCH 05/16] Enable assembly under mingw32 --- configure.in | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/configure.in b/configure.in index d0413e4c..c4a6bde6 100644 --- a/configure.in +++ b/configure.in @@ -22,6 +22,7 @@ AC_STDC_HEADERS NO_ASM=0 NO_NETWORK=0 GL_LIBS="GL GLU" +NASM_PROG=nasm AC_CYGWIN if test x$CYGWIN = xyes; then @@ -32,10 +33,10 @@ fi AC_MINGW32 AM_CONDITIONAL(MINGW32, test x$MINGW32 = xyes) if test x$MINGW32 = xyes; then - GL_LIBS="opengl32 glu32" - AC_MSG_WARN([mingw32 found, disabling network and assembler]) - NO_ASM=1 + AC_MSG_WARN([mingw32 found, disabling network]) NO_NETWORK=1 + GL_LIBS="opengl32 glu32" + NASM_PROG=nasmw fi CFLAGS="$CFLAGS -g -O2 -Wall" @@ -167,7 +168,7 @@ else fi fi - AC_PATH_PROG(NASM, nasm, no) + AC_PATH_PROG(NASM, $NASM_PROG, no) CFLAGS="-I\$(top_srcdir)/input/linux/include -I\$(top_srcdir)/arch/linux/include $CFLAGS" fi @@ -189,11 +190,11 @@ if test "$NASM" = "no"; then fi if test "$NO_ASM" = 1; then AC_DEFINE(NO_ASM) - NASMFLAGS="" + NASMFLAGS="-i\$(srcdir)/ $NASMFLAGS" else case $host_os in cygwin) - NASMFLAGS="-f win32 -i\$(srcdir)/" + NASMFLAGS="-f win32 $NASMFLAGS" ;; msdosdjgpp) NASMFLAGS="-f coff -i\$(srcdir)/" -- 2.39.2 From 094014c1af0b0843f45a1ee0a27a1911ab42b3fc Mon Sep 17 00:00:00 2001 From: Bradley Bell Date: Sat, 13 Oct 2001 02:29:02 +0000 Subject: [PATCH 06/16] Added instructions for mingw32 build --- mingw32.txt | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 mingw32.txt diff --git a/mingw32.txt b/mingw32.txt new file mode 100644 index 00000000..b13eba24 --- /dev/null +++ b/mingw32.txt @@ -0,0 +1,44 @@ +Instructions for building D2X for MinGW32 +----------------------------------------- + +Using Cygwin +------------ +First you will need SDL. Download the development libraries for +Win32/mingw32 from http://www.libsdl.org/ Currently, it is +SDL-devel-1.2.2-mingw32.tar.gz. Inside this file, you will find +another tar.gz, called i386-mingw32msvc.tar.gz. This should be +untarred under /usr/local/cross-tools: +mkdir /usr/local/cross-tools +cd /usr/local/cross-tools +tar zxf /path/to/i386-mingw32msvc.tar.gz + +Then you should place SDL.dll and sdl-config somewhere in your PATH. +I recommend /usr/local/bin: +cp /usr/local/cross-tools/i386-mingw32msvc/lib/SDL.dll /usr/local/bin +cp /usr/local/cross-tools/i386-mingw32msvc/bin/sdl-config /usr/local/bin + +If you need to run autogen.sh (e.g. to rebuild the configure scripts, +or to build from cvs) you have to have the ACLOCAL_FLAGS variable set. +for example: +export ACLOCAL_FLAGS=/usr/local/cross-tools/i386-mingw32msvc/share/aclocal + +You should also install NASM, for compiling assembler files. Download +it from http://www.web-sites.co.uk/nasm/where.html and place nasmw.exe +somewhere in your path (e.g. /usr/local/bin): +unzip nasm-0.98-win32.zip +mv nasmw.exe /usr/local/bin + +Now you can configure and build d2x as normal. + + +Using MinGW32 +------------- +to be added + + +Using Linux +----------- +to be added + + +-Bradley Bell -- 2.39.2 From f1cbc4cec516a16631fccd146a1ebb7ad1e80a0a Mon Sep 17 00:00:00 2001 From: Bradley Bell Date: Sat, 13 Oct 2001 02:37:18 +0000 Subject: [PATCH 07/16] renamed INSTALL to installation.txt --- INSTALL | 202 ++++++++++++++++++++++++++++++++++++++++++----- Makefile.am | 8 +- installation.txt | 20 +++++ 3 files changed, 203 insertions(+), 27 deletions(-) create mode 100644 installation.txt diff --git a/INSTALL b/INSTALL index 27185a7c..b42a17ac 100644 --- a/INSTALL +++ b/INSTALL @@ -1,20 +1,182 @@ -Firstly, compile d2x. - -Then stick it in a directory with these files from a Descent 2 -Registered Installation (the version _does not_ matter). Shareware may -work if you hack at the shareware build system, but I haven't even -attempted it. - -I needed these files: (in addition to the d2x binary) -alien1.pig -alien2.pig -descent2.ham -descent2.hog -descent2.s11 -descent2.s22 -fire.pig -groupa.pig -ice.pig -water.pig - -Note the filenames must be in _lower case_. It's important. +Basic Installation +================== + + These are generic installation instructions. + + The `configure' shell script attempts to guess correct values for +various system-dependent variables used during compilation. It uses +those values to create a `Makefile' in each directory of the package. +It may also create one or more `.h' files containing system-dependent +definitions. Finally, it creates a shell script `config.status' that +you can run in the future to recreate the current configuration, a file +`config.cache' that saves the results of its tests to speed up +reconfiguring, and a file `config.log' containing compiler output +(useful mainly for debugging `configure'). + + If you need to do unusual things to compile the package, please try +to figure out how `configure' could check whether to do them, and mail +diffs or instructions to the address given in the `README' so they can +be considered for the next release. If at some point `config.cache' +contains results you don't want to keep, you may remove or edit it. + + The file `configure.in' is used to create `configure' by a program +called `autoconf'. You only need `configure.in' if you want to change +it or regenerate `configure' using a newer version of `autoconf'. + +The simplest way to compile this package is: + + 1. `cd' to the directory containing the package's source code and type + `./configure' to configure the package for your system. If you're + using `csh' on an old version of System V, you might need to type + `sh ./configure' instead to prevent `csh' from trying to execute + `configure' itself. + + Running `configure' takes awhile. While running, it prints some + messages telling which features it is checking for. + + 2. Type `make' to compile the package. + + 3. Optionally, type `make check' to run any self-tests that come with + the package. + + 4. Type `make install' to install the programs and any data files and + documentation. + + 5. You can remove the program binaries and object files from the + source code directory by typing `make clean'. To also remove the + files that `configure' created (so you can compile the package for + a different kind of computer), type `make distclean'. There is + also a `make maintainer-clean' target, but that is intended mainly + for the package's developers. If you use it, you may have to get + all sorts of other programs in order to regenerate files that came + with the distribution. + +Compilers and Options +===================== + + Some systems require unusual options for compilation or linking that +the `configure' script does not know about. You can give `configure' +initial values for variables by setting them in the environment. Using +a Bourne-compatible shell, you can do that on the command line like +this: + CC=c89 CFLAGS=-O2 LIBS=-lposix ./configure + +Or on systems that have the `env' program, you can do it like this: + env CPPFLAGS=-I/usr/local/include LDFLAGS=-s ./configure + +Compiling For Multiple Architectures +==================================== + + You can compile the package for more than one kind of computer at the +same time, by placing the object files for each architecture in their +own directory. To do this, you must use a version of `make' that +supports the `VPATH' variable, such as GNU `make'. `cd' to the +directory where you want the object files and executables to go and run +the `configure' script. `configure' automatically checks for the +source code in the directory that `configure' is in and in `..'. + + If you have to use a `make' that does not supports the `VPATH' +variable, you have to compile the package for one architecture at a time +in the source code directory. After you have installed the package for +one architecture, use `make distclean' before reconfiguring for another +architecture. + +Installation Names +================== + + By default, `make install' will install the package's files in +`/usr/local/bin', `/usr/local/man', etc. You can specify an +installation prefix other than `/usr/local' by giving `configure' the +option `--prefix=PATH'. + + You can specify separate installation prefixes for +architecture-specific files and architecture-independent files. If you +give `configure' the option `--exec-prefix=PATH', the package will use +PATH as the prefix for installing programs and libraries. +Documentation and other data files will still use the regular prefix. + + In addition, if you use an unusual directory layout you can give +options like `--bindir=PATH' to specify different values for particular +kinds of files. Run `configure --help' for a list of the directories +you can set and what kinds of files go in them. + + If the package supports it, you can cause programs to be installed +with an extra prefix or suffix on their names by giving `configure' the +option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. + +Optional Features +================= + + Some packages pay attention to `--enable-FEATURE' options to +`configure', where FEATURE indicates an optional part of the package. +They may also pay attention to `--with-PACKAGE' options, where PACKAGE +is something like `gnu-as' or `x' (for the X Window System). The +`README' should mention any `--enable-' and `--with-' options that the +package recognizes. + + For packages that use the X Window System, `configure' can usually +find the X include and library files automatically, but if it doesn't, +you can use the `configure' options `--x-includes=DIR' and +`--x-libraries=DIR' to specify their locations. + +Specifying the System Type +========================== + + There may be some features `configure' can not figure out +automatically, but needs to determine by the type of host the package +will run on. Usually `configure' can figure that out, but if it prints +a message saying it can not guess the host type, give it the +`--host=TYPE' option. TYPE can either be a short name for the system +type, such as `sun4', or a canonical name with three fields: + CPU-COMPANY-SYSTEM + +See the file `config.sub' for the possible values of each field. If +`config.sub' isn't included in this package, then this package doesn't +need to know the host type. + + If you are building compiler tools for cross-compiling, you can also +use the `--target=TYPE' option to select the type of system they will +produce code for and the `--build=TYPE' option to select the type of +system on which you are compiling the package. + +Sharing Defaults +================ + + If you want to set default values for `configure' scripts to share, +you can create a site shell script called `config.site' that gives +default values for variables like `CC', `cache_file', and `prefix'. +`configure' looks for `PREFIX/share/config.site' if it exists, then +`PREFIX/etc/config.site' if it exists. Or, you can set the +`CONFIG_SITE' environment variable to the location of the site script. +A warning: not all `configure' scripts look for a site script. + +Operation Controls +================== + + `configure' recognizes the following options to control how it +operates. + +`--cache-file=FILE' + Use and save the results of the tests in FILE instead of + `./config.cache'. Set FILE to `/dev/null' to disable caching, for + debugging `configure'. + +`--help' + Print a summary of the options to `configure', and exit. + +`--quiet' +`--silent' +`-q' + Do not print messages saying which checks are being made. To + suppress all normal output, redirect it to `/dev/null' (any error + messages will still be shown). + +`--srcdir=DIR' + Look for the package's source code in directory DIR. Usually + `configure' can determine that directory automatically. + +`--version' + Print the version of Autoconf used to generate the `configure' + script, and exit. + +`configure' also accepts some other, not widely useful, options. diff --git a/Makefile.am b/Makefile.am index c7464d4a..77269821 100644 --- a/Makefile.am +++ b/Makefile.am @@ -6,14 +6,8 @@ changelog:: -tools/cvs2cl/cvs2cl.pl -b --utc -rm -f ChangeLog.bak -## to automatically rebuild aclocal.m4 if any of the macros in -## `macros/' change -#@MAINT@include macros/macros.dep -#@MAINT@macros/macros.dep: macros/Makefile.am -#@MAINT@ cd macros && $(MAKE) macros.dep - EXTRA_DIST = \ ChangeLog \ djgpp.bat djgpp.sh \ autogen.sh cygconf \ -cvshowto.txt readme.txt license.txt thinking.txt +cvshowto.txt readme.txt license.txt thinking.txt installation.txt mingw32.txt diff --git a/installation.txt b/installation.txt new file mode 100644 index 00000000..27185a7c --- /dev/null +++ b/installation.txt @@ -0,0 +1,20 @@ +Firstly, compile d2x. + +Then stick it in a directory with these files from a Descent 2 +Registered Installation (the version _does not_ matter). Shareware may +work if you hack at the shareware build system, but I haven't even +attempted it. + +I needed these files: (in addition to the d2x binary) +alien1.pig +alien2.pig +descent2.ham +descent2.hog +descent2.s11 +descent2.s22 +fire.pig +groupa.pig +ice.pig +water.pig + +Note the filenames must be in _lower case_. It's important. -- 2.39.2 From 8f41478699b0bb3a6d4bb7e0cedb9f088274a59f Mon Sep 17 00:00:00 2001 From: Bradley Bell Date: Sat, 13 Oct 2001 02:37:51 +0000 Subject: [PATCH 08/16] Added instructions for mingw32 build --- cygconf | 1 - 1 file changed, 1 deletion(-) diff --git a/cygconf b/cygconf index 77119466..1426cd7d 100644 --- a/cygconf +++ b/cygconf @@ -1,2 +1 @@ export ACLOCAL_FLAGS="-I /usr/local/cross-tools/i386-mingw32msvc/share/aclocal" -export PATH=$PATH:/usr/local/cross-tools/i386-mingw32msvc/bin -- 2.39.2 From 2af7899f14dbfbf548b74817bb1853d0eea045c2 Mon Sep 17 00:00:00 2001 From: Bradley Bell Date: Sat, 13 Oct 2001 02:59:01 +0000 Subject: [PATCH 09/16] removing auto-generated file --- ChangeLog | 754 ------------------------------------------------------ 1 file changed, 754 deletions(-) delete mode 100644 ChangeLog diff --git a/ChangeLog b/ChangeLog deleted file mode 100644 index fa68d88f..00000000 --- a/ChangeLog +++ /dev/null @@ -1,754 +0,0 @@ -2001-01-24 11:21 bradleyb - - * INSTALL, NEWS, README, cvshowto.txt: updated documentation - -2001-01-24 11:20 bradleyb - - * tools/: Makefile.am, cvs2cl/Makefile.am, cvs2cl/cvs2cl.pl: cvs2cl - for building ChangeLog from RCS entries - -2001-01-24 11:11 bradleyb - - * Makefile.am, acconfig.h, autogen.sh, conf.h.in, configure.in, - arch/dos/allg_snd/Makefile.am, arch/dos/allg_snd/sound/Makefile.am, - arch/dos/allg_snd/sound/drv/Makefile.am, arch/dos/bak/Makefile.am, - arch/dos/comm/Makefile.am, arch/dos/comm/include/Makefile.am, - arch/dos/include/Makefile.am, 2d/Makefile.am, 3d/Makefile.am, - arch/Makefile.am, arch/dos/Makefile.am, - arch/dos/mm_snd/Makefile.am, arch/dos/mm_snd/include/Makefile.am, - arch/linux/Makefile.am, arch/linux/include/Makefile.am, - arch/linux/svgalib/Makefile.am, - arch/linux/svgalib/include/Makefile.am, arch/ogl/Makefile.am, - arch/ogl/include/Makefile.am, arch/sdl/Makefile.am, - arch/win32/Makefile.am, arch/win32/d3dframe/Makefile.am, - arch/win32/include/Makefile.am, cfile/Makefile.am, iff/Makefile.am, - iff/archive/Makefile.am, includes/Makefile.am, input/Makefile.am, - input/ggi/Makefile.am, input/ggi/include/Makefile.am, - input/linux/Makefile.am, input/linux/include/Makefile.am, - input/sdl/Makefile.am, input/sdl/include/Makefile.am, - input/svgalib/Makefile.am, input/svgalib/include/Makefile.am, - main/editor/Makefile.am, main/old/Makefile.am, unused/Makefile.am, - unused/bios/Makefile.am, unused/lib/Makefile.am, - unused/novga/Makefile.am, unused/pa_null/Makefile.am, - unused/ui/Makefile.am, unused/vga/Makefile.am, - unused/vga/new/Makefile.am, unused/win95/Makefile.am, - main/Makefile.am, maths/Makefile.am, misc/Makefile.am, - sound/Makefile.am, texmap/Makefile.am, video/Makefile.am: improved - automake config. make dist, VPATH builds, ... - -2001-01-24 11:05 bradleyb - - * configure, Makefile.in, stamp-h.in, 2d/Makefile.in, - 3d/Makefile.in, arch/Makefile.in, arch/dos/Makefile.in, - arch/linux/Makefile.in, arch/sdl/Makefile.in, cfile/Makefile.in, - iff/Makefile.in, input/Makefile.in, input/ggi/Makefile.in, - input/linux/Makefile.in, input/sdl/Makefile.in, main/Makefile.in, - maths/Makefile.in, mem/Makefile.in, misc/Makefile.in, - sound/Makefile.in, texmap/Makefile.in, video/Makefile.in: cruft - removal - -2001-01-24 10:48 bradleyb - - * 2d/diff, arch/dos/sgrep.out, arch/linux/stHqFIq1, main/test.txt: - junk removal - -2001-01-24 10:47 bradleyb - - * libtool, ltconfig, ltmain.sh: cruft removal - -2001-01-24 05:43 bradleyb - - * ChangeLog, NEWS: moved old ChangeLog to NEWS - -2001-01-24 05:35 bradleyb - - * configure.in, conf.h.in: moved NDEBUG to conf.h.in - -2001-01-24 04:42 bradleyb - - * main/: game.c, kconfig.c, text.c: changed args_find to FindArg - -2001-01-24 04:38 bradleyb - - * main/: gamecntl.c, inferno.c: changed args_find to FindArg, added - -grabmouse option - -2001-01-24 04:29 bradleyb - - * arch/dos_init.c, arch/linux_init.c, arch/linux_ipx_udp.c, - arch/linux_net.c, arch/sdl_init.c, arch/dos/init.c, - arch/dos/joyc.c, arch/linux/init.c, arch/linux/ipx_udp.c, - arch/linux/linuxnet.c, arch/sdl/init.c, includes/args.h, - input/dos_joyc.c, input/svgalib_init.c, main/config.c, main/hud.c, - main/menu.c, main/multi.c, main/network.c, main/piggy.c, - main/polyobj.c, main/slew.c, main/songs.c, misc/args.c, - sound/sdl_cdrom.c, video/ogl_gr.c, video/sdl_gr.c: changed - args_find to FindArg - -2001-01-22 15:50 bradleyb - - * configure, main/Makefile.am, main/Makefile.in, video/Makefile.am, - video/Makefile.in, video/ogl_gr.c: configuration fixes - -2001-01-22 15:49 bradleyb - - * includes/error.h, includes/mono.h, main/game.c, main/gamerend.c, - video/ogl.c: fix compiler warnings w/opengl - -2001-01-22 15:45 bradleyb - - * includes/console.h: ggi support - -2001-01-22 15:42 bradleyb - - * input/ggi_event.c, input/ggi_init.c, input/ggi_key.c, - input/ggi_mouse.c, input/ggi/include/key.h, video/ggi_gr.c: ggi - support - -2001-01-22 14:58 bradleyb - - * arch/linux_init.c, input/svgalib_init.c: svgalib support - -2001-01-22 13:39 bradleyb - - * Makefile.in, conf.h.in, configure, configure.in, 2d/Makefile.am, - 2d/Makefile.in, 3d/Makefile.in, arch/Makefile.am, arch/Makefile.in, - arch/svgalib_init.c, cfile/Makefile.in, iff/Makefile.in, - input/Makefile.am, input/Makefile.in, main/Makefile.am, - main/Makefile.in, maths/Makefile.am, maths/Makefile.in, - mem/Makefile.in, misc/Makefile.in, sound/Makefile.in, - texmap/Makefile.am, texmap/Makefile.in, video/Makefile.am, - video/Makefile.in: configuration fixes - -2001-01-22 13:38 bradleyb - - * input/svgalib_init.c: svgalib support - -2001-01-22 13:37 bradleyb - - * iff/iff.c, includes/u_mem.h: NDEBUG fixes - -2001-01-22 13:22 bradleyb - - * main/: ai.h, inferno.c, lighting.c, object.c, render.c: fix - warnings and enable NDEBUG - -2001-01-22 13:04 bradleyb - - * input/Makefile.am: svgalib support - -2001-01-22 13:00 bradleyb - - * input/svgalib/include/: event.h, key.h, mouse.h: svgalib support - -2001-01-22 12:54 bradleyb - - * ChangeLog: joystick support - -2001-01-22 12:51 bradleyb - - * arch/svgalib_init.c, input/svgalib_event.c, input/svgalib_key.c, - input/svgalib_mouse.c, video/svgalib_gr.c: svgalib support - -2001-01-22 12:45 bradleyb - - * input/linux_joystick.c: joystick support - -2001-01-22 12:27 bradleyb - - * input/linux/joystick.c, input/linux/include/joy.h, - main/kconfig.c: joystick support - -2001-01-21 14:59 bradleyb - - * cvshowto.txt: new file, taken from d1x webpage - -2001-01-21 14:58 bradleyb - - * AUTHORS, README: Taking over as maintainer of d2x - -2001-01-21 14:57 bradleyb - - * ChangeLog: Grab mouse with SDL/X11 - -2001-01-21 14:49 bradleyb - - * main/: gamecntl.c, inferno.c: Grab mouse with SDL/X11 - -2001-01-20 13:56 bradleyb - - * configure, configure.in: Turned -Werror back off by default - -2001-01-20 13:49 bradleyb - - * README, configure, configure.in, 2d/font.c, arch/sdl_init.c, - iff/iff.c, includes/3d.h, includes/d_io.h, - input/linux/include/joy.h, input/sdl/include/key.h, - main/Makefile.am, main/Makefile.in, main/bm.c, main/collide.c, - main/credits.c, main/fuelcen.h, main/game.c, main/gamecntl.c, - main/gamepal.c, main/gamerend.c, main/gamesave.c, main/gameseg.c, - main/gameseq.c, main/gauges.c, main/kconfig.c, main/kludge.c, - main/kmatrix.c, main/laser.c, main/multi.c, main/network.c, - main/network.h, main/newdemo.c, main/newmenu.c, main/object.c, - main/object.h, main/physics.c, main/piggy.c, main/polyobj.c, - main/state.c, main/switch.c, main/titles.c, main/wall.c: Got rid of - all compiler warnings, for non-OpenGL on linux, anyway... - -2001-01-19 04:21 bradleyb - - * copying: remove duplicate file - -2001-01-19 03:33 bradleyb - - * copying, djgpp.bat, djgpp.sh, video/dos_gr.c, input/dos_joy2.asm, - input/dos_joyc.c, input/dos_joydefs.c, input/dos_key.c, - input/dos_mouse.c, input/ggi_event.c, input/ggi_init.c, - input/ggi_key.c, input/ggi_mouse.c, input/linux_joydefs.c, - input/linux_joystick.c, input/sdl_event.c, input/sdl_key.c, - input/sdl_mouse.c, maths/cvs/Entries, maths/cvs/Repository, - maths/cvs/Root, main/link.bat, misc/dos_disk.h, arch/dos_dpmi.c, - arch/dos_findfile.c, arch/dos_init.c, arch/dos_ipx.c, - arch/dos_modex.asm, arch/dos_timer.asm, arch/dos_tweak.inc, - arch/dos_vesa.c, arch/dos_vgaregs.inc, arch/linux_findfile.c, - arch/linux_init.c, arch/linux_ipx_bsd.c, arch/linux_ipx_lin.c, - arch/linux_ipx_udp.c, arch/linux_net.c, arch/sdl_init.c, - arch/sdl_timer.c, arch/dos/Makefile.am, arch/dos/Makefile.in, - arch/dos/cdrom.c, arch/dos/digi.c, arch/dos/findfile.c, - sound/dos_cdrom.c, sound/dos_digi.c: Initial revision - -2001-01-19 03:33 bradleyb - - * conf.h.in, README, configure, configure.in, copying, djgpp.bat, - djgpp.sh, readme.txt, 2d/canvas.c, 2d/diff, 2d/line.c, - 2d/2dsline.c, 2d/bitblt.c, 2d/box.c, 2d/gpixel.c, 2d/linear.h, - 2d/pixel.c, maths/vecmat.c, video/Makefile.am, video/Makefile.in, - video/dos_gr.c, input/Makefile.am, input/Makefile.in, - input/dos_joy2.asm, input/dos_joyc.c, input/dos_joydefs.c, - input/dos_key.c, input/dos_mouse.c, input/ggi_event.c, - input/ggi_init.c, input/ggi_key.c, input/ggi_mouse.c, - input/linux_joydefs.c, input/linux_joystick.c, input/sdl_event.c, - input/sdl_key.c, input/sdl_mouse.c, input/ggi/Makefile.in, - input/linux/Makefile.in, input/sdl/Makefile.in, main/digi.h, - main/kconfig.c, maths/cvs/Entries, maths/cvs/Repository, - maths/cvs/Root, main/Makefile.am, main/console.c, main/inferno.c, - main/kludge.c, main/multi.c, main/inferno.ini, main/network.c, - main/config.c, main/gamerend.c, main/Makefile.in, main/link.bat, - misc/d_io.c, misc/dos_disk.h, misc/strutil.c, unused/bios/dd.bat, - unused/bios/mouse.asm, unused/bios/d.bat, unused/bios/joy.asm, - unused/bios/key.asm, unused/bios/keys.inc, - unused/bios/make0000.bat, unused/bios/make0001.bat, - unused/bios/make0100.bat, unused/bios/oldkey.asm, - unused/bios/rbaudio.new, unused/bios/testk.lnk, - unused/bios/testm.lnk, unused/bios/timer.asm, unused/bios/x, - unused/bios/x.bat, unused/bios/y.bat, unused/win95/dd.bat, - arch/Makefile.am, arch/Makefile.in, arch/dos_dpmi.c, - arch/dos_findfile.c, arch/dos_init.c, arch/dos_ipx.c, - arch/dos_modex.asm, arch/dos_timer.asm, arch/dos_tweak.inc, - arch/dos_vesa.c, arch/dos_vgaregs.inc, arch/linux_findfile.c, - arch/linux_init.c, arch/linux_ipx_bsd.c, arch/linux_ipx_lin.c, - arch/linux_ipx_udp.c, unused/vga/dd.bat, unused/vga/framebuf.jas, - unused/vga/modex.asm, unused/vga/tweak.inc, unused/vga/vesa.asm, - unused/vga/vga.jas, unused/vga/vgaregs.inc, unused/vga/xyz.bat, - unused/win95/winckpit.asm, arch/linux_net.c, arch/sdl_init.c, - arch/sdl_timer.c, arch/dos/Makefile.am, arch/dos/Makefile.in, - arch/dos/cdrom.c, arch/dos/digi.c, arch/dos/disk.c, - arch/dos/dosgr.c, arch/dos/dpmi.c, arch/dos/findfile.c, - arch/dos/init.c, arch/dos/joyc.c, arch/dos/joydefs.c, - arch/dos/key.c, arch/dos/mouse.c, arch/dos/vesa.c, - arch/dos/include/joy.h, arch/dos/include/key.h, - arch/dos/include/mouse.h, arch/linux/Makefile.am, - arch/linux/findfile.c, arch/linux/ipx_lin.c, arch/linux/linuxnet.c, - arch/linux/init.c, arch/linux/ipx_bsd.c, arch/linux/ipx_udp.c, - arch/linux/Makefile.in, arch/sdl/Makefile.in, sound/Makefile.am, - sound/sdl_cdrom.c, sound/sdl_digi.c, includes/d.bat, - includes/d_io.h, includes/dtypes.inc, includes/gr.h, - includes/grdef.h, includes/lst.bat, includes/m.bat, - includes/psmacros.inc, includes/pstypes.h, includes/pstypes.inc, - includes/strutil.h, includes/test.lnk, includes/timer.h, - sound/Makefile.in, sound/dos_cdrom.c, sound/dos_digi.c: Import of - d2x-0.0.9-pre1 - -2001-01-19 03:29 bradleyb - - * AUTHORS, COPYING, Makefile.am, aclocal.m4, autogen.sh, conf.h.in, - config.sub, configure, ltconfig, readme.txt, stamp-h.in, ChangeLog, - INSTALL, Makefile.in, config.guess, configure.in, libtool, missing, - mkinstalldirs, NEWS, README, install-sh, ltmain.sh, thinking.txt, - 2d/Makefile.am, 2d/bitmap.h, 2d/canvas.c, 2d/disc.c, 2d/ibitblt.c, - 2d/line.c, 2d/tmerge_a.asm, 2d/bitblt.c, 2d/bitmap.c, 2d/box.c, - 2d/circle.c, 2d/clip.h, 2d/diff, 2d/font.c, 2d/linear.asm, - 2d/linear.h, 2d/pcx.c, 2d/pixel.c, 2d/poly.c, 2d/rle.c, 2d/scale.c, - 2d/scalea.asm, 2d/scalec.c, 2d/tmerge.c, 2d/2dsline.c, - 2d/Makefile.in, 2d/gpixel.c, 2d/palette.c, 2d/rect.c, 2d/scalea.h, - 3d/Makefile.am, 3d/Makefile.in, 3d/clipper.c, 3d/clipper.h, - 3d/draw.c, 3d/globvars.c, 3d/globvars.h, 3d/instance.c, - 3d/interp.asm, 3d/interp.c, 3d/matrix.c, 3d/points.c, 3d/rod.c, - 3d/setup.c, iff/Makefile.am, iff/Makefile.in, iff/iff.c, - iff/archive/iff15bpp.c, iff/archive/iff8bpp.c, - iff/archive/iffmike.c, iff/archive/ifftest.c, - iff/archive/ifftestv.c, input/Makefile.am, input/Makefile.in, - input/linux/Makefile.am, input/linux/Makefile.in, - input/linux/joystick.c, maths/Makefile.am, maths/Makefile.in, - maths/fix.asm, maths/fixc.c, maths/rand.c, maths/tables.c, - maths/vecmat.c, maths/vecmata.asm, mem/Makefile.am, - mem/Makefile.in, mem/mem.c, video/Makefile.am, video/Makefile.in, - video/ggi_gr.c, video/ogl.c, video/ogl_glx.c, video/ogl_gr.c, - video/ogl_wgl.c, video/sdl_gr.c, cfile/Makefile.am, - cfile/Makefile.in, cfile/cfile.c, cfile/nocfile.h, - input/ggi/Makefile.am, input/ggi/Makefile.in, input/ggi/event.c, - input/ggi/init.c, input/ggi/key.c, input/ggi/mouse.c, - input/ggi/include/event.h, input/ggi/include/key.h, - input/ggi/include/mouse.h, input/linux/joydefs.c, - input/linux/include/joy.h, input/linux/include/joystick.h, - input/sdl/Makefile.am, input/sdl/Makefile.in, input/sdl/event.c, - input/sdl/key.c, input/sdl/mouse.c, input/sdl/include/event.h, - input/sdl/include/key.h, input/sdl/include/mouse.h, - main/Makefile.am, main/bm.h, main/cdrom.h, main/cntrlcen.c, - main/collide.h, main/compbit.h, main/config.h, main/console.c, - main/controls.h, main/desc_id.h, main/digi.h, main/fuelcen.c, - main/fvi.h, main/game.h, main/gamepal.h, main/gamesave.c, - main/gamesave.h, main/gameseq.h, main/hostage.c, main/kconfig.c, - main/kconfig.h, main/kmatrix.c, main/menu.c, main/mglobal.c, - main/mission.h, main/object.h, main/paging.c, main/paging.h, - main/playsave.h, main/robot.h, main/slew.h, main/switch.h, - main/text.h, main/vclip.c, main/weapon.c, main/automap.h, - main/collide.c, main/descent.cfg, main/dumpmine.c, main/effects.c, - main/escort.c, main/fireball.h, main/gamemine.h, main/gamepal.c, - main/gauges.c, main/hostage.h, main/hud.c, main/inferno.c, - main/kludge.c, main/lighting.c, main/morph.h, main/movie.h, - main/object.c, main/physics.h, main/polyobj.h, main/screens.h, - main/segment.h, main/songs.h, main/sounds.h, main/state.c, - main/state.h, main/terrain.h, main/test.txt, main/textures.h, - main/wall.c, main/wall.h, main/ai2.c, main/aistruct.h, main/bm.c, - main/bmread.c, main/bmread.h, main/cmd.c, main/controls.c, - main/crypt.c, main/endlevel.c, main/endlevel.h, main/fireball.c, - main/fvi.c, main/fvi_a.h, main/game.c, main/gamemine.c, - main/gameseg.c, main/gameseg.h, main/gauges.h, main/inferno.ini, - main/lighting.h, main/menu.h, main/modem.h, main/multi.c, - main/multibot.h, main/netmisc.c, main/netmisc.h, main/newdemo.c, - main/newmenu.c, main/physics.c, main/piggy.h, main/player.h, - main/polyobj.c, main/render.c, main/scores.c, main/segpoint.h, - main/slew.c, main/switch.c, main/texmerge.h, main/text.c, - main/titles.c, main/titles.h, main/weapon.h, main/ai.c, - main/automap.c, main/cntrlcen.h, main/config.c, main/credits.h, - main/desw.h, main/gamecntl.c, main/gamerend.c, main/gamestat.h, - main/inferno.h, main/joydefs.h, main/laser.c, main/laser.h, - main/morph.c, main/multi.h, main/network.c, main/piggy.c, - main/playsave.c, main/powerup.c, main/scores.h, main/vclip.h, - main/Makefile.in, main/credits.c, main/fuelcen.h, main/gamefont.c, - main/multibot.c, main/newmenu.h, main/render.h, main/songs.c, - main/ai.h, main/aipath.c, main/effects.h, main/gamefont.h, - main/gameseq.c, main/kmatrix.h, main/mission.c, main/network.h, - main/newdemo.h, main/powerup.h, main/robot.c, main/texmerge.c, - main/vers_id.h, main/editor/editor.h, main/editor/kdefs.h, - main/editor/texpage.h, main/old/coindev.c, main/old/modem.c, - main/old/settings.h, main/old/3dfx.c, main/old/3dfx_des.h, - main/old/arcade.h, main/old/cdmix32.c, main/old/cdrom.c, - main/old/coindev.h, main/old/descentw.c, main/old/digiobj.c, - main/old/files.h, main/old/iglasses.c, main/old/iglasses.h, - main/old/joydefs.c, main/old/joydefsw.c, main/old/movie.c, - main/old/newmodel.c, main/old/rbtest.c, main/old/terrain.c, - main/old/windigi.c, main/old/winferno.c, main/old/winmodem.c, - main/old/winvideo.c, misc/Makefile.am, misc/Makefile.in, - misc/args.c, misc/byteswap.c, misc/byteswap.h, misc/d_delay.c, - misc/d_glob.c, misc/d_io.c, misc/error.c, misc/errtest.c, - misc/fileutil.c, misc/fileutil.h, misc/hash.c, misc/parsarg.c, - misc/parsarg.h, misc/parstest.c, misc/strio.c, misc/strutil.c, - unused/readme.txt, unused/bios/d.bat, unused/bios/dd.bat, - unused/bios/dpmi.c, unused/bios/dpmi.h, unused/bios/error.c, - unused/bios/error.h, unused/bios/findfile.c, - unused/bios/findfile.h, unused/bios/ipx.c, unused/bios/ipx.h, - unused/bios/joy.asm, unused/bios/joy.h, unused/bios/joyc.c, - unused/bios/key.asm, unused/bios/key.c, unused/bios/key.h, - unused/bios/keys.inc, unused/bios/make0000.bat, - unused/bios/make0001.bat, unused/bios/make0100.bat, - unused/bios/mono.c, unused/bios/mouse.asm, unused/bios/mouse.c, - unused/bios/mouse.h, unused/bios/oldkey.asm, unused/bios/rbaudio.c, - unused/bios/rbaudio.h, unused/bios/rbaudio.new, - unused/bios/speaker.c, unused/bios/swiftcfg.h, unused/bios/testj.c, - unused/bios/testk.c, unused/bios/testk.lnk, unused/bios/testm.c, - unused/bios/testm.lnk, unused/bios/testms.c, unused/bios/testt.c, - unused/bios/timer.asm, unused/bios/timer.h, unused/bios/timerp.c, - unused/bios/x, unused/bios/x.bat, unused/bios/x.c, - unused/bios/y.bat, unused/pa_null/pa_enabl.h, - unused/pa_null/poly_acc.c, unused/pa_null/poly_acc.h, - unused/ui/gadget.c, unused/ui/icon.c, unused/ui/keypress.c, - unused/ui/keytrap.c, unused/ui/listbox.c, unused/ui/medfunc.c, - unused/ui/menu.c, unused/ui/menubar.c, unused/ui/message.c, - unused/ui/mouse.c, unused/ui/number.c, unused/ui/popup.c, - unused/ui/radio.c, unused/ui/scroll.c, unused/ui/ui.h, - arch/Makefile.am, arch/Makefile.in, arch/dos/bcd.c, - arch/dos/digiallg.c, arch/dos/digimm.c, arch/dos/disk.c, - arch/dos/dosgr.c, arch/dos/dpmi.c, arch/dos/init.c, arch/dos/ipx.c, - arch/dos/ipx.h, arch/dos/joy2.asm, arch/dos/joyc.c, - arch/dos/joydefs.c, arch/dos/key.c, arch/dos/midiallg.c, - arch/dos/modex.asm, arch/dos/mono.c, arch/dos/mono.h, - arch/dos/mouse.c, arch/dos/serial.c, arch/dos/sgrep.out, - arch/dos/timer.asm, arch/dos/tweak.inc, arch/dos/vesa.c, - arch/dos/vgaregs.inc, arch/dos/allg_snd/allg_snd.c, - arch/dos/allg_snd/internal.h, arch/dos/allg_snd/sound/allegro.h, - arch/dos/allg_snd/sound/config.c, arch/dos/allg_snd/sound/digmid.c, - arch/dos/allg_snd/sound/interndj.h, arch/dos/allg_snd/sound/midi.c, - arch/dos/allg_snd/sound/mixer.c, arch/dos/allg_snd/sound/readme.d1, - arch/dos/allg_snd/sound/readme.txt, - arch/dos/allg_snd/sound/snddrv.c, arch/dos/allg_snd/sound/sound.c, - arch/dos/allg_snd/sound/drv/adlib.c, - arch/dos/allg_snd/sound/drv/awedata.c, - arch/dos/allg_snd/sound/drv/dma.c, - arch/dos/allg_snd/sound/drv/emu8k.c, - arch/dos/allg_snd/sound/drv/emu8k.h, - arch/dos/allg_snd/sound/drv/emu8kmid.c, - arch/dos/allg_snd/sound/drv/fm_instr.h, - arch/dos/allg_snd/sound/drv/gus.c, - arch/dos/allg_snd/sound/drv/mpu.c, - arch/dos/allg_snd/sound/drv/sb.c, arch/dos/bak/ipx.c, - arch/dos/comm/commlib.c, arch/dos/comm/dzcomm.c, - arch/dos/comm/dzqueue.c, arch/dos/comm/irq.c, - arch/dos/comm/irqwrap.S, arch/dos/comm/include/allegro.h, - arch/dos/comm/include/asmdef.inc, - arch/dos/comm/include/asmdefs.inc, arch/dos/comm/include/commlib.h, - arch/dos/comm/include/internal.h, arch/dos/include/commlib.h, - arch/dos/include/disk.h, arch/dos/include/dzcomm.h, - arch/dos/include/joy.h, arch/dos/include/key.h, - arch/dos/include/midiallg.h, arch/dos/include/mouse.h, - arch/dos/include/serial.h, arch/dos/mm_snd/drv_sb.c, - arch/dos/mm_snd/mdma.c, arch/dos/mm_snd/mirq.c, - arch/dos/mm_snd/readme.txt, arch/dos/mm_snd/include/mdma.h, - arch/dos/mm_snd/include/mikmod.h, arch/dos/mm_snd/include/mirq.h, - arch/dos/mm_snd/include/mm_drv.h, arch/dos/mm_snd/include/mmio.h, - arch/dos/mm_snd/include/mtypes.h, arch/linux/Makefile.am, - arch/linux/Makefile.in, arch/linux/alsadigi.c, - arch/linux/findfile.c, arch/linux/hmiplay.c, arch/linux/hmistub.c, - arch/linux/init.c, arch/linux/ipx_bsd.c, arch/linux/ipx_kali.c, - arch/linux/ipx_lin.c, arch/linux/ipx_udp.c, arch/linux/linuxnet.c, - arch/linux/mono.c, arch/linux/serial.c, arch/linux/stHqFIq1, - arch/linux/timer.c, arch/linux/ukali.c, - arch/linux/include/ipx_bsd.h, arch/linux/include/ipx_drv.h, - arch/linux/include/ipx_hlpr.h, arch/linux/include/ipx_kali.h, - arch/linux/include/ipx_ld.h, arch/linux/include/ipx_lin.h, - arch/linux/include/ipx_udp.h, arch/linux/include/music.h, - arch/linux/include/serial.h, arch/linux/include/ukali.h, - arch/linux/svgalib/event.c, arch/linux/svgalib/gr.c, - arch/linux/svgalib/init.c, arch/linux/svgalib/key.c, - arch/linux/svgalib/mouse.c, arch/linux/svgalib/include/event.h, - arch/linux/svgalib/include/key.h, - arch/linux/svgalib/include/mouse.h, arch/ogl/include/loadgl.h, - arch/ogl/include/ogl_init.h, arch/sdl/Makefile.am, arch/sdl/init.c, - arch/sdl/timer.c, arch/win32/d1x.ico, arch/win32/d1x.rc, - arch/win32/d3d.ico, arch/win32/debug.cpp, arch/win32/descent.ico, - arch/win32/digi.c, arch/win32/glinit.c, arch/win32/gr.c, - arch/win32/hmpfile.c, arch/win32/init.c, arch/win32/ipx_drv.h, - arch/win32/ipx_win.c, arch/win32/joydefs.c, arch/win32/joyhh.c, - arch/win32/key.c, arch/win32/mono.c, arch/win32/mouse.c, - arch/win32/palw32.c, arch/win32/pch.cpp, arch/win32/scene.cpp, - arch/win32/serial.c, arch/win32/texture.cpp, arch/win32/timer.c, - arch/win32/win32.c, arch/win32/winmain.cpp, arch/win32/winnet.c, - arch/win32/d3dframe/d3denum.cpp, arch/win32/d3dframe/d3denum.h, - arch/win32/d3dframe/d3dframe.cpp, arch/win32/d3dframe/d3dframe.h, - arch/win32/d3dframe/d3dmath.cpp, arch/win32/d3dframe/d3dmath.h, - arch/win32/d3dframe/d3dtextr.cpp, arch/win32/d3dframe/d3dtextr.h, - arch/win32/d3dframe/d3dutil.cpp, arch/win32/d3dframe/d3dutil.h, - arch/win32/d3dframe/ddenum.cpp, arch/win32/d3dframe/ddmm.h, - arch/win32/d3dframe/ddutil.h, arch/win32/d3dframe/ddutil2.h, - arch/win32/d3dframe/dsutil.h, arch/win32/d3dframe/lbprintf.h, - arch/win32/d3dframe/resource.h, arch/win32/d3dframe/userdlg.cpp, - arch/win32/include/d3dhelp.h, arch/win32/include/debug.h, - arch/win32/include/hmpfile.h, arch/win32/include/joy.h, - arch/win32/include/key.h, arch/win32/include/mouse.h, - arch/win32/include/pch.h, arch/win32/include/resource.h, - arch/win32/include/scene.h, arch/win32/include/serial.h, - arch/win32/include/texture.h, arch/win32/include/winmain.h, - arch/win32/include/wsipx.h, unused/lib/fix.h, unused/lib/rbaudio.h, - unused/novga/files.rc, unused/novga/novesa.c, unused/ui/barbox.c, - unused/ui/button.c, unused/ui/checkbox.c, unused/ui/file.c, - unused/ui/func.c, unused/ui/func.h, unused/ui/harderr.c, - unused/ui/inputbox.c, unused/ui/keypad.c, unused/ui/ui.c, - unused/ui/uidraw.c, unused/ui/userbox.c, unused/ui/window.c, - unused/vga/dd.bat, unused/vga/framebuf.c, unused/vga/framebuf.jas, - unused/vga/fxdpmi.h, unused/vga/fxvesa.h, unused/vga/grx.h, - unused/vga/modex.asm, unused/vga/palette.c, unused/vga/tweak.inc, - unused/vga/vesa.asm, unused/vga/vga.c, unused/vga/vga.h, - unused/vga/vga.jas, unused/vga/vgaregs.inc, unused/vga/xyz.bat, - unused/vga/new/palette.c, unused/vga/new/vga.c, - unused/win95/comm.c, unused/win95/comm.h, unused/win95/dd.bat, - unused/win95/dd.c, unused/win95/dd.h, unused/win95/ddgfx.c, - unused/win95/ddgr.c, unused/win95/ddraw.c, unused/win95/direct3d.c, - unused/win95/direct3d.h, unused/win95/ds.c, unused/win95/ds.h, - unused/win95/error.c, unused/win95/error.h, - unused/win95/findfile.c, unused/win95/gfx.c, unused/win95/global.h, - unused/win95/iforce.c, unused/win95/iforce.h, unused/win95/ipx.c, - unused/win95/joyc.c, unused/win95/key.c, unused/win95/midifile.h, - unused/win95/midiseq.h, unused/win95/mono.c, unused/win95/mouse.c, - unused/win95/palette.c, unused/win95/rbaudio.c, - unused/win95/swift.c, unused/win95/tactile.c, - unused/win95/tactile.h, unused/win95/timer.c, - unused/win95/winapp.c, unused/win95/winapp.h, - unused/win95/winckpit.asm, unused/win95/winmidi.c, - unused/win95/winmidi.h, unused/win95/winmono.c, - unused/win95/winregs.c, unused/win95/winregs.h, - unused/win95/xtapi.c, unused/win95/xtapi.h, arch/sdl/Makefile.in, - includes/3d.h, includes/args.h, includes/byteswap.h, - includes/cfile.h, includes/checker.h, includes/cmd.h, - includes/console.h, includes/d.bat, includes/d_delay.h, - includes/d_io.h, includes/dtypes.h, includes/dtypes.inc, - includes/error.h, includes/findfile.h, includes/fix.h, - includes/gr.h, includes/grdef.h, includes/hash.h, - includes/ibitblt.h, includes/iff.h, includes/ipx.h, - includes/loadgl.h, includes/lst.bat, includes/m.bat, - includes/maths.h, includes/modex.h, includes/mono.h, - includes/ogl_init.h, includes/pa_enabl.h, includes/palette.h, - includes/pcx.h, includes/psmacros.inc, includes/pstypes.h, - includes/pstypes.inc, includes/rle.h, includes/strio.h, - includes/strutil.h, includes/test.c, includes/test.lnk, - includes/texmap.h, includes/timer.h, includes/u_dpmi.h, - includes/u_mem.h, includes/vecmat.h, includes/vesa.h, - sound/Makefile.am, sound/Makefile.in, sound/sdl_cdrom.c, - sound/sdl_digi.c, texmap/Makefile.am, texmap/Makefile.in, - texmap/ntmap.c, texmap/scanline.c, texmap/scanline.h, - texmap/texmapl.h, texmap/tmap_flt.asm, texmap/tmap_inc.asm, - texmap/tmap_lin.asm, texmap/tmap_ll.asm, texmap/tmap_per.asm, - texmap/tmapfade.asm, texmap/tmapflat.c, texmap/tmappent.S, - texmap/tmapppro.S: Initial revision - -2001-01-19 03:29 bradleyb - - * AUTHORS, COPYING, Makefile.am, aclocal.m4, autogen.sh, conf.h.in, - config.sub, configure, ltconfig, readme.txt, stamp-h.in, ChangeLog, - INSTALL, Makefile.in, config.guess, configure.in, libtool, missing, - mkinstalldirs, NEWS, README, install-sh, ltmain.sh, thinking.txt, - 2d/Makefile.am, 2d/bitmap.h, 2d/canvas.c, 2d/disc.c, 2d/ibitblt.c, - 2d/line.c, 2d/tmerge_a.asm, 2d/bitblt.c, 2d/bitmap.c, 2d/box.c, - 2d/circle.c, 2d/clip.h, 2d/diff, 2d/font.c, 2d/linear.asm, - 2d/linear.h, 2d/pcx.c, 2d/pixel.c, 2d/poly.c, 2d/rle.c, 2d/scale.c, - 2d/scalea.asm, 2d/scalec.c, 2d/tmerge.c, 2d/2dsline.c, - 2d/Makefile.in, 2d/gpixel.c, 2d/palette.c, 2d/rect.c, 2d/scalea.h, - 3d/Makefile.am, 3d/Makefile.in, 3d/clipper.c, 3d/clipper.h, - 3d/draw.c, 3d/globvars.c, 3d/globvars.h, 3d/instance.c, - 3d/interp.asm, 3d/interp.c, 3d/matrix.c, 3d/points.c, 3d/rod.c, - 3d/setup.c, iff/Makefile.am, iff/Makefile.in, iff/iff.c, - iff/archive/iff15bpp.c, iff/archive/iff8bpp.c, - iff/archive/iffmike.c, iff/archive/ifftest.c, - iff/archive/ifftestv.c, input/Makefile.am, input/Makefile.in, - input/linux/Makefile.am, input/linux/Makefile.in, - input/linux/joystick.c, maths/Makefile.am, maths/Makefile.in, - maths/fix.asm, maths/fixc.c, maths/rand.c, maths/tables.c, - maths/vecmat.c, maths/vecmata.asm, mem/Makefile.am, - mem/Makefile.in, mem/mem.c, video/Makefile.am, video/Makefile.in, - video/ggi_gr.c, video/ogl.c, video/ogl_glx.c, video/ogl_gr.c, - video/ogl_wgl.c, video/sdl_gr.c, cfile/Makefile.am, - cfile/Makefile.in, cfile/cfile.c, cfile/nocfile.h, - input/ggi/Makefile.am, input/ggi/Makefile.in, input/ggi/event.c, - input/ggi/init.c, input/ggi/key.c, input/ggi/mouse.c, - input/ggi/include/event.h, input/ggi/include/key.h, - input/ggi/include/mouse.h, input/linux/joydefs.c, - input/linux/include/joy.h, input/linux/include/joystick.h, - input/sdl/Makefile.am, input/sdl/Makefile.in, input/sdl/event.c, - input/sdl/key.c, input/sdl/mouse.c, input/sdl/include/event.h, - input/sdl/include/key.h, input/sdl/include/mouse.h, - main/Makefile.am, main/bm.h, main/cdrom.h, main/cntrlcen.c, - main/collide.h, main/compbit.h, main/config.h, main/console.c, - main/controls.h, main/desc_id.h, main/digi.h, main/fuelcen.c, - main/fvi.h, main/game.h, main/gamepal.h, main/gamesave.c, - main/gamesave.h, main/gameseq.h, main/hostage.c, main/kconfig.c, - main/kconfig.h, main/kmatrix.c, main/menu.c, main/mglobal.c, - main/mission.h, main/object.h, main/paging.c, main/paging.h, - main/playsave.h, main/robot.h, main/slew.h, main/switch.h, - main/text.h, main/vclip.c, main/weapon.c, main/automap.h, - main/collide.c, main/descent.cfg, main/dumpmine.c, main/effects.c, - main/escort.c, main/fireball.h, main/gamemine.h, main/gamepal.c, - main/gauges.c, main/hostage.h, main/hud.c, main/inferno.c, - main/kludge.c, main/lighting.c, main/morph.h, main/movie.h, - main/object.c, main/physics.h, main/polyobj.h, main/screens.h, - main/segment.h, main/songs.h, main/sounds.h, main/state.c, - main/state.h, main/terrain.h, main/test.txt, main/textures.h, - main/wall.c, main/wall.h, main/ai2.c, main/aistruct.h, main/bm.c, - main/bmread.c, main/bmread.h, main/cmd.c, main/controls.c, - main/crypt.c, main/endlevel.c, main/endlevel.h, main/fireball.c, - main/fvi.c, main/fvi_a.h, main/game.c, main/gamemine.c, - main/gameseg.c, main/gameseg.h, main/gauges.h, main/inferno.ini, - main/lighting.h, main/menu.h, main/modem.h, main/multi.c, - main/multibot.h, main/netmisc.c, main/netmisc.h, main/newdemo.c, - main/newmenu.c, main/physics.c, main/piggy.h, main/player.h, - main/polyobj.c, main/render.c, main/scores.c, main/segpoint.h, - main/slew.c, main/switch.c, main/texmerge.h, main/text.c, - main/titles.c, main/titles.h, main/weapon.h, main/ai.c, - main/automap.c, main/cntrlcen.h, main/config.c, main/credits.h, - main/desw.h, main/gamecntl.c, main/gamerend.c, main/gamestat.h, - main/inferno.h, main/joydefs.h, main/laser.c, main/laser.h, - main/morph.c, main/multi.h, main/network.c, main/piggy.c, - main/playsave.c, main/powerup.c, main/scores.h, main/vclip.h, - main/Makefile.in, main/credits.c, main/fuelcen.h, main/gamefont.c, - main/multibot.c, main/newmenu.h, main/render.h, main/songs.c, - main/ai.h, main/aipath.c, main/effects.h, main/gamefont.h, - main/gameseq.c, main/kmatrix.h, main/mission.c, main/network.h, - main/newdemo.h, main/powerup.h, main/robot.c, main/texmerge.c, - main/vers_id.h, main/editor/editor.h, main/editor/kdefs.h, - main/editor/texpage.h, main/old/coindev.c, main/old/modem.c, - main/old/settings.h, main/old/3dfx.c, main/old/3dfx_des.h, - main/old/arcade.h, main/old/cdmix32.c, main/old/cdrom.c, - main/old/coindev.h, main/old/descentw.c, main/old/digiobj.c, - main/old/files.h, main/old/iglasses.c, main/old/iglasses.h, - main/old/joydefs.c, main/old/joydefsw.c, main/old/movie.c, - main/old/newmodel.c, main/old/rbtest.c, main/old/terrain.c, - main/old/windigi.c, main/old/winferno.c, main/old/winmodem.c, - main/old/winvideo.c, misc/Makefile.am, misc/Makefile.in, - misc/args.c, misc/byteswap.c, misc/byteswap.h, misc/d_delay.c, - misc/d_glob.c, misc/d_io.c, misc/error.c, misc/errtest.c, - misc/fileutil.c, misc/fileutil.h, misc/hash.c, misc/parsarg.c, - misc/parsarg.h, misc/parstest.c, misc/strio.c, misc/strutil.c, - unused/readme.txt, unused/bios/d.bat, unused/bios/dd.bat, - unused/bios/dpmi.c, unused/bios/dpmi.h, unused/bios/error.c, - unused/bios/error.h, unused/bios/findfile.c, - unused/bios/findfile.h, unused/bios/ipx.c, unused/bios/ipx.h, - unused/bios/joy.asm, unused/bios/joy.h, unused/bios/joyc.c, - unused/bios/key.asm, unused/bios/key.c, unused/bios/key.h, - unused/bios/keys.inc, unused/bios/make0000.bat, - unused/bios/make0001.bat, unused/bios/make0100.bat, - unused/bios/mono.c, unused/bios/mouse.asm, unused/bios/mouse.c, - unused/bios/mouse.h, unused/bios/oldkey.asm, unused/bios/rbaudio.c, - unused/bios/rbaudio.h, unused/bios/rbaudio.new, - unused/bios/speaker.c, unused/bios/swiftcfg.h, unused/bios/testj.c, - unused/bios/testk.c, unused/bios/testk.lnk, unused/bios/testm.c, - unused/bios/testm.lnk, unused/bios/testms.c, unused/bios/testt.c, - unused/bios/timer.asm, unused/bios/timer.h, unused/bios/timerp.c, - unused/bios/x, unused/bios/x.bat, unused/bios/x.c, - unused/bios/y.bat, unused/pa_null/pa_enabl.h, - unused/pa_null/poly_acc.c, unused/pa_null/poly_acc.h, - unused/ui/gadget.c, unused/ui/icon.c, unused/ui/keypress.c, - unused/ui/keytrap.c, unused/ui/listbox.c, unused/ui/medfunc.c, - unused/ui/menu.c, unused/ui/menubar.c, unused/ui/message.c, - unused/ui/mouse.c, unused/ui/number.c, unused/ui/popup.c, - unused/ui/radio.c, unused/ui/scroll.c, unused/ui/ui.h, - arch/Makefile.am, arch/Makefile.in, arch/dos/bcd.c, - arch/dos/digiallg.c, arch/dos/digimm.c, arch/dos/disk.c, - arch/dos/dosgr.c, arch/dos/dpmi.c, arch/dos/init.c, arch/dos/ipx.c, - arch/dos/ipx.h, arch/dos/joy2.asm, arch/dos/joyc.c, - arch/dos/joydefs.c, arch/dos/key.c, arch/dos/midiallg.c, - arch/dos/modex.asm, arch/dos/mono.c, arch/dos/mono.h, - arch/dos/mouse.c, arch/dos/serial.c, arch/dos/sgrep.out, - arch/dos/timer.asm, arch/dos/tweak.inc, arch/dos/vesa.c, - arch/dos/vgaregs.inc, arch/dos/allg_snd/allg_snd.c, - arch/dos/allg_snd/internal.h, arch/dos/allg_snd/sound/allegro.h, - arch/dos/allg_snd/sound/config.c, arch/dos/allg_snd/sound/digmid.c, - arch/dos/allg_snd/sound/interndj.h, arch/dos/allg_snd/sound/midi.c, - arch/dos/allg_snd/sound/mixer.c, arch/dos/allg_snd/sound/readme.d1, - arch/dos/allg_snd/sound/readme.txt, - arch/dos/allg_snd/sound/snddrv.c, arch/dos/allg_snd/sound/sound.c, - arch/dos/allg_snd/sound/drv/adlib.c, - arch/dos/allg_snd/sound/drv/awedata.c, - arch/dos/allg_snd/sound/drv/dma.c, - arch/dos/allg_snd/sound/drv/emu8k.c, - arch/dos/allg_snd/sound/drv/emu8k.h, - arch/dos/allg_snd/sound/drv/emu8kmid.c, - arch/dos/allg_snd/sound/drv/fm_instr.h, - arch/dos/allg_snd/sound/drv/gus.c, - arch/dos/allg_snd/sound/drv/mpu.c, - arch/dos/allg_snd/sound/drv/sb.c, arch/dos/bak/ipx.c, - arch/dos/comm/commlib.c, arch/dos/comm/dzcomm.c, - arch/dos/comm/dzqueue.c, arch/dos/comm/irq.c, - arch/dos/comm/irqwrap.S, arch/dos/comm/include/allegro.h, - arch/dos/comm/include/asmdef.inc, - arch/dos/comm/include/asmdefs.inc, arch/dos/comm/include/commlib.h, - arch/dos/comm/include/internal.h, arch/dos/include/commlib.h, - arch/dos/include/disk.h, arch/dos/include/dzcomm.h, - arch/dos/include/joy.h, arch/dos/include/key.h, - arch/dos/include/midiallg.h, arch/dos/include/mouse.h, - arch/dos/include/serial.h, arch/dos/mm_snd/drv_sb.c, - arch/dos/mm_snd/mdma.c, arch/dos/mm_snd/mirq.c, - arch/dos/mm_snd/readme.txt, arch/dos/mm_snd/include/mdma.h, - arch/dos/mm_snd/include/mikmod.h, arch/dos/mm_snd/include/mirq.h, - arch/dos/mm_snd/include/mm_drv.h, arch/dos/mm_snd/include/mmio.h, - arch/dos/mm_snd/include/mtypes.h, arch/linux/Makefile.am, - arch/linux/Makefile.in, arch/linux/alsadigi.c, - arch/linux/findfile.c, arch/linux/hmiplay.c, arch/linux/hmistub.c, - arch/linux/init.c, arch/linux/ipx_bsd.c, arch/linux/ipx_kali.c, - arch/linux/ipx_lin.c, arch/linux/ipx_udp.c, arch/linux/linuxnet.c, - arch/linux/mono.c, arch/linux/serial.c, arch/linux/stHqFIq1, - arch/linux/timer.c, arch/linux/ukali.c, - arch/linux/include/ipx_bsd.h, arch/linux/include/ipx_drv.h, - arch/linux/include/ipx_hlpr.h, arch/linux/include/ipx_kali.h, - arch/linux/include/ipx_ld.h, arch/linux/include/ipx_lin.h, - arch/linux/include/ipx_udp.h, arch/linux/include/music.h, - arch/linux/include/serial.h, arch/linux/include/ukali.h, - arch/linux/svgalib/event.c, arch/linux/svgalib/gr.c, - arch/linux/svgalib/init.c, arch/linux/svgalib/key.c, - arch/linux/svgalib/mouse.c, arch/linux/svgalib/include/event.h, - arch/linux/svgalib/include/key.h, - arch/linux/svgalib/include/mouse.h, arch/ogl/include/loadgl.h, - arch/ogl/include/ogl_init.h, arch/sdl/Makefile.am, arch/sdl/init.c, - arch/sdl/timer.c, arch/win32/d1x.ico, arch/win32/d1x.rc, - arch/win32/d3d.ico, arch/win32/debug.cpp, arch/win32/descent.ico, - arch/win32/digi.c, arch/win32/glinit.c, arch/win32/gr.c, - arch/win32/hmpfile.c, arch/win32/init.c, arch/win32/ipx_drv.h, - arch/win32/ipx_win.c, arch/win32/joydefs.c, arch/win32/joyhh.c, - arch/win32/key.c, arch/win32/mono.c, arch/win32/mouse.c, - arch/win32/palw32.c, arch/win32/pch.cpp, arch/win32/scene.cpp, - arch/win32/serial.c, arch/win32/texture.cpp, arch/win32/timer.c, - arch/win32/win32.c, arch/win32/winmain.cpp, arch/win32/winnet.c, - arch/win32/d3dframe/d3denum.cpp, arch/win32/d3dframe/d3denum.h, - arch/win32/d3dframe/d3dframe.cpp, arch/win32/d3dframe/d3dframe.h, - arch/win32/d3dframe/d3dmath.cpp, arch/win32/d3dframe/d3dmath.h, - arch/win32/d3dframe/d3dtextr.cpp, arch/win32/d3dframe/d3dtextr.h, - arch/win32/d3dframe/d3dutil.cpp, arch/win32/d3dframe/d3dutil.h, - arch/win32/d3dframe/ddenum.cpp, arch/win32/d3dframe/ddmm.h, - arch/win32/d3dframe/ddutil.h, arch/win32/d3dframe/ddutil2.h, - arch/win32/d3dframe/dsutil.h, arch/win32/d3dframe/lbprintf.h, - arch/win32/d3dframe/resource.h, arch/win32/d3dframe/userdlg.cpp, - arch/win32/include/d3dhelp.h, arch/win32/include/debug.h, - arch/win32/include/hmpfile.h, arch/win32/include/joy.h, - arch/win32/include/key.h, arch/win32/include/mouse.h, - arch/win32/include/pch.h, arch/win32/include/resource.h, - arch/win32/include/scene.h, arch/win32/include/serial.h, - arch/win32/include/texture.h, arch/win32/include/winmain.h, - arch/win32/include/wsipx.h, unused/lib/fix.h, unused/lib/rbaudio.h, - unused/novga/files.rc, unused/novga/novesa.c, unused/ui/barbox.c, - unused/ui/button.c, unused/ui/checkbox.c, unused/ui/file.c, - unused/ui/func.c, unused/ui/func.h, unused/ui/harderr.c, - unused/ui/inputbox.c, unused/ui/keypad.c, unused/ui/ui.c, - unused/ui/uidraw.c, unused/ui/userbox.c, unused/ui/window.c, - unused/vga/dd.bat, unused/vga/framebuf.c, unused/vga/framebuf.jas, - unused/vga/fxdpmi.h, unused/vga/fxvesa.h, unused/vga/grx.h, - unused/vga/modex.asm, unused/vga/palette.c, unused/vga/tweak.inc, - unused/vga/vesa.asm, unused/vga/vga.c, unused/vga/vga.h, - unused/vga/vga.jas, unused/vga/vgaregs.inc, unused/vga/xyz.bat, - unused/vga/new/palette.c, unused/vga/new/vga.c, - unused/win95/comm.c, unused/win95/comm.h, unused/win95/dd.bat, - unused/win95/dd.c, unused/win95/dd.h, unused/win95/ddgfx.c, - unused/win95/ddgr.c, unused/win95/ddraw.c, unused/win95/direct3d.c, - unused/win95/direct3d.h, unused/win95/ds.c, unused/win95/ds.h, - unused/win95/error.c, unused/win95/error.h, - unused/win95/findfile.c, unused/win95/gfx.c, unused/win95/global.h, - unused/win95/iforce.c, unused/win95/iforce.h, unused/win95/ipx.c, - unused/win95/joyc.c, unused/win95/key.c, unused/win95/midifile.h, - unused/win95/midiseq.h, unused/win95/mono.c, unused/win95/mouse.c, - unused/win95/palette.c, unused/win95/rbaudio.c, - unused/win95/swift.c, unused/win95/tactile.c, - unused/win95/tactile.h, unused/win95/timer.c, - unused/win95/winapp.c, unused/win95/winapp.h, - unused/win95/winckpit.asm, unused/win95/winmidi.c, - unused/win95/winmidi.h, unused/win95/winmono.c, - unused/win95/winregs.c, unused/win95/winregs.h, - unused/win95/xtapi.c, unused/win95/xtapi.h, arch/sdl/Makefile.in, - includes/3d.h, includes/args.h, includes/byteswap.h, - includes/cfile.h, includes/checker.h, includes/cmd.h, - includes/console.h, includes/d.bat, includes/d_delay.h, - includes/d_io.h, includes/dtypes.h, includes/dtypes.inc, - includes/error.h, includes/findfile.h, includes/fix.h, - includes/gr.h, includes/grdef.h, includes/hash.h, - includes/ibitblt.h, includes/iff.h, includes/ipx.h, - includes/loadgl.h, includes/lst.bat, includes/m.bat, - includes/maths.h, includes/modex.h, includes/mono.h, - includes/ogl_init.h, includes/pa_enabl.h, includes/palette.h, - includes/pcx.h, includes/psmacros.inc, includes/pstypes.h, - includes/pstypes.inc, includes/rle.h, includes/strio.h, - includes/strutil.h, includes/test.c, includes/test.lnk, - includes/texmap.h, includes/timer.h, includes/u_dpmi.h, - includes/u_mem.h, includes/vecmat.h, includes/vesa.h, - sound/Makefile.am, sound/Makefile.in, sound/sdl_cdrom.c, - sound/sdl_digi.c, texmap/Makefile.am, texmap/Makefile.in, - texmap/ntmap.c, texmap/scanline.c, texmap/scanline.h, - texmap/texmapl.h, texmap/tmap_flt.asm, texmap/tmap_inc.asm, - texmap/tmap_lin.asm, texmap/tmap_ll.asm, texmap/tmap_per.asm, - texmap/tmapfade.asm, texmap/tmapflat.c, texmap/tmappent.S, - texmap/tmapppro.S: Import of d2x-0.0.8 - -- 2.39.2 From 551f98a4bbbe3a01db2bc3e956ddf33d0166c1c4 Mon Sep 17 00:00:00 2001 From: Bradley Bell Date: Sat, 13 Oct 2001 03:02:12 +0000 Subject: [PATCH 10/16] Stuff --- Makefile.am | 4 ++++ NEWS | 9 +++++++++ configure.in | 2 +- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 77269821..040b7929 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,10 @@ SUBDIRS = 2d 3d maths mem cfile iff texmap misc input video sound arch main \ includes tools unused +dist-hook: + $(MAKE) changelog + cp -a ChangeLog $(distdir) + changelog:: -touch ChangeLog -tools/cvs2cl/cvs2cl.pl -b --utc diff --git a/NEWS b/NEWS index 08bcb424..3a1f253a 100644 --- a/NEWS +++ b/NEWS @@ -1,9 +1,16 @@ +Assembly under mingw32 now works. + +--- Version 0.1.0 --- +Builds with SDL/OpenGL, even on Windows (MingW32) +Lots of minor changes and cleanups of the build system. + --- Version 0.0.9 --- Improved automake setup, 'make dist' and VPATH builds now work. svgalib, ggi support (alpha) Merged in joystick support from Michael.Wagener@materna.de Added -grabmouse option to keep the mouse from wandering away in windowed SDL. Pressing pause ungrabs it. + --- Version 0.0.8 --- Added -nocdrom option, fixed cdrom code. Made various error messages more helpful. @@ -13,6 +20,7 @@ Workaround for odd gcc bug (possible). Fixed mission and demo loading. Fixed nonetwork build. Removed libtool dependancy. (Thanks to Falk Hueffner for pointing this out) + --- Version 0.0.7 --- Added beginnings of console. (main/console.c main/cmd.c) Added -debug command line option to show debug information. @@ -23,6 +31,7 @@ Fixed palette problems with flat shaded polygons. Issues currently under investigation: * Weird crash reported by Robert Linden - as yet unreproducable + --- Version 0.0.6 --- Initial ChangeLog entry No change from v0.0.5 except Makefile/config system cleanup. diff --git a/configure.in b/configure.in index c4a6bde6..6d917c32 100644 --- a/configure.in +++ b/configure.in @@ -8,7 +8,7 @@ AC_VALIDATE_CACHED_SYSTEM_TUPLE( ) AM_CONFIG_HEADER(conf.h) -AM_INIT_AUTOMAKE(d2x, 0.1.0) +AM_INIT_AUTOMAKE(d2x, 0.1.1) AM_MAINTAINER_MODE -- 2.39.2 From 23e0d8f9f377030cfde3587b649b2cdce2d34845 Mon Sep 17 00:00:00 2001 From: Bradley Bell Date: Sat, 13 Oct 2001 05:46:13 +0000 Subject: [PATCH 11/16] Removed automake stuff from "inert" subdirs. And there was much rejoicing. --- 2d/Makefile.am | 2 +- Makefile.am | 8 ++++-- arch/Makefile.am | 7 +++++- arch/dos/Makefile.am | 5 ---- arch/dos/allg_snd/Makefile.am | 5 ---- arch/dos/allg_snd/sound/Makefile.am | 6 ----- arch/dos/allg_snd/sound/drv/Makefile.am | 3 --- arch/dos/bak/Makefile.am | 2 -- arch/dos/comm/Makefile.am | 5 ---- arch/dos/comm/include/Makefile.am | 3 --- arch/dos/include/Makefile.am | 2 -- arch/dos/mm_snd/Makefile.am | 5 ---- arch/dos/mm_snd/include/Makefile.am | 2 -- arch/include/Makefile.am | 1 - arch/linux/Makefile.am | 4 --- arch/linux/include/Makefile.am | 3 --- arch/win32/Makefile.am | 8 ------ arch/win32/d3dframe/Makefile.am | 5 ---- arch/win32/include/Makefile.am | 3 --- autogen.sh | 1 + configure.in | 33 ------------------------- iff/Makefile.am | 7 +++++- iff/archive/Makefile.am | 2 -- include/Makefile.am | 10 -------- input/Makefile.am | 7 +++++- input/linux/Makefile.am | 1 - input/linux/include/Makefile.am | 2 -- main/Makefile.am | 7 +++++- main/editor/Makefile.am | 2 -- main/old/Makefile.am | 5 ---- tools/Makefile.am | 1 - tools/cvs2cl/Makefile.am | 2 -- unused/Makefile.am | 4 --- unused/bios/Makefile.am | 10 -------- unused/lib/Makefile.am | 2 -- unused/novga/Makefile.am | 3 --- unused/pa_null/Makefile.am | 3 --- unused/ui/Makefile.am | 6 ----- unused/vga/Makefile.am | 9 ------- unused/vga/new/Makefile.am | 2 -- unused/win95/Makefile.am | 8 ------ 41 files changed, 32 insertions(+), 174 deletions(-) delete mode 100644 arch/dos/Makefile.am delete mode 100644 arch/dos/allg_snd/Makefile.am delete mode 100644 arch/dos/allg_snd/sound/Makefile.am delete mode 100644 arch/dos/allg_snd/sound/drv/Makefile.am delete mode 100644 arch/dos/bak/Makefile.am delete mode 100644 arch/dos/comm/Makefile.am delete mode 100644 arch/dos/comm/include/Makefile.am delete mode 100644 arch/dos/include/Makefile.am delete mode 100644 arch/dos/mm_snd/Makefile.am delete mode 100644 arch/dos/mm_snd/include/Makefile.am delete mode 100644 arch/include/Makefile.am delete mode 100644 arch/linux/Makefile.am delete mode 100644 arch/linux/include/Makefile.am delete mode 100644 arch/win32/Makefile.am delete mode 100644 arch/win32/d3dframe/Makefile.am delete mode 100644 arch/win32/include/Makefile.am delete mode 100644 iff/archive/Makefile.am delete mode 100644 include/Makefile.am delete mode 100644 input/linux/Makefile.am delete mode 100644 input/linux/include/Makefile.am delete mode 100644 main/editor/Makefile.am delete mode 100644 main/old/Makefile.am delete mode 100644 tools/Makefile.am delete mode 100644 tools/cvs2cl/Makefile.am delete mode 100644 unused/Makefile.am delete mode 100644 unused/bios/Makefile.am delete mode 100644 unused/lib/Makefile.am delete mode 100644 unused/novga/Makefile.am delete mode 100644 unused/pa_null/Makefile.am delete mode 100644 unused/ui/Makefile.am delete mode 100644 unused/vga/Makefile.am delete mode 100644 unused/vga/new/Makefile.am delete mode 100644 unused/win95/Makefile.am diff --git a/2d/Makefile.am b/2d/Makefile.am index ddbb31ec..7689639c 100644 --- a/2d/Makefile.am +++ b/2d/Makefile.am @@ -24,4 +24,4 @@ endif EXTRA_DIST = \ linear.asm scalea.asm tmerge_a.asm \ bitmap.h clip.h linear.h scalea.h \ -scale.c +scale.c tmerge.c diff --git a/Makefile.am b/Makefile.am index 040b7929..26171022 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,11 @@ -SUBDIRS = 2d 3d maths mem cfile iff texmap misc input video sound arch main \ -includes tools unused +SUBDIRS = 2d 3d maths mem cfile iff texmap misc input video sound arch main + +EXTRA_SUBDIRS = includes tools unused dist-hook: + list='$(EXTRA_SUBDIRS)'; for subdir in $$list; do \ + tar --exclude=CVS -cf - $$subdir | ( cd $(distdir) && tar xf - ) \ + done $(MAKE) changelog cp -a ChangeLog $(distdir) diff --git a/arch/Makefile.am b/arch/Makefile.am index 9ee9d599..9e05f8b6 100644 --- a/arch/Makefile.am +++ b/arch/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = include dos linux win32 +EXTRA_SUBDIRS = dos include linux win32 noinst_LIBRARIES = libarch.a INCLUDES = -I$(top_srcdir)/includes -I$(top_srcdir)/main -I$(top_srcdir)/arch/include @@ -41,3 +41,8 @@ endif EXTRA_DIST = \ dos_tweak.inc dos_vgaregs.inc \ dos_modex.asm dos_timer.asm + +dist-hook: + list='$(EXTRA_SUBDIRS)'; for subdir in $$list; do \ + tar --exclude=CVS -cf - $$subdir | ( cd $(distdir) && tar xf - ) \ + done diff --git a/arch/dos/Makefile.am b/arch/dos/Makefile.am deleted file mode 100644 index a2d4309d..00000000 --- a/arch/dos/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ -SUBDIRS = allg_snd bak comm include mm_snd - -EXTRA_DIST = \ -ipx.h mono.h \ -bcd.c digiallg.c digimm.c disk.c midiallg.c mono.c serial.c diff --git a/arch/dos/allg_snd/Makefile.am b/arch/dos/allg_snd/Makefile.am deleted file mode 100644 index 915f313a..00000000 --- a/arch/dos/allg_snd/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ -SUBDIRS = sound - -EXTRA_DIST = \ -internal.h \ -allg_snd.c diff --git a/arch/dos/allg_snd/sound/Makefile.am b/arch/dos/allg_snd/sound/Makefile.am deleted file mode 100644 index b5bd20e2..00000000 --- a/arch/dos/allg_snd/sound/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -SUBDIRS = drv - -EXTRA_DIST = \ -readme.d1 readme.txt \ -allegro.h interndj.h \ -config.c digmid.c midi.c mixer.c snddrv.c sound.c diff --git a/arch/dos/allg_snd/sound/drv/Makefile.am b/arch/dos/allg_snd/sound/drv/Makefile.am deleted file mode 100644 index a84bde46..00000000 --- a/arch/dos/allg_snd/sound/drv/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -EXTRA_DIST = \ -emu8k.h fm_instr.h \ -adlib.c awedata.c dma.c emu8k.c emu8kmid.c gus.c mpu.c sb.c diff --git a/arch/dos/bak/Makefile.am b/arch/dos/bak/Makefile.am deleted file mode 100644 index 56a9f620..00000000 --- a/arch/dos/bak/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ -EXTRA_DIST = \ -ipx.c diff --git a/arch/dos/comm/Makefile.am b/arch/dos/comm/Makefile.am deleted file mode 100644 index 889e33a5..00000000 --- a/arch/dos/comm/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ -SUBDIRS = include - -EXTRA_DIST = \ -irqwrap.S \ -commlib.c dzcomm.c dzqueue.c irq.c diff --git a/arch/dos/comm/include/Makefile.am b/arch/dos/comm/include/Makefile.am deleted file mode 100644 index 3992b967..00000000 --- a/arch/dos/comm/include/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -EXTRA_DIST = \ -asmdef.inc asmdefs.inc \ -allegro.h commlib.h internal.h diff --git a/arch/dos/include/Makefile.am b/arch/dos/include/Makefile.am deleted file mode 100644 index 7568225f..00000000 --- a/arch/dos/include/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ -EXTRA_DIST = \ -commlib.h disk.h dzcomm.h midiallg.h serial.h diff --git a/arch/dos/mm_snd/Makefile.am b/arch/dos/mm_snd/Makefile.am deleted file mode 100644 index c88a2ef0..00000000 --- a/arch/dos/mm_snd/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ -SUBDIRS = include - -EXTRA_DIST = \ -readme.txt \ -drv_sb.c mdma.c mirq.c diff --git a/arch/dos/mm_snd/include/Makefile.am b/arch/dos/mm_snd/include/Makefile.am deleted file mode 100644 index c4695e25..00000000 --- a/arch/dos/mm_snd/include/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ -EXTRA_DIST = \ -mdma.h mikmod.h mirq.h mm_drv.h mmio.h mtypes.h diff --git a/arch/include/Makefile.am b/arch/include/Makefile.am deleted file mode 100644 index 90229409..00000000 --- a/arch/include/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -EXTRA_DIST = event.h key.h mouse.h joy.h diff --git a/arch/linux/Makefile.am b/arch/linux/Makefile.am deleted file mode 100644 index 78ac4cf1..00000000 --- a/arch/linux/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -SUBDIRS = include - -EXTRA_DIST = \ -alsadigi.c hmiplay.c hmistub.c ipx_kali.c mono.c serial.c timer.c ukali.c diff --git a/arch/linux/include/Makefile.am b/arch/linux/include/Makefile.am deleted file mode 100644 index 4686107b..00000000 --- a/arch/linux/include/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -EXTRA_DIST = \ -ipx_bsd.h ipx_drv.h ipx_hlpr.h ipx_kali.h ipx_ld.h ipx_lin.h ipx_udp.h \ -music.h serial.h ukali.h diff --git a/arch/win32/Makefile.am b/arch/win32/Makefile.am deleted file mode 100644 index a609f8ab..00000000 --- a/arch/win32/Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ -SUBDIRS = d3dframe include - -EXTRA_DIST = \ -d1x.ico d3d.ico descent.ico d1x.rc \ -ipx_drv.h \ -debug.cpp pch.cpp scene.cpp texture.cpp winmain.cpp \ -digi.c glinit.c gr.c hmpfile.c init.c ipx_win.c joydefs.c joyhh.c \ -key.c mono.c mouse.c palw32.c serial.c timer.c win32.c winnet.c diff --git a/arch/win32/d3dframe/Makefile.am b/arch/win32/d3dframe/Makefile.am deleted file mode 100644 index 25ada097..00000000 --- a/arch/win32/d3dframe/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ -EXTRA_DIST = \ -d3denum.h d3dframe.h d3dmath.h d3dtextr.h d3dutil.h \ -ddmm.h ddutil.h ddutil2.h dsutil.h lbprintf.h resource.h \ -d3denum.cpp d3dframe.cpp d3dmath.cpp d3dtextr.cpp d3dutil.cpp \ -ddenum.cpp userdlg.cpp diff --git a/arch/win32/include/Makefile.am b/arch/win32/include/Makefile.am deleted file mode 100644 index bd8f6a03..00000000 --- a/arch/win32/include/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -EXTRA_DIST = \ -d3dhelp.h debug.h hmpfile.h joy.h key.h mouse.h pch.h \ -resource.h scene.h serial.h texture.h winmain.h wsipx.h diff --git a/autogen.sh b/autogen.sh index 07212a61..99035ad6 100644 --- a/autogen.sh +++ b/autogen.sh @@ -1,5 +1,6 @@ #!/bin/sh set -e +touch ChangeLog aclocal $ACLOCAL_FLAGS autoheader automake --add-missing diff --git a/configure.in b/configure.in index 6d917c32..c55c2900 100644 --- a/configure.in +++ b/configure.in @@ -226,47 +226,14 @@ Makefile 2d/Makefile 3d/Makefile arch/Makefile -arch/dos/Makefile -arch/dos/allg_snd/Makefile -arch/dos/allg_snd/sound/Makefile -arch/dos/allg_snd/sound/drv/Makefile -arch/dos/bak/Makefile -arch/dos/comm/Makefile -arch/dos/comm/include/Makefile -arch/dos/include/Makefile -arch/dos/mm_snd/Makefile -arch/dos/mm_snd/include/Makefile -arch/include/Makefile -arch/linux/Makefile -arch/linux/include/Makefile -arch/win32/Makefile -arch/win32/d3dframe/Makefile -arch/win32/include/Makefile cfile/Makefile iff/Makefile -iff/archive/Makefile -includes/Makefile input/Makefile -input/linux/Makefile -input/linux/include/Makefile main/Makefile -main/editor/Makefile -main/old/Makefile maths/Makefile mem/Makefile misc/Makefile sound/Makefile texmap/Makefile -unused/Makefile -unused/bios/Makefile -unused/lib/Makefile -unused/novga/Makefile -unused/pa_null/Makefile -unused/ui/Makefile -unused/vga/Makefile -unused/vga/new/Makefile -unused/win95/Makefile video/Makefile -tools/Makefile -tools/cvs2cl/Makefile ) \ No newline at end of file diff --git a/iff/Makefile.am b/iff/Makefile.am index 01f40f24..84be250b 100644 --- a/iff/Makefile.am +++ b/iff/Makefile.am @@ -1,6 +1,11 @@ -SUBDIRS = archive +EXTRA_SUBDIRS = archive noinst_LIBRARIES = libiff.a INCLUDES = -I $(top_srcdir)/includes libiff_a_SOURCES = iff.c + +dist-hook: + list='$(EXTRA_SUBDIRS)'; for subdir in $$list; do \ + tar --exclude=CVS -cf - $$subdir | ( cd $(distdir) && tar xf - ) \ + done diff --git a/iff/archive/Makefile.am b/iff/archive/Makefile.am deleted file mode 100644 index f11f43c5..00000000 --- a/iff/archive/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ -EXTRA_DIST = \ -iff15bpp.c iff8bpp.c iffmike.c ifftest.c ifftestv.c diff --git a/include/Makefile.am b/include/Makefile.am deleted file mode 100644 index 95c3d01d..00000000 --- a/include/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ -EXTRA_DIST = \ -d.bat lst.bat m.bat \ -test.lnk \ -dtypes.inc psmacros.inc pstypes.inc \ -3d.h args.h byteswap.h cfile.h checker.h cmd.h console.h \ -d_delay.h d_io.h dtypes.h error.h findfile.h fix.h gr.h grdef.h \ -hash.h ibitblt.h iff.h ipx.h loadgl.h maths.h modex.h mono.h \ -ogl_init.h pa_enabl.h palette.h pcx.h pstypes.h rle.h strio.h \ -strutil.h texmap.h timer.h u_dpmi.h u_mem.h vecmat.h vesa.h \ -test.c diff --git a/input/Makefile.am b/input/Makefile.am index a958b36b..7e957211 100644 --- a/input/Makefile.am +++ b/input/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = linux +EXTRA_SUBDIRS = linux INCLUDES = -I$(top_srcdir)/includes -I$(top_srcdir)/main -I$(top_srcdir)/arch/include @@ -43,3 +43,8 @@ endif EXTRA_DIST = \ dos_joy2.asm \ ggi_init.c + +dist-hook: + list='$(EXTRA_SUBDIRS)'; for subdir in $$list; do \ + tar --exclude=CVS -cf - $$subdir | ( cd $(distdir) && tar xf - ) \ + done diff --git a/input/linux/Makefile.am b/input/linux/Makefile.am deleted file mode 100644 index 7b92e00e..00000000 --- a/input/linux/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS = include diff --git a/input/linux/include/Makefile.am b/input/linux/include/Makefile.am deleted file mode 100644 index 6c6d6ecc..00000000 --- a/input/linux/include/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ -EXTRA_DIST = \ -linux_joystick.h diff --git a/main/Makefile.am b/main/Makefile.am index 89b2c939..69d6cc4d 100644 --- a/main/Makefile.am +++ b/main/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = editor old +EXTRA_SUBDIRS = editor old CFLAGS += -fwritable-strings @@ -55,3 +55,8 @@ powerup.h render.h robot.h scores.h screens.h segment.h segpoint.h slew.h \ songs.h sounds.h state.h switch.h terrain.h texmerge.h text.h textures.h \ titles.h vclip.h vers_id.h wall.h weapon.h \ dumpmine.c + +dist-hook: + list='$(EXTRA_SUBDIRS)'; for subdir in $$list; do \ + tar --exclude=CVS -cf - $$subdir | ( cd $(distdir) && tar xf - ) \ + done diff --git a/main/editor/Makefile.am b/main/editor/Makefile.am deleted file mode 100644 index 4458e28d..00000000 --- a/main/editor/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ -EXTRA_DIST = \ -editor.h kdefs.h texpage.h diff --git a/main/old/Makefile.am b/main/old/Makefile.am deleted file mode 100644 index f1b7b89a..00000000 --- a/main/old/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ -EXTRA_DIST = \ -3dfx_des.h arcade.h coindev.h files.h iglasses.h settings.h \ -3dfx.c cdmix32.c cdrom.c coindev.c descentw.c digiobj.c iglasses.c \ -joydefs.c joydefsw.c modem.c movie.c newmodel.c rbtest.c terrain.c \ -windigi.c winferno.c winmodem.c winvideo.c diff --git a/tools/Makefile.am b/tools/Makefile.am deleted file mode 100644 index 4f266314..00000000 --- a/tools/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS = cvs2cl diff --git a/tools/cvs2cl/Makefile.am b/tools/cvs2cl/Makefile.am deleted file mode 100644 index a7f30b05..00000000 --- a/tools/cvs2cl/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ -EXTRA_DIST = \ -cvs2cl.pl diff --git a/unused/Makefile.am b/unused/Makefile.am deleted file mode 100644 index d5d77a92..00000000 --- a/unused/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -SUBDIRS = bios lib novga pa_null ui vga win95 - -EXTRA_DIST = \ -readme.txt diff --git a/unused/bios/Makefile.am b/unused/bios/Makefile.am deleted file mode 100644 index 186c797c..00000000 --- a/unused/bios/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ -EXTRA_DIST = \ -x rbaudio.new \ -d.bat dd.bat make0000.bat make0001.bat make0100.bat x.bat y.bat \ -testk.lnk testm.lnk \ -keys.inc \ -joy.asm key.asm mouse.asm oldkey.asm timer.asm \ -dpmi.h error.h findfile.h ipx.h joy.h key.h mouse.h \ -rbaudio.h swiftcfg.h timer.h \ -dpmi.c error.c findfile.c ipx.c joyc.c key.c mono.c mouse.c \ -rbaudio.c speaker.c testj.c testk.c testm.c testms.c testt.c timerp.c x.c diff --git a/unused/lib/Makefile.am b/unused/lib/Makefile.am deleted file mode 100644 index 7e25cd14..00000000 --- a/unused/lib/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ -EXTRA_DIST = \ -fix.h rbaudio.h diff --git a/unused/novga/Makefile.am b/unused/novga/Makefile.am deleted file mode 100644 index 428515c3..00000000 --- a/unused/novga/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -EXTRA_DIST = \ -files.rc \ -novesa.c diff --git a/unused/pa_null/Makefile.am b/unused/pa_null/Makefile.am deleted file mode 100644 index 43ce75ef..00000000 --- a/unused/pa_null/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -EXTRA_DIST = \ -pa_enabl.h poly_acc.h \ -poly_acc.c diff --git a/unused/ui/Makefile.am b/unused/ui/Makefile.am deleted file mode 100644 index 82ab10a3..00000000 --- a/unused/ui/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -EXTRA_DIST = \ -func.h ui.h \ -barbox.c button.c checkbox.c file.c func.c gadget.c harderr.c icon.c \ -inputbox.c keypad.c keypress.c keytrap.c listbox.c medfunc.c menu.c \ -menubar.c message.c mouse.c number.c popup.c radio.c scroll.c ui.c \ -uidraw.c userbox.c window.c diff --git a/unused/vga/Makefile.am b/unused/vga/Makefile.am deleted file mode 100644 index 7afd6caa..00000000 --- a/unused/vga/Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ -SUBDIRS = new - -EXTRA_DIST = \ -dd.bat xyz.bat \ -framebuf.jas vga.jas \ -tweak.inc vgaregs.inc \ -modex.asm vesa.asm \ -fxdpmi.h fxvesa.h grx.h vga.h \ -framebuf.c palette.c vga.c diff --git a/unused/vga/new/Makefile.am b/unused/vga/new/Makefile.am deleted file mode 100644 index 9f797584..00000000 --- a/unused/vga/new/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ -EXTRA_DIST = \ -palette.c vga.c diff --git a/unused/win95/Makefile.am b/unused/win95/Makefile.am deleted file mode 100644 index 91b2f243..00000000 --- a/unused/win95/Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ -EXTRA_DIST = \ -dd.bat \ -winckpit.asm \ -comm.h dd.h direct3d.h ds.h error.h global.h iforce.h midifile.h midiseq.h \ -tactile.h winapp.h winmidi.h winregs.h xtapi.h \ -comm.c dd.c ddgfx.c ddgr.c ddraw.c direct3d.c ds.c error.c gfx.c \ -iforce.c ipx.c joyc.c key.c mono.c mouse.c palette.c rbaudio.c swift.c \ -tactile.c timer.c winapp.c winmidi.c winmono.c winregs.c xtapi.c -- 2.39.2 From aa65cf04180e2595d6dfe16f34b005111373990b Mon Sep 17 00:00:00 2001 From: Bradley Bell Date: Sun, 14 Oct 2001 19:49:19 +0000 Subject: [PATCH 12/16] Minor dist fix --- Makefile.am | 10 ++++++---- arch/Makefile.am | 3 ++- iff/Makefile.am | 3 ++- input/Makefile.am | 3 ++- main/Makefile.am | 3 ++- 5 files changed, 14 insertions(+), 8 deletions(-) diff --git a/Makefile.am b/Makefile.am index 26171022..59f4eb05 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,15 +4,17 @@ EXTRA_SUBDIRS = includes tools unused dist-hook: list='$(EXTRA_SUBDIRS)'; for subdir in $$list; do \ - tar --exclude=CVS -cf - $$subdir | ( cd $(distdir) && tar xf - ) \ + ( cd $(srcdir) && tar --exclude=CVS/ -cf - $$subdir ) \ + | ( cd $(distdir) && tar xf - ) \ done $(MAKE) changelog cp -a ChangeLog $(distdir) changelog:: - -touch ChangeLog - -tools/cvs2cl/cvs2cl.pl -b --utc - -rm -f ChangeLog.bak + rm -f $(srcdir)/ChangeLog + touch $(srcdir)/ChangeLog + $(srcdir)/tools/cvs2cl/cvs2cl.pl -b --utc + rm -f ChangeLog.bak EXTRA_DIST = \ ChangeLog \ diff --git a/arch/Makefile.am b/arch/Makefile.am index 9e05f8b6..ad0e6ba0 100644 --- a/arch/Makefile.am +++ b/arch/Makefile.am @@ -44,5 +44,6 @@ dos_modex.asm dos_timer.asm dist-hook: list='$(EXTRA_SUBDIRS)'; for subdir in $$list; do \ - tar --exclude=CVS -cf - $$subdir | ( cd $(distdir) && tar xf - ) \ + ( cd $(srcdir) && tar --exclude=CVS -cf - $$subdir ) \ + | ( cd $(distdir) && tar xf - ) \ done diff --git a/iff/Makefile.am b/iff/Makefile.am index 84be250b..f3676b7b 100644 --- a/iff/Makefile.am +++ b/iff/Makefile.am @@ -7,5 +7,6 @@ libiff_a_SOURCES = iff.c dist-hook: list='$(EXTRA_SUBDIRS)'; for subdir in $$list; do \ - tar --exclude=CVS -cf - $$subdir | ( cd $(distdir) && tar xf - ) \ + ( cd $(srcdir) && tar --exclude=CVS -cf - $$subdir ) \ + | ( cd $(distdir) && tar xf - ) \ done diff --git a/input/Makefile.am b/input/Makefile.am index 7e957211..83c83705 100644 --- a/input/Makefile.am +++ b/input/Makefile.am @@ -46,5 +46,6 @@ ggi_init.c dist-hook: list='$(EXTRA_SUBDIRS)'; for subdir in $$list; do \ - tar --exclude=CVS -cf - $$subdir | ( cd $(distdir) && tar xf - ) \ + ( cd $(srcdir) && tar --exclude=CVS -cf - $$subdir ) \ + | ( cd $(distdir) && tar xf - ) \ done diff --git a/main/Makefile.am b/main/Makefile.am index 69d6cc4d..528f654b 100644 --- a/main/Makefile.am +++ b/main/Makefile.am @@ -58,5 +58,6 @@ dumpmine.c dist-hook: list='$(EXTRA_SUBDIRS)'; for subdir in $$list; do \ - tar --exclude=CVS -cf - $$subdir | ( cd $(distdir) && tar xf - ) \ + ( cd $(srcdir) && tar --exclude=CVS -cf - $$subdir ) \ + | ( cd $(distdir) && tar xf - ) \ done -- 2.39.2 From 8a51309a7178a9522ab7496d5f4a80052e7980ce Mon Sep 17 00:00:00 2001 From: Bradley Bell Date: Wed, 17 Oct 2001 23:43:03 +0000 Subject: [PATCH 13/16] Fixed the invulnerable robots bug! --- main/collide.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/main/collide.c b/main/collide.c index 4994e7ef..d2c478de 100644 --- a/main/collide.c +++ b/main/collide.c @@ -16,7 +16,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #endif #ifdef RCS -static char rcsid[] = "$Id: collide.c,v 1.5 2001-10-12 06:40:49 bradleyb Exp $"; +static char rcsid[] = "$Id: collide.c,v 1.6 2001-10-17 23:43:03 bradleyb Exp $"; #endif #include // for memset @@ -1363,12 +1363,13 @@ int apply_damage_to_robot(object *robot, fix damage, int killer_objnum) // Buddy invulnerable on level 24 so he can give you his important messages. Bah. // Also invulnerable if his cheat for firing weapons is in effect. - if (Robot_info[robot->id].companion) + if (Robot_info[robot->id].companion) { // if ((Current_mission_num == 0 && Current_level_num == Last_level) || Buddy_dude_cheat) #ifdef NETWORK if ((Current_mission_num == 0 && Current_level_num == Last_level) ) return 0; #endif + } // if (robot->control_type == CT_REMOTE) // return 0; // Can't damange a robot controlled by another player -- 2.39.2 From 8d39faee6d4168c96f33ad2eaeb08e8325281670 Mon Sep 17 00:00:00 2001 From: Bradley Bell Date: Wed, 17 Oct 2001 23:59:47 +0000 Subject: [PATCH 14/16] Fixed the invulnerable robots bug! --- NEWS | 3 +++ 1 file changed, 3 insertions(+) diff --git a/NEWS b/NEWS index 3a1f253a..2d8a802a 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,7 @@ +--- Version 0.1.1 --- Assembly under mingw32 now works. +Invulnerable robots bug fixed! +Build process much faster. --- Version 0.1.0 --- Builds with SDL/OpenGL, even on Windows (MingW32) -- 2.39.2 From eca297348072a505e2238c0db0d538451bdbf696 Mon Sep 17 00:00:00 2001 From: Bradley Bell Date: Thu, 18 Oct 2001 00:01:01 +0000 Subject: [PATCH 15/16] RCS headers added/changed --- main/collide.c | 16 ++++++++++++---- main/inferno.c | 12 ++++++++++++ main/object.c | 16 ++++++++++++---- main/render.c | 16 ++++++++++++---- 4 files changed, 48 insertions(+), 12 deletions(-) diff --git a/main/collide.c b/main/collide.c index d2c478de..6010196d 100644 --- a/main/collide.c +++ b/main/collide.c @@ -11,14 +11,22 @@ AND AGREES TO THE TERMS HEREIN AND ACCEPTS THE SAME BY USE OF THIS FILE. COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. */ +/* + * $Source: /cvs/cvsroot/d2x/main/collide.c,v $ + * $Revision: 1.7 $ + * $Author: bradleyb $ + * $Date: 2001-10-18 00:01:00 $ + * + * FIXME: put description here + * + * $Log: not supported by cvs2svn $ + * + */ + #ifdef HAVE_CONFIG_H #include #endif -#ifdef RCS -static char rcsid[] = "$Id: collide.c,v 1.6 2001-10-17 23:43:03 bradleyb Exp $"; -#endif - #include // for memset #include #include diff --git a/main/inferno.c b/main/inferno.c index 3c5c752f..a0507cac 100644 --- a/main/inferno.c +++ b/main/inferno.c @@ -11,6 +11,18 @@ AND AGREES TO THE TERMS HEREIN AND ACCEPTS THE SAME BY USE OF THIS FILE. COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. */ +/* + * $Source: /cvs/cvsroot/d2x/main/inferno.c,v $ + * $Revision: 1.7 $ + * $Author: bradleyb $ + * $Date: 2001-10-18 00:01:01 $ + * + * FIXME: put description here + * + * $Log: not supported by cvs2svn $ + * + */ + char copyright[] = "DESCENT II COPYRIGHT (C) 1994-1996 PARALLAX SOFTWARE CORPORATION"; #include diff --git a/main/object.c b/main/object.c index 5e3dab3f..db3073d9 100644 --- a/main/object.c +++ b/main/object.c @@ -11,14 +11,22 @@ AND AGREES TO THE TERMS HEREIN AND ACCEPTS THE SAME BY USE OF THIS FILE. COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. */ +/* + * $Source: /cvs/cvsroot/d2x/main/object.c,v $ + * $Revision: 1.7 $ + * $Author: bradleyb $ + * $Date: 2001-10-18 00:01:01 $ + * + * FIXME: put description here + * + * $Log: not supported by cvs2svn $ + * + */ + #ifdef HAVE_CONFIG_H #include #endif -#ifdef RCS -static char rcsid[] = "$Id: object.c,v 1.6 2001-10-12 10:03:32 bradleyb Exp $"; -#endif - #ifdef WINDOWS #include "desw.h" #endif diff --git a/main/render.c b/main/render.c index ac9b300c..004357a5 100644 --- a/main/render.c +++ b/main/render.c @@ -11,14 +11,22 @@ AND AGREES TO THE TERMS HEREIN AND ACCEPTS THE SAME BY USE OF THIS FILE. COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. */ +/* + * $Source: /cvs/cvsroot/d2x/main/render.c,v $ + * $Revision: 1.6 $ + * $Author: bradleyb $ + * $Date: 2001-10-18 00:01:01 $ + * + * FIXME: put description here + * + * $Log: not supported by cvs2svn $ + * + */ + #ifdef HAVE_CONFIG_H #include #endif -#ifdef RCS -static char rcsid[] = "$Id: render.c,v 1.5 2001-10-12 10:03:32 bradleyb Exp $"; -#endif - #include #include #include -- 2.39.2 From 2d42c11d9d299237bc26ea8c8b2f96617a7ee226 Mon Sep 17 00:00:00 2001 From: Bradley Bell Date: Thu, 18 Oct 2001 00:10:03 +0000 Subject: [PATCH 16/16] fix NASMFLAGS bug --- configure.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/configure.in b/configure.in index c55c2900..82a9f2b1 100644 --- a/configure.in +++ b/configure.in @@ -190,8 +190,9 @@ if test "$NASM" = "no"; then fi if test "$NO_ASM" = 1; then AC_DEFINE(NO_ASM) - NASMFLAGS="-i\$(srcdir)/ $NASMFLAGS" + NASMFLAGS="" else + NASMFLAGS="-i\$(srcdir)/ $NASMFLAGS" case $host_os in cygwin) NASMFLAGS="-f win32 $NASMFLAGS" -- 2.39.2