--- doom/makefile	2018/04/24 16:37:52	1.1.1.1
+++ doom/makefile	2018/04/24 16:38:34	1.1.1.3
@@ -1,258 +1,120 @@
 
-OFILES = \
-init.o \
-jagonly.o \
-\
-gpubase.o \
-dspbase.o \
-lastobj.o \
-decomp.o \
-eeprom.o \
-\
-f_main.o \
-in_main.o \
-am_main.o \
-st_main.o \
-m_main.o \
-o_main.o \
-\
-comnjag.o \
-vsprintf.o \
-d_main.o \
-g_game.o \
-info.o \
-p_ceilng.o \
-p_doors.o \
-p_enemy.o \
-p_floor.o \
-p_inter.o \
-p_lights.o \
-p_map.o \
-p_maputl.o \
-p_mobj.o \
-p_plats.o \
-p_pspr.o \
-p_setup.o \
-p_spec.o \
-p_switch.o \
-p_telept.o \
-p_tick.o \
-p_base.o \
-p_user.o \
-p_sight.o \
-p_shoot.o \
-p_move.o \
-p_change.o \
-p_slide.o \
-r_main.o \
-r_data.o \
-r_phase1.o \
-r_phase2.o \
-r_phase3.o \
-r_phase4.o \
-r_phase5.o \
-r_phase6.o \
-r_phase7.o \
-r_phase8.o \
-r_phase9.o \
-s_sound.o \
-sounds.o \
-sprinfo.o \
-tables.o \
-w_wad.o \
-z_zone.o \
-sfx.o	\
-music.o
-
-jagdoom : $(OFILES)
-	aln -c mydoom.lnk 
-#	rdbjag doom
-
-GAS2OBJ = mac -fb $?
-Cx2OBJ = gcc -x c++ -m68000 -Wall -DJAGUAR -O2  -c -o $@ $<
-# C2OBJ = gcc263 -b m68k -Wall -DJAGUAR -O2 -c -o $@ $?
-C2OBJ = gcc -B/prog/jaguar/bin/ -b m68k -V2.6 -Wall -DJAGUAR -O2 -c -o $@ $?
-
-#
-# 68k jaguar specific asm files
-#
-#init.o :init.s
-#	cpp -DJAGUAR -DJAGPROFILE -lang-c++ -nostdinc $< $*.i
-#	as -mc68000  -o $@ $*.i
-lastobj.o :lastobj.s
-#	cpp -DJAGUAR -DJAGPROFILE -lang-c++ -nostdinc $< $*.i
-#	as -mc68000  -o $@ $*.i
-	$(GAS2OBJ)
-
-eeprom.o : eeprom.gas
-	$(GAS2OBJ)
-
-#
-# gpu/dsp jaguar specific asm files
-#
-gpubase.o : gpubase.gas
-	$(GAS2OBJ)
-dspbase.o : dspbase.gas
-	$(GAS2OBJ)
-decomp.o : decomp.gas
-	$(GAS2OBJ)
-		
+# --------------------------------------------------------------------------
 #
-# 68k jaguar specific C files
-#	
-jagonly.o : jagonly.c
-	$(C2OBJ)
-
-#
-# non-gameloop files
+# WCC386 Options:
 #
-f_main.o : f_main.c
-	$(C2OBJ)
-in_main.o : in_main.c
-	$(C2OBJ)
-am_main.o : am_main.c
-	$(C2OBJ)
-o_main.o : o_main.c
-	$(C2OBJ)
-st_main.o : st_main.c
-	$(C2OBJ)
-m_main.o : m_main.c
-	$(C2OBJ)
+#      4r  use 80486 timings and register argument passing
+#       c  compile only
+#      d1  include line number debugging information
+#      d2  include full sybolic debugging information
+#      ei  force enums to be of type int
+#       j  change char default from unsigned to signed
+#      oa  relax aliasing checking
+#      od  do not optimize
+#  oe[=#]  expand functions inline, # = quads (default 20)
+#      oi  use the inline library functions
+#      om  generate inline 80x87 code for math functions
+#      ot  optimize for time
+#      ox  maximum optimization
+#       s  remove stack overflow checks
+#     zp1  align structures on bytes
+#      zq  use quiet mode
+#  /i=dir  add include directories
+#
+# --------------------------------------------------------------------------
+
+LOCOBJS = &
+ i_cdmus.obj &
+ i_cyber.obj &
+ i_ibm.obj &
+ i_ibm_a.obj &
+ i_sound.obj &
+ linear.obj
+
+GLOBOBJS = &
+ am_map.obj &
+ a_action.obj &
+ ct_chat.obj &
+ d_net.obj &
+ f_finale.obj &
+ g_game.obj &
+ h2_main.obj &
+ info.obj &
+ in_lude.obj &
+ mn_menu.obj &
+ m_misc.obj &
+ p_acs.obj &
+ p_anim.obj &
+ p_ceilng.obj &
+ p_doors.obj &
+ p_enemy.obj &
+ p_floor.obj &
+ p_inter.obj &
+ p_lights.obj &
+ p_map.obj &
+ p_maputl.obj &
+ p_mobj.obj &
+ p_plats.obj &
+ p_pspr.obj &
+ p_setup.obj &
+ p_sight.obj &
+ p_spec.obj &
+ p_switch.obj &
+ p_telept.obj &
+ p_tick.obj &
+ p_things.obj &
+ p_user.obj &
+ po_man.obj &
+ r_bsp.obj &
+ r_data.obj &
+ r_draw.obj &
+ r_main.obj &
+ r_plane.obj &
+ r_segs.obj &
+ r_things.obj &
+ sb_bar.obj &
+ sc_man.obj &
+ sn_sonix.obj &
+ st_start.obj &
+ sv_save.obj &
+ sounds.obj &
+ tables.obj &
+ v_video.obj &
+ w_wad.obj &
+ z_zone.obj
+
+default: .SYMBOLIC
+ @echo.
+ @echo You must use M.BAT to build Hexen.
+ @echo Type "M /?" for help.
+ @echo.
+
+#
+# DEBUG Build:
+#
+#  The EXTERNOPT macro should be set to /d2
+#
+# FINAL Build:
+#
+#  The EXTERNOPT macro should be set to /dNORANGECHECKING
+#
+
+VERSION_ID = BCP
+
+VERSIONOPT = /dVER_ID="$(VERSION_ID)"
+
+CCOPTS = $(EXTERNOPT) $(VERSIONOPT) /omaxet /zp1 /4r /ei /j /zq /i=dmx
+
+hex.exe : $(LOCOBJS) $(GLOBOBJS)
+ wlink @hex.lnk
+ ncopy hex.exe striphex.exe
+ wstrip striphex.exe
+ 4gwbind 4gwpro.exe striphex.exe hexen.exe -V
+ ncopy hex.map v_$(VERSION_ID).map
+ prsucc
 
