diff options
| author | olgeni <olgeni@FreeBSD.org> | 2003-11-19 22:07:55 +0800 |
|---|---|---|
| committer | olgeni <olgeni@FreeBSD.org> | 2003-11-19 22:07:55 +0800 |
| commit | c7a125c28d1db5247b34d25ecac4e2ff8f82ba8c (patch) | |
| tree | ab4d8ebd2e919939cf1b9d2287b96b21bc5e72d6 /devel/esdl/files/patch-c__src_Makefile | |
| parent | 577ac92b03187c3f8b78ec0353c0abb6b8b7fd69 (diff) | |
| download | freebsd-ports-graphics-c7a125c28d1db5247b34d25ecac4e2ff8f82ba8c.tar.gz freebsd-ports-graphics-c7a125c28d1db5247b34d25ecac4e2ff8f82ba8c.tar.zst freebsd-ports-graphics-c7a125c28d1db5247b34d25ecac4e2ff8f82ba8c.zip | |
Upgrade to version 0.93.0909.
PR: 59382
Submitted by: Sebastian Yepes F. [ESN] <esn@x123.info>
Diffstat (limited to 'devel/esdl/files/patch-c__src_Makefile')
| -rw-r--r-- | devel/esdl/files/patch-c__src_Makefile | 63 |
1 files changed, 33 insertions, 30 deletions
diff --git a/devel/esdl/files/patch-c__src_Makefile b/devel/esdl/files/patch-c__src_Makefile index ea8feb12ab9..d43fcb9373f 100644 --- a/devel/esdl/files/patch-c__src_Makefile +++ b/devel/esdl/files/patch-c__src_Makefile @@ -1,42 +1,45 @@ - -$FreeBSD$ - ---- c_src/Makefile.orig Mon May 26 16:13:17 2003 -+++ c_src/Makefile Fri Jul 18 11:42:01 2003 -@@ -5,7 +5,7 @@ - # $Id: Makefile,v 1.8 2003/05/26 08:00:46 dgud Exp $ - # - --OGLDIR = /usr -+OGLDIR = ${X11BASE} +--- c_src/Makefile.ori Tue Sep 9 10:28:24 2003 ++++ c_src/Makefile Mon Nov 17 18:34:14 2003 +@@ -11,7 +11,7 @@ + include ../win32_conf/mingw_vars.mk + else + +- OGLDIR = /usr ++ OGLDIR = ${X11BASE} # Uncomment these if your opengl header is located in another directory than # the usual $(OGLDIR)/include/GL/gl.h -@@ -15,13 +15,13 @@ - GL_LIBS = -L$(OGLDIR)/lib -lGL -lGLU - GL_INCS = -I$(OGLDIR)/include/$(GL_INCLUDE_DIR) +@@ -21,14 +21,13 @@ + GL_LIBS = -L$(OGLDIR)/lib -lGL -lGLU + GL_INCS = -I$(OGLDIR)/include/$(GL_INCLUDE_DIR) --SDL_LIBS = $(shell sdl-config --libs) -+SDL_LIBS = $(shell $(SDL_CONFIG) --libs) - LIBS = $(GL_LIBS) $(SDL_LIBS) -lm +- SDL_LIBS = $(shell sdl-config --libs) +- SDL_INCS = $(shell sdl-config --cflags) ++ SDL_LIBS = $(shell $(SDL_CONFIG) --libs) ++ SDL_INCS = $(shell $(SDL_CONFIG) --cflags) --SDLINCS = $(shell sdl-config --cflags) -+SDLINCS = $(shell $(SDL_CONFIG) --cflags) + LIBS = $(GL_LIBS) $(SDL_LIBS) -lm --CFLAGS = -g -O2 -funroll-loops -Wall -ffast-math -fpic -fomit-frame-pointer \ -- $(USE_GL_INCLUDE_DIR) -DSHM -DPTHREADS $(GL_INCS) $(SDLINCS) $(ERLINC) -+CFLAGS += -funroll-loops -Wall -ffast-math -fpic -fomit-frame-pointer \ -+ $(USE_GL_INCLUDE_DIR) -DSHM -DPTHREADS $(GL_INCS) $(SDLINCS) +- CFLAGS = -g -O2 -funroll-loops -Wall -ffast-math -fpic \ +- -fomit-frame-pointer $(USE_GL_INCLUDE_DIR) -DSHM \ +- -DPTHREADS $(GL_INCS) $(SDL_INCS) $(ERL_INCS) ++ CFLAGS += -O2 -funroll-loops -Wall -ffast-math -fpic -fomit-frame-pointer \ ++ $(USE_GL_INCLUDE_DIR) -DSHM -DPTHREADS $(GL_INCS) $(SDL_INCS) $(ERL_INCS) - TARGETDIR = ../priv + CLINKFLAGS = -fpic -shared + +@@ -38,13 +37,13 @@ + ERL_DIR := $(shell echo 'io:format("~s~n",[code:root_dir()]),halt().' | erl | sed 's,^[0-9]*> *,,g' | tail +2) + ERL_INCS = -I$(ERL_DIR)/usr/include -@@ -29,8 +29,8 @@ - ERL_DIR := $(shell echo 'io:format("~s~n",[code:root_dir()]),halt().' | erl | sed 's,^[0-9]*> *,,g' | tail +2) - ERLINC = -I$(ERL_DIR)/usr/include +- CC = gcc ++ CC ?= gcc + + endif + + TARGETDIR = ../priv --CC = gcc --GCC_O = $(CC) -c $(CFLAGS) $(INCS) $< -+CC ?= gcc +-GCC_O = $(CC) -c $(CFLAGS) $< +GCC_O = $(CC) -c $(CFLAGS) $(INCS) $(ERLINC) $< # Files |