---- doomlegacy/makefile.orig Sun May 6 01:39:28 2001
-+++ doomlegacy/makefile Sat Jun 30 11:20:55 2001
-@@ -366,7 +366,7 @@
- \r
- # build a normal optimised version\r
- ifdef PGCC\r
-- CFLAGS = $(OPTS) -mpentium -O6 -ffast-math -fomit-frame-pointer -fwritable-strings\r
-+ CFLAGS = $(OPTS) $(OPTFLAGS) -ffast-math -fomit-frame-pointer -fwritable-strings\r
- # -fgcse -fcse-follow-jumps -fcse-skip-blocks -frerun-cse-after-loop -ffunction-cse \\r
- # -fexpensive-optimizations -fforce-mem -fstrength-reduce -fthread-jumps \\r
- # -fregmove -fschedule-insns -fschedule-insns2 -fmove-all-movables \\r
-@@ -506,7 +506,7 @@
- \r
- #dll\r
- dll : $(O)/r_opengl.o $(O)/ogl_x11.o\r
-- $(CC) -mpentium -O6 -o $(BIN)/r_opengl.so -shared -nostartfiles $(O)/r_opengl.o $(O)/ogl_x11.o -L/usr/X11R6/lib -L/usr/local/lib -lGL -lX11 -lXext -lGLU -lm\r
-+ $(CC) $(OPTFLAGS) -o $(BIN)/r_opengl.so -shared -nostartfiles $(O)/r_opengl.o $(O)/ogl_x11.o -L/usr/X11R6/lib -L/usr/local/lib -lGL -lX11 -lXext -lGLU -lm\r
- \r
- musserv:\r
- @mkdir -p $(MUSSERV)/linux\r
-@@ -520,7 +520,7 @@
- \r
- ifdef LINUX\r
- $(O)/r_opengl.o: hardware/r_opengl/r_opengl.c hardware/r_opengl/r_opengl.h\r
-- $(CC) -mpentium -O6 -o $(O)/r_opengl.o -DHWRENDER -DVID_X11 -DLINUX -DPOLL_POINTER -shared -nostartfiles -I/usr/X11R6/include -c hardware/r_opengl/r_opengl.c\r
-+ $(CC) $(OPTFLAGS) -o $(O)/r_opengl.o -DHWRENDER -DVID_X11 -DLINUX -DPOLL_POINTER -shared -nostartfiles -I/usr/X11R6/include -c hardware/r_opengl/r_opengl.c\r
- endif\r
- \r
- ifdef SDL\r
-@@ -529,7 +529,7 @@
- endif\r
- \r
- $(O)/ogl_x11.o: hardware/r_opengl/ogl_x11.c hardware/r_opengl/r_opengl.h\r
-- $(CC) -mpentium -O6 -o $(O)/ogl_x11.o -DHWRENDER -DVID_X11 -DLINUX -DPOLL_POINTER -shared -nostartfiles -I/usr/X11R6/include -c hardware/r_opengl/ogl_x11.c\r
-+ $(CC) $(OPTFLAGS) -o $(O)/ogl_x11.o -DHWRENDER -DVID_X11 -DLINUX -DPOLL_POINTER -shared -nostartfiles -I/usr/X11R6/include -c hardware/r_opengl/ogl_x11.c\r
- \r
- \r
- #dependecy made by gcc itself ! (see makedep.mak for more)\r
---- doomlegacy/linux_x/sndserv/Makefile.orig Sun Apr 30 21:50:38 2000
-+++ doomlegacy/linux_x/sndserv/Makefile Sat Jun 30 11:20:08 2001
-@@ -19,7 +19,7 @@
- #\r
- \r
- CC=gcc\r
--CFLAGS=-O2 -m486 -Wall -DNORMALUNIX -DLINUX\r
-+CFLAGS=$(OPTFLAGS) -Wall -DNORMALUNIX -DLINUX\r
- LDFLAGS=\r
- LIBS=-lm\r
- \r
---- doomlegacy/linux_x/musserv/Makefile.linux.orig Sun Feb 27 01:42:12 2000
-+++ doomlegacy/linux_x/musserv/Makefile.linux Sat Jun 30 11:20:08 2001
+--- doomlegacy_142_src/linux_x/musserv/Makefile.linux.orig Sat Feb 22 21:12:31 2003
++++ doomlegacy_142_src/linux_x/musserv/Makefile.linux Sat Feb 22 21:12:52 2003
@@ -3,7 +3,7 @@
- #\r
- \r
- CC = gcc\r
--CFLAGS = -I. -Wall -O2 -m486\r
-+CFLAGS = -I. -Wall $(OPTFLAGS)\r
- LDFLAGS =\r
- #LDFLAGS = -static\r
- \r
---- doomlegacy/tools/makefile.orig Thu Jan 25 23:15:46 2001
-+++ doomlegacy/tools/makefile Sat Jun 30 11:20:08 2001
+ #
+
+ CC = gcc
+-CFLAGS = -I. -Wall -O2 -m486
++CFLAGS = -I. -Wall $(OPTFLAGS)
+ LDFLAGS =
+ #LDFLAGS = -static
+
+--- doomlegacy_142_src/linux_x/sndserv/Makefile.orig Sat Feb 22 21:11:50 2003
++++ doomlegacy_142_src/linux_x/sndserv/Makefile Sat Feb 22 21:12:12 2003
+@@ -22,7 +22,7 @@
+ #
+
+ CC=gcc
+-CFLAGS=-O2 -m486 -Wall -DNORMALUNIX -DLINUX
++CFLAGS=$(OPTFLAGS) -Wall -DNORMALUNIX -DLINUX
+ ifdef FREEBSD
+ CFLAGS:=${CFLAGS} -DFREEBSD
+ endif
+--- doomlegacy_142_src/tools/makefile.orig Sat Feb 22 21:13:11 2003
++++ doomlegacy_142_src/tools/makefile Sat Feb 22 21:14:30 2003
@@ -1,24 +1,24 @@
- \r
- default: dircomp2.c\r
-- gcc -O6 -mpentium -Wall -s dircomp2.c -o dircomp2.exe\r
-+ gcc $(OPTFLAGS) -Wall -s dircomp2.c -o dircomp2.exe\r
- \r
- asm:\r
-- gcc -O6 -mpentium -Wall -g dircomp2.c -o tmp.exe\r
-+ gcc $(OPTFLAGS) -Wall -g dircomp2.c -o tmp.exe\r
- objdump -dS tmp.exe --debugging --no-show-raw-insn > dircomp2.s\r
- del tmp.exe\r
- \r
- h2d: h2d.c\r
-- gcc -O6 -mpentium -Wall -s h2d.c -o h2d.exe\r
-+ gcc $(OPTFLAGS) -Wall -s h2d.c -o h2d.exe\r
- \r
- dckconv: dckconv.c\r
-- gcc -O6 -mpentium -Wall -s dckconv.c -o dckconv.exe\r
-+ gcc $(OPTFLAGS) -Wall -s dckconv.c -o dckconv.exe\r
- \r
- dckconv2: dckconv2.c\r
-- gcc -O6 -mpentium -Wall -s dckconv2.c -o dckconv2.exe\r
-+ gcc $(OPTFLAGS) -Wall -s dckconv2.c -o dckconv2.exe\r
- \r
- dckcomp: dckcomp.c\r
-- gcc -O6 -mpentium -Wall -s dckcomp.c -o dckcomp.exe\r
-+ gcc $(OPTFLAGS) -Wall -s dckcomp.c -o dckcomp.exe\r
- \r
- convert: convert.c\r
-- gcc -O6 -mpentium -Wall -s convert.c -o convert.exe\r
-- \r
-+ gcc $(OPTFLAGS) -Wall -s convert.c -o convert.exe\r
-+\r
+
+ default: dircomp2.c
+- gcc -O6 -mpentium -Wall -s dircomp2.c -o dircomp2.exe
++ $(CC) $(OPTFLAGS) -Wall dircomp2.c -o dircomp2.exe
+
+ asm:
+- gcc -O6 -mpentium -Wall -g dircomp2.c -o tmp.exe
++ $(CC) $(OPTFLAGS) -Wall -g dircomp2.c -o tmp.exe
+ objdump -dS tmp.exe --debugging --no-show-raw-insn > dircomp2.s
+ del tmp.exe
+
+ h2d: h2d.c
+- gcc -O6 -mpentium -Wall -s h2d.c -o h2d.exe
++ $(CC) $(OPTFLAGS) -Wall h2d.c -o h2d.exe
+
+ dckconv: dckconv.c
+- gcc -O6 -mpentium -Wall -s dckconv.c -o dckconv.exe
++ $(CC) $(OPTFLAGS) -Wall dckconv.c -o dckconv.exe
+
+ dckconv2: dckconv2.c
+- gcc -O6 -mpentium -Wall -s dckconv2.c -o dckconv2.exe
++ $(CC) $(OPTFLAGS) -Wall dckconv2.c -o dckconv2.exe
+
+ dckcomp: dckcomp.c
+- gcc -O6 -mpentium -Wall -s dckcomp.c -o dckcomp.exe
++ $(CC) $(OPTFLAGS) -Wall dckcomp.c -o dckcomp.exe
+
+ convert: convert.c
+- gcc -O6 -mpentium -Wall -s convert.c -o convert.exe
++ $(CC) $(OPTFLAGS) -Wall convert.c -o convert.exe
+
+--- doomlegacy-1.42/doomlegacy_142_src/makefile.orig 2004-04-18 23:02:24.000000000 +0200
++++ doomlegacy-1.42/doomlegacy_142_src/makefile 2006-10-23 15:55:16.780971750 +0200
+@@ -328,7 +328,7 @@
+
+ SFLAGS=
+
+- CFLAGS=-g
++ CFLAGS=
+
+ OBJS=$(O)/i_video.o $(O)/vid_vesa.o
+
+@@ -353,8 +353,7 @@
+
+ ifdef X
+
+- OPTS := $(OPTS) -DVID_X11 $(POLL_POINTER) -I. -I/usr/X11R6/include
+- LDFLAGS=-L/usr/X11R6/lib
++ OPTS := $(OPTS) -DVID_X11 $(POLL_POINTER) -I.
+ LIBS=-lXext -lX11 -lm -ldl -lXxf86vm
+ ifdef WITH_DGA
+ OPTS += -DWITH_DGA
+@@ -405,8 +404,7 @@
+
+ ifdef X
+
+- OPTS := $(OPTS) -DVID_X11 $(POLL_POINTER) -I. -I/usr/X11R6/include
+- LDFLAGS=-L/usr/X11R6/lib
++ OPTS := $(OPTS) -DVID_X11 $(POLL_POINTER) -I.
+ LIBS=-lXext -lX11 -lm -lXxf86vm -lipx -lkvm -pthread
+ # name of the exefile
+ EXENAME=llxdoom
+@@ -490,9 +488,8 @@
+ $(O)/r_opengl.o $(O)/ogl_sdl.o $(O)/hwsym_sdl.o
+
+ DEBUGLIBS=$(LIBS)
+- OPTS := -DLINUX -DHWRENDER -DDIRECTFULLSCREEN -DHAVE_MIXER -DSDL -DVID_X11 $(POLL_POINTER) -I. -I/usr/local/include/SDL -I/usr/X11R6/include -Wall
++ OPTS := -DLINUX -DHWRENDER -DDIRECTFULLSCREEN -DHAVE_MIXER -DSDL -DVID_X11 $(POLL_POINTER) -I. -Wall
+
+- LDFLAGS=-L/usr/X11R6/lib -L/usr/local/lib
+ LIBS=-lm -lSDL -lSDL_mixer -lpthread -lGL -lGLU
+ DEBUGLIBS=$(LIBS)
+
+@@ -545,23 +542,23 @@
+
+ # build with profiling information
+ ifdef PGCC
+- CFLAGS = -g -pg -DPARANOIA -fwritable-strings $(OPTS)
++ CFLAGS = -g -pg $(OPTFLAGS) -DPARANOIA $(OPTS)
+ else
+- CFLAGS = -g -pg $(M4) -O3 -ffast-math -fwritable-strings $(OPTS)
++ CFLAGS = -g -pg $(OPTFLAGS) -ffast-math $(OPTS)
+ endif
+- LDFLAGS = -g -pg -L/usr/X11R6/lib
++ LDFLAGS = -g -pg
+ else
+
+
+ # build a normal optimised version
+ ifdef PGCC
+- CFLAGS = $(OPTS) $(M5) -O6 -ffast-math -fomit-frame-pointer -fwritable-strings
++ CFLAGS = $(OPTS) $(OPTFLAGS) -ffast-math
+ # -fgcse -fcse-follow-jumps -fcse-skip-blocks -frerun-cse-after-loop -ffunction-cse \
+ # -fexpensive-optimizations -fforce-mem -fstrength-reduce -fthread-jumps \
+ # -fregmove -fschedule-insns -fschedule-insns2 -fmove-all-movables \
+ # -fcaller-saves -finline-functions -mieee-fp -mfp-ret-in-387 -m80387 -mhard-float -finline
+ else
+- CFLAGS = $(M4) -O3 -ffast-math -fomit-frame-pointer -fwritable-strings $(OPTS)
++ CFLAGS = $(OPTFLAGS) -ffast-math $(OPTS)
+ endif
+ endif
+
+@@ -735,7 +732,7 @@
+
+ #dll
+ dll : $(O)/r_opengl.o $(O)/ogl_x11.o
+- $(CC) $(M5) -O6 -o $(BIN)/r_opengl.so -shared -nostartfiles $(O)/r_opengl.o $(O)/ogl_x11.o -L/usr/X11R6/lib -L/usr/local/lib -lX11 -lXext -lGL -lGLU -lm
++ $(CC) $(OPTFLAGS) -o $(BIN)/r_opengl.so -shared -nostartfiles $(O)/r_opengl.o $(O)/ogl_x11.o -lX11 -lXext -lGL -lGLU -lm
+
+ musserv:
+ @mkdir -p $(MUSSERV)/linux
+@@ -749,12 +746,12 @@
+
+ ifdef LINUX
+ $(O)/r_opengl.o: hardware/r_opengl/r_opengl.c hardware/r_opengl/r_opengl.h
+- $(CC) $(M5) -O6 -o $(O)/r_opengl.o -DHWRENDER -DVID_X11 -DLINUX $(POLL_POINTER) -shared -nostartfiles -I/usr/X11R6/include -c hardware/r_opengl/r_opengl.c
++ $(CC) $(OPTFLAGS) -o $(O)/r_opengl.o -DHWRENDER -DVID_X11 -DLINUX $(POLL_POINTER) -shared -nostartfiles -c hardware/r_opengl/r_opengl.c
+ endif
+
+ ifdef SDL
+ $(O)/r_opengl.o: hardware/r_opengl/r_opengl.c hardware/r_opengl/r_opengl.h
+- $(CC) $(CFLAGS) $(LDFLAGS) $(WFLAGS) -I/usr/X11R6/include -c $< -o $@
++ $(CC) $(CFLAGS) $(LDFLAGS) $(WFLAGS) -c $< -o $@
+ endif
+
+ ifdef FREEBSD
+@@ -763,7 +760,7 @@
+ $(CC) $(CFLAGS) $(LDFLAGS) $(WFLAGS) -I/usr/X11R6/include -c $< -o $@
+ else #FBSD_SDL
+ $(O)/r_opengl.o: hardware/r_opengl/r_opengl.c hardware/r_opengl/r_opengl.h
+- $(CC) $(M5) -O6 -o $(O)/r_opengl.o -DHWRENDER -DVID_X11 -DLINUX -DFREEBSD $(POLL_POINTER) -shared -nostartfiles -I/usr/X11R6/include -c hardware/r_opengl/r_opengl.c
++ $(CC) $(OPTFLAGS) -o $(O)/r_opengl.o -DHWRENDER -DVID_X11 -DLINUX -DFREEBSD $(POLL_POINTER) -shared -nostartfiles -c hardware/r_opengl/r_opengl.c
+ endif #FBSD_SDL
+ endif #FREEBSD
+
+@@ -774,10 +771,10 @@
+
+ ifndef FREEBSD
+ $(O)/ogl_x11.o: hardware/r_opengl/ogl_x11.c hardware/r_opengl/r_opengl.h
+- $(CC) $(M5) -O6 -o $(O)/ogl_x11.o -DHWRENDER -DVID_X11 -DLINUX $(POLL_POINTER) -shared -nostartfiles -I/usr/X11R6/include -c hardware/r_opengl/ogl_x11.c
++ $(CC) $(OPTFLAGS) -o $(O)/ogl_x11.o -DHWRENDER -DVID_X11 -DLINUX $(POLL_POINTER) -shared -nostartfiles -c hardware/r_opengl/ogl_x11.c
+ else
+ $(O)/ogl_x11.o: hardware/r_opengl/ogl_x11.c hardware/r_opengl/r_opengl.h
+- $(CC) $(M5) -O6 -o $(O)/ogl_x11.o -DHWRENDER -DVID_X11 -DLINUX -DFREEBSD $(POLL_POINTER) -shared -nostartfiles -I/usr/X11R6/include -c hardware/r_opengl/ogl_x11.c
++ $(CC) $(OPTFLAGS) -o $(O)/ogl_x11.o -DHWRENDER -DVID_X11 -DLINUX -DFREEBSD $(POLL_POINTER) -shared -nostartfiles -c hardware/r_opengl/ogl_x11.c
+ endif
+
+
projects / packages / doomlegacy.git / blobdiff