-#
-# common files
-#
-comnjag.o : comnjag.c
-	$(C2OBJ)
-vsprintf.o : vsprintf.c
-	$(C2OBJ)
-d_main.o : d_main.c
-	$(C2OBJ)
-g_game.o : g_game.c
-	$(C2OBJ)
-info.o : info.c
-	$(C2OBJ)
-p_ceilng.o : p_ceilng.c
-	$(C2OBJ)
-p_doors.o : p_doors.c
-	$(C2OBJ)
-p_enemy.o : p_enemy.c
-	$(C2OBJ)
-p_floor.o : p_floor.c
-	$(C2OBJ)
-p_inter.o : p_inter.c
-	$(C2OBJ)
-p_lights.o : p_lights.c
-	$(C2OBJ)
-p_map.o : p_map.c
-	$(C2OBJ)
-p_maputl.o : p_maputl.c
-	$(C2OBJ)
-p_mobj.o : p_mobj.c
-	$(C2OBJ)
-p_plats.o : p_plats.c
-	$(C2OBJ)
-p_pspr.o : p_pspr.c
-	$(C2OBJ)
-p_setup.o : p_setup.c
-	$(C2OBJ)
-p_spec.o : p_spec.c
-	$(C2OBJ)
-p_switch.o : p_switch.c
-	$(C2OBJ)
-p_telept.o : p_telept.c
-	$(C2OBJ)
-p_tick.o : p_tick.c
-	$(C2OBJ)
-p_user.o : p_user.c
-	$(C2OBJ)
-#p_base.o : p_base.c
-#	$(C2OBJ)
-p_base.o : p_base.gas
-	$(GAS2OBJ)
-#p_sight.o : p_sight.c
-#	$(C2OBJ)
-p_sight.o : p_sight.gas
-	$(GAS2OBJ)
-#p_shoot.o : p_shoot.c
-#	$(C2OBJ)
-p_shoot.o : p_shoot.gas
-	$(GAS2OBJ)
-p_change.o : p_change.c
-	$(C2OBJ)
-#p_move.o : p_move.c
-#	$(C2OBJ)
-p_move.o : p_move.gas
-	$(GAS2OBJ)
-#p_slide.o : p_slide.c
-#	$(C2OBJ)
-p_slide.o : p_slide.gas
-	$(GAS2OBJ)
-	
-	
-r_main.o : r_main.c
-	$(C2OBJ)
-r_data.o : r_data.c
-	$(C2OBJ)
-s_sound.o : s_sound.c
-	$(C2OBJ)
-sounds.o : sounds.c
-	$(C2OBJ)
-sprinfo.o : sprinfo.c
-	$(C2OBJ)
-tables.o : tables.c
-	$(C2OBJ)
-w_wad.o : w_wad.c
-	$(C2OBJ)
-z_zone.o : z_zone.c
-	$(C2OBJ)
-
-#
-# hand coded common files
-#
-#r_phase1.o : r_phase1.c
-#	$(C2OBJ)
-r_phase1.o : r_phase1.gas
-	$(GAS2OBJ)
-#r_phase2.o : r_phase2.c
-#	$(C2OBJ)
-r_phase2.o : r_phase2.gas
-	$(GAS2OBJ)
-#r_phase3.o : r_phase3.c
-#	$(C2OBJ)
-r_phase3.o : r_phase3.gas
-	$(GAS2OBJ)
-#r_phase4.o : r_phase4.c
-#	$(C2OBJ)
-r_phase4.o : r_phase4.gas
-	$(GAS2OBJ)
-#r_phase5.o : r_phase5.c
-#	$(C2OBJ)
-r_phase5.o : r_phase5.gas
-	$(GAS2OBJ)
-#r_phase6.o : r_phase6.c
-#	$(C2OBJ)
-r_phase6.o : r_phase6.gas
-	$(GAS2OBJ)
-#r_phase7.o : r_phase7.c
-#	$(C2OBJ)
-r_phase7.o : r_phase7.gas
-	$(GAS2OBJ)
-#r_phase8.o : r_phase8.c
-#	$(C2OBJ)
-r_phase8.o : r_phase8.gas
-	$(GAS2OBJ)
-r_phase9.o : r_phase9.gas
-	$(GAS2OBJ)
-
-sfx.o : sfx.gas
-	$(GAS2OBJ)
-music.o : music.gas
-	$(GAS2OBJ)
-
-
-clean :
-	rm *.o
-	rm *.abs
-	cp init.sav init.o
+.c.obj :
+ wcc386 $(CCOPTS) $[*
 
+.asm.obj :
+ tasm /mx $[*