diff options
| -rw-r--r-- | Makefile.DJ | 6 | ||||
| -rw-r--r-- | Makefile.mgw | 6 | ||||
| -rw-r--r-- | progs/samples/Makefile.DJ | 5 | ||||
| -rw-r--r-- | progs/samples/Makefile.mgw | 5 |
4 files changed, 4 insertions, 18 deletions
diff --git a/Makefile.DJ b/Makefile.DJ index d269fcdbb0e..78ebf43efb9 100644 --- a/Makefile.DJ +++ b/Makefile.DJ @@ -31,8 +31,6 @@ # Available options: # # Environment variables: -# CPU optimize for the given processor. -# default = pentium # GLU=[mesa|sgi] specify GLU directory; can be `sgi' (requires GNU/C++) # or `mesa'. # default = mesa @@ -59,12 +57,10 @@ .PHONY : all libgl libglu libglut clean realclean -CPU ?= pentium - GLU ?= mesa CFLAGS = -Wall -W -pedantic -CFLAGS += -O2 -ffast-math -mtune=$(CPU) +CFLAGS += -O2 -ffast-math export CFLAGS diff --git a/Makefile.mgw b/Makefile.mgw index d544b09398c..70c264a8d86 100644 --- a/Makefile.mgw +++ b/Makefile.mgw @@ -31,8 +31,6 @@ # Available options: # # Environment variables: -# CPU optimize for the given processor. -# default = pentium # GLIDE path to Glide3 SDK; used with FX. # default = $(TOP)/glide3 # FX=1 build for 3dfx Glide3. Note that this disables @@ -57,8 +55,6 @@ .PHONY : all libgl clean realclean -CPU ?= pentium - ifeq ($(ICD),1) # when -std=c99 mingw will not define WIN32 CFLAGS = -Wall -W -Werror @@ -66,7 +62,7 @@ else # I love c89 CFLAGS = -Wall -W -pedantic endif -CFLAGS += -O2 -ffast-math -mtune=$(CPU) +CFLAGS += -O2 -ffast-math export CFLAGS diff --git a/progs/samples/Makefile.DJ b/progs/samples/Makefile.DJ index 557695a66cb..cda4e059418 100644 --- a/progs/samples/Makefile.DJ +++ b/progs/samples/Makefile.DJ @@ -31,8 +31,6 @@ # Available options: # # Environment variables: -# CPU optimize for the given processor. -# default = pentium # GLIDE path to Glide3 SDK; used with FX. # default = $(TOP)/glide3 # FX=1 build for 3dfx Glide3. Note that this disables @@ -54,12 +52,11 @@ .SECONDARY: ../util/readtex.o ../util/showbuffer.o TOP = ../.. -CPU ?= pentium GLIDE ?= $(TOP)/glide3 CC = gcc CFLAGS = -Wall -W -pedantic -CFLAGS += -O2 -ffast-math -mtune=$(CPU) +CFLAGS += -O2 -ffast-math CFLAGS += -I$(TOP)/include -I../util CFLAGS += -DGLUT_IMPORT_LIB ifeq ($(FX),1) diff --git a/progs/samples/Makefile.mgw b/progs/samples/Makefile.mgw index 54dbfb706ad..11935405783 100644 --- a/progs/samples/Makefile.mgw +++ b/progs/samples/Makefile.mgw @@ -31,8 +31,6 @@ # Available options: # # Environment variables: -# CPU optimize for the given processor. -# default = pentium # # Targets: # <file.exe> build a specific file @@ -45,11 +43,10 @@ .SECONDARY: ../util/readtex.o ../util/showbuffer.o TOP = ../.. -CPU ?= pentium CC = mingw32-gcc CFLAGS = -Wall -W -pedantic -CFLAGS += -O2 -ffast-math -mtune=$(CPU) +CFLAGS += -O2 -ffast-math CFLAGS += -I$(TOP)/include -I../util ifeq ($(FX),1) CFLAGS += -DFX |