From b442c53142eb06f5cf010e8710db436e754ccf1f Mon Sep 17 00:00:00 2001 From: Bradley Bell Date: Mon, 8 Dec 2003 21:21:16 +0000 Subject: [PATCH] enable nasm on FreeBSD, change relevant __linux__ macros to __ELF__ --- 2d/bitblt.c | 4 ++-- 2d/linear.asm | 4 ++-- ChangeLog | 7 +++++++ configure.ac | 4 ++-- maths/fix.asm | 4 ++-- maths/vecmata.asm | 6 +++--- texmap/tmap_inc.asm | 4 ++-- texmap/tmap_per.asm | 6 +++--- texmap/tmappent.S | 6 +++--- texmap/tmapppro.S | 6 +++--- 10 files changed, 29 insertions(+), 22 deletions(-) diff --git a/2d/bitblt.c b/2d/bitblt.c index 03a9f66e..ee8c4c57 100644 --- a/2d/bitblt.c +++ b/2d/bitblt.c @@ -1,4 +1,4 @@ -/* $Id: bitblt.c,v 1.12 2003-10-25 01:44:23 btb Exp $ */ +/* $Id: bitblt.c,v 1.13 2003-12-08 21:21:16 btb Exp $ */ /* THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO @@ -363,7 +363,7 @@ static inline void gr_linear_rep_movsdm_faded(ubyte * src, ubyte * dest, unsigne " incl %%esi;" " cmpb $" TRANSPARENCY_COLOR_STR ", %%al;" " je 1f;" -#ifdef __linux__ +#ifdef __ELF__ " movb gr_fade_table(%%eax), %%al;" #else " movb _gr_fade_table(%%eax), %%al;" diff --git a/2d/linear.asm b/2d/linear.asm index 854e5f1a..cf674b5a 100644 --- a/2d/linear.asm +++ b/2d/linear.asm @@ -1,4 +1,4 @@ -; $Id: linear.asm,v 1.3 2002-07-17 21:55:19 bradleyb Exp $ +; $Id: linear.asm,v 1.4 2003-12-08 21:21:16 btb Exp $ ;THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX ;SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO ;END-USERS, AND SUBJECT TO ALL OF THE TERMS AND CONDITIONS HEREIN, GRANTS A @@ -85,7 +85,7 @@ section .data ; Put data here -%ifdef __linux__ +%ifdef __ELF__ %define _gr_var_color gr_var_color %define _gr_var_bitmap gr_var_bitmap %define _gr_var_bwidth gr_var_bwidth diff --git a/ChangeLog b/ChangeLog index 9f2e880a..2dd6dc5c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2003-12-08 Alexander Y. Yeikovich and Bradley Bell + + * configure.ac, 2d/bitblt.c, 2d/linear.asm, maths/fix.asm, + maths/vecmata.asm, texmap/tmap_inc.asm, texmap/tmap_per.asm, + texmap/tmappent.S, texmap/tmapppro.S: enable nasm on FreeBSD, + change relevant __linux__ macros to __ELF__ + 2003-11-27 Bradley Bell * include/ogl_init.h: added proto for ogl_check_mode diff --git a/configure.ac b/configure.ac index 72098621..c8d6e6b7 100644 --- a/configure.ac +++ b/configure.ac @@ -329,8 +329,8 @@ if test x$enable_assembler != xno; then msdos*) NASMFLAGS="-f coff $NASMFLAGS" ;; - linux*) - NASMFLAGS="-f elf -d__linux__ $NASMFLAGS" + linux* | freebsd*) + NASMFLAGS="-f elf -d__ELF__ $NASMFLAGS" ;; *) AC_MSG_WARN([nasm not supported for this OS. disabling assembler]) diff --git a/maths/fix.asm b/maths/fix.asm index 6eca69b1..9002a050 100644 --- a/maths/fix.asm +++ b/maths/fix.asm @@ -1,4 +1,4 @@ -; $Id: fix.asm,v 1.3 2003-02-18 20:23:22 btb Exp $ +; $Id: fix.asm,v 1.4 2003-12-08 21:21:16 btb Exp $ ;THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX ;SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO ;END-USERS, AND SUBJECT TO ALL OF THE TERMS AND CONDITIONS HEREIN, GRANTS A @@ -12,7 +12,7 @@ [BITS 32] -%ifdef __linux__ +%ifdef __ELF__ %define _fixdivquadlong fixdivquadlong %define _fixmul fixmul %define _fixdiv fixdiv diff --git a/maths/vecmata.asm b/maths/vecmata.asm index d93ec313..cc3cd516 100644 --- a/maths/vecmata.asm +++ b/maths/vecmata.asm @@ -1,4 +1,4 @@ -; $Id: vecmata.asm,v 1.4 2003-02-18 20:23:22 btb Exp $ +; $Id: vecmata.asm,v 1.5 2003-12-08 21:21:16 btb Exp $ ;THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX ;SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO ;END-USERS, AND SUBJECT TO ALL OF THE TERMS AND CONDITIONS HEREIN, GRANTS A @@ -192,8 +192,8 @@ [BITS 32] -%ifdef __linux__ -; Cater for linux ELF compilers which don't prefix underscores... +%ifdef __ELF__ +; Cater for ELF compilers which don't prefix underscores... ; Variables: %define _vmd_zero_vector vmd_zero_vector %define _vmd_identity_matrix vmd_identity_matrix diff --git a/texmap/tmap_inc.asm b/texmap/tmap_inc.asm index 4a9e27fe..f1f6af4d 100644 --- a/texmap/tmap_inc.asm +++ b/texmap/tmap_inc.asm @@ -1,4 +1,4 @@ -; $Id: tmap_inc.asm,v 1.3 2003-02-18 20:15:48 btb Exp $ +; $Id: tmap_inc.asm,v 1.4 2003-12-08 21:21:16 btb Exp $ ;THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX ;SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO ;END-USERS, AND SUBJECT TO ALL OF THE TERMS AND CONDITIONS HEREIN, GRANTS A @@ -82,7 +82,7 @@ SCREEN_HEIGHT = 480 BYTES_PER_PIXEL = 2 %endif -%ifdef __linux__ +%ifdef __ELF__ ; It appears that ELF C compilers do not prefix symbols with '_', so here we ; cater for them... %define _gr_fade_table gr_fade_table diff --git a/texmap/tmap_per.asm b/texmap/tmap_per.asm index 89f7eae7..1dae8458 100644 --- a/texmap/tmap_per.asm +++ b/texmap/tmap_per.asm @@ -1,4 +1,4 @@ -; $Id: tmap_per.asm,v 1.3 2003-02-18 20:15:48 btb Exp $ +; $Id: tmap_per.asm,v 1.4 2003-12-08 21:21:16 btb Exp $ ;THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX ;SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO ;END-USERS, AND SUBJECT TO ALL OF THE TERMS AND CONDITIONS HEREIN, GRANTS A @@ -119,8 +119,8 @@ global asm_tmap_scanline_per [SECTION .data] align 4 ;extern _per2_flag;:dword -%ifdef __linux__ -; Cater for linux ELF compilers... +%ifdef __ELF__ +; Cater for ELF compilers... global x %define _loop_count loop_count %define _new_end new_end diff --git a/texmap/tmappent.S b/texmap/tmappent.S index 386433bb..ad9d0131 100644 --- a/texmap/tmappent.S +++ b/texmap/tmappent.S @@ -1,4 +1,4 @@ -/// $Id: tmappent.S,v 1.4 2003-02-18 20:15:48 btb Exp $ +/// $Id: tmappent.S,v 1.5 2003-12-08 21:21:16 btb Exp $ /// tmap_scanline_per - Pentium-optimized assembly version /// written by Brian Raiter, Mar 1998. /// lighting roundoff error fixed by Matt Mueller, July 1999 @@ -153,7 +153,7 @@ // (ready to start the next division) .endm -#ifdef __linux__ +#ifdef __ELF__ .equ _pixptr, pixptr .equ _gr_fade_table, gr_fade_table .equ _write_buffer, write_buffer @@ -217,7 +217,7 @@ ctlwd: .word 0 // the pre-tweaked FPU control word // void c_tmap_scanline_per(void) // -#ifdef __linux__ +#ifdef __ELF__ asm_pent_tmap_scanline_per: #else _asm_pent_tmap_scanline_per: diff --git a/texmap/tmapppro.S b/texmap/tmapppro.S index 6efeafe4..8266db2c 100644 --- a/texmap/tmapppro.S +++ b/texmap/tmapppro.S @@ -1,4 +1,4 @@ -/// $Id: tmapppro.S,v 1.5 2003-02-18 20:15:48 btb Exp $ +/// $Id: tmapppro.S,v 1.6 2003-12-08 21:21:16 btb Exp $ /// tmap_scanline_per - Pentium-Pro-optimized assembly version /// written by Brian Raiter, Mar 1998. /// lighting roundoff error fixed by Matt Mueller, July 1999 @@ -143,7 +143,7 @@ .endm -#ifdef __linux__ +#ifdef __ELF__ .equ _pixptr, pixptr .equ _gr_fade_table, gr_fade_table .equ _write_buffer, write_buffer @@ -203,7 +203,7 @@ ctlwd: .long 0 // the pre-tweaked FPU control word // void c_tmap_scanline_per(void) // -#ifdef __linux__ +#ifdef __ELF__ asm_ppro_tmap_scanline_per: #else _asm_ppro_tmap_scanline_per: -- 2.39.2