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

enable nasm on FreeBSD, change relevant __linux__ macros to __ELF__

Browse source
This commit is contained in:
Bradley Bell 2003-12-08 21:21:16 +00:00
parent a927af0fdd
commit b442c53142
10 changed files with 29 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
2d/bitblt.c
View file

@ -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;"

4
2d/linear.asm
View file

@ -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

7
ChangeLog
View file

@ -1,3 +1,10 @@
2003-12-08 Alexander Y. Yeikovich <demon@mci.net.ua> and Bradley Bell <btb@icculus.org>
* 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 <btb@icculus.org>
* include/ogl_init.h: added proto for ogl_check_mode

4
configure.ac
View file

@ -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])

4
maths/fix.asm
View file

@ -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

6
maths/vecmata.asm
View file

@ -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

4
texmap/tmap_inc.asm
View file

@ -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

6
texmap/tmap_per.asm
View file

@ -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

6
texmap/tmappent.S
View file

@ -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:

6
texmap/tmapppro.S
View file

@ -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: