removed nasm support.

Makefile

@@ -1,6 +1,5 @@
 CC = gcc
 CXX = g++
-NASM = nasm
 
 #CFLAGS = -g -Wall -pipe
 CFLAGS = -g -Wall -pipe -O2
@@ -14,8 +13,6 @@ CXXFLAGS = $(CFLAGS)
 
 LDLIBS = $(shell sdl-config --libs) -lopenal
 
-AFLAGS = -g -w+macro-params -w+orphan-labels -w+number-overflow
-
 ROOT = main.c files.c winapi.c stubs.c version.c mathline.c opengl.c oglfunc.c openal.c cdplayer.c menus.c net.c frustum.c kshape.c map.c maths.c md5.c mem3dc.c mem3dcpp.cpp module.c morph.c object.c shpanim.c sphere.c tables.c vdb.c
 AVP = ai_sight.c avpview.c bh_agun.c bh_ais.c bh_alien.c bh_binsw.c bh_cable.c bh_corpse.c bh_deathvol.c bh_debri.c bh_dummy.c bh_fan.c bh_far.c bh_fhug.c bh_gener.c bh_ldoor.c bh_lift.c bh_light.c bh_lnksw.c bh_ltfx.c bh_marin.c bh_mission.c bh_near.c bh_pargen.c bh_plachier.c bh_plift.c bh_pred.c bh_queen.c bh_rubberduck.c bh_selfdest.c bh_snds.c bh_spcl.c bh_swdor.c bh_track.c bh_types.c bh_videoscreen.c bh_waypt.c bh_weap.c bh_xeno.c bonusabilities.c cconvars.cpp cdtrackselection.cpp cheatmodes.c comp_map.c comp_shp.c consolelog.cpp davehook.cpp deaths.c decal.c detaillevels.c dynamics.c dynblock.c equipmnt.c equiputl.cpp extents.c game.c game_statistics.c gamecmds.cpp gamevars.cpp hmodel.c hud.c inventry.c language.c lighting.c load_shp.c los.c maps.c mempool.c messagehistory.c missions.cpp movement.c paintball.c particle.c pfarlocs.c pheromon.c player.c pmove.c psnd.c psndproj.c pvisible.c savegame.c scream.cpp secstats.c sfx.c stratdef.c targeting.c track.c triggers.c weapons.c
 SHAPES = cube.c
@@ -51,8 +48,6 @@ WIN95OBJ =	$(call OBJNAMES,$(WIN95),win95)
 SRC = $(ROOTSRC) $(AVPSRC) $(SHAPESSRC) $(SUPPORTSRC) $(AVPWIN95SRC) $(FRONTENDSRC) $(GADGETSSRC) $(WIN95SRC)
 OBJ = $(ROOTOBJ) $(AVPOBJ) $(SHAPESOBJ) $(SUPPORTOBJ) $(AVPWIN95OBJ) $(FRONTENDOBJ) $(GADGETSOBJ) $(WIN95OBJ)
 
-.SUFFIXES: .asm
-
 all: AvP
 
 AvP: $(OBJ) # depend $(OBJ)
@@ -60,9 +55,6 @@ AvP: $(OBJ) # depend $(OBJ)
 
 compile: $(OBJ)
 
-.asm.o:
-	$(NASM) $(AFLAGS) -f elf -o $@ $<
-
 clean:
 	-rm -rf depend depend.bak $(OBJ) AvP
 

src/math.asm

@@ -1,51 +0,0 @@
-BITS 32
-SECTION .text
-
-GLOBAL TranslatePoint_Asm
-
-; float *source, float *dest, float *matrix
-; "S" (source), "b" (dest), "D" (matrix)
-TranslatePoint_Asm:
-	fld	dword [esi]
-	fmul	dword [edi]
-	fld	dword [esi+4]
-	fmul	dword [edi+4]
-	fld	dword [esi+8]
-	fmul	dword [edi+8]
-	fxch	st1
-	faddp	st2, st0
-	fld	dword [esi]
-	fmul	dword [edi+16]
-	fxch	st1
-	faddp	st2, st0
-	fld	dword [esi+4]
-	fmul	dword [edi+20]
-	fld	dword [esi+8]
-	fmul	dword [edi+24]
-	fxch	st1
-	faddp	st2, st0
-	fld	dword [esi]
-	fmul	dword [edi+32]
-	fxch	st1
-	faddp	st2, st0
-	fld	dword [esi+4]
-	fmul	dword [edi+36]
-	fld	dword [esi+8]
-	fmul	dword [edi+40]
-	fxch	st1
-	faddp	st2, st0
-	fxch	st3
-	fadd	dword [edi+12]
-	fxch	st1
-	faddp	st3, st0
-	fxch	st1
-	fadd	dword [edi+28]
-	fxch	st2
-	fadd	dword [edi+44]
-	fxch	st1
-	fstp	dword [ebx]
-	fxch	st1
-	fstp	dword [ebx+4]
-	fstp	dword [ebx+8]
-	
-	ret

src/mathline.c

@@ -627,16 +627,3 @@ __asm__ volatile
 	fti_itmp = (int)fti_fptmp;	
 #endif
 }
-
-#if 0 // SBF - converted to C in kshape.c 
-void TranslatePoint(float *source, float *dest, float *matrix)
-{
-/* TODO - implement the inline assembly here? */
-/* Moved it to a separate file because I can't figure out the damn syntax! */
-/* This is currently not inlined for testing */
-__asm__("call   TranslatePoint_Asm      \n\t"
-        :
-        : "S" (source), "b" (dest), "D" (matrix)
-        );
-}
-#endif