Attachment 17907 Details for Bug 16860 – Fix link issues in 32bit mode

[patch] Fix link issues in 32bit mode

Makefile.patch (text/plain), 2.85 KB, created by Guillaume Melquiond on 2008-07-26 03:26:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Guillaume Melquiond

Created: 2008-07-26 03:26:30 UTC

Size: 2.85 KB

patch

obsolete

>diff --git a/progs/demos/Makefile b/progs/demos/Makefile
>index fedce1c..81d9ebe 100644
>--- a/progs/demos/Makefile
>+++ b/progs/demos/Makefile
>@@ -125,41 +125,41 @@ extfuncs.h:  $(TOP)/progs/util/extfuncs.h
> 
> 
> reflect: reflect.o showbuffer.o readtex.o
>-	$(CC) $(LDFLAGS) reflect.o showbuffer.o readtex.o $(LIBS) -o $@
>+	$(CC) $(CFLAGS) $(LDFLAGS) reflect.o showbuffer.o readtex.o $(LIBS) -o $@
> 
> reflect.o: reflect.c showbuffer.h
> 	$(CC) -c -I$(INCDIR) $(CFLAGS) reflect.c
> 
> 
> shadowtex: shadowtex.o showbuffer.o
>-	$(CC) $(LDFLAGS) shadowtex.o showbuffer.o $(LIBS) -o $@
>+	$(CC) $(CFLAGS) $(LDFLAGS) shadowtex.o showbuffer.o $(LIBS) -o $@
> 
> shadowtex.o: shadowtex.c showbuffer.h
> 	$(CC) -c -I$(INCDIR) $(CFLAGS) shadowtex.c
> 
> 
> gloss: gloss.o trackball.o readtex.o
>-	$(CC) $(LDFLAGS) gloss.o trackball.o readtex.o $(LIBS) -o $@
>+	$(CC) $(CFLAGS) $(LDFLAGS) gloss.o trackball.o readtex.o $(LIBS) -o $@
> 
> gloss.o: gloss.c trackball.h
> 	$(CC) -c -I$(INCDIR) $(CFLAGS) gloss.c
> 
> 
> engine: engine.o trackball.o readtex.o
>-	$(CC) $(LDFLAGS) engine.o trackball.o readtex.o $(LIBS) -o $@
>+	$(CC) $(CFLAGS) $(LDFLAGS) engine.o trackball.o readtex.o $(LIBS) -o $@
> 
> engine.o: engine.c trackball.h
> 	$(CC) -c -I$(INCDIR) $(CFLAGS) engine.c
> 
> 
> fslight: fslight.o
>-	$(CC) $(LDFLAGS) fslight.o $(LIBS) -o $@
>+	$(CC) $(CFLAGS) $(LDFLAGS) fslight.o $(LIBS) -o $@
> 
> fslight.o: fslight.c extfuncs.h
> 	$(CC) -c -I$(INCDIR) $(CFLAGS) fslight.c
> 
> rain: particles.o rain.o readtex.o
>-	$(CXX) $(LDFLAGS) $^ $(LIBS) -o $@
>+	$(CXX) $(CXXFLAGS) $(LDFLAGS) $^ $(LIBS) -o $@
> 
> rain.o: rain.cxx readtex.h
> 	$(CXX) -c -I$(INCDIR) $(CXXFLAGS) $<
>diff --git a/progs/xdemos/Makefile b/progs/xdemos/Makefile
>index c90159b..b259671 100644
>--- a/progs/xdemos/Makefile
>+++ b/progs/xdemos/Makefile
>@@ -67,10 +67,10 @@ clean:
> 
> # special cases
> pbinfo: pbinfo.o pbutil.o
>-	$(CC) $(LDFLAGS) pbinfo.o pbutil.o $(LIBS) -o $@
>+	$(CC) $(CFLAGS) $(LDFLAGS) pbinfo.o pbutil.o $(LIBS) -o $@
> 
> pbdemo: pbdemo.o pbutil.o
>-	$(CC) $(LDFLAGS) pbdemo.o pbutil.o $(LIBS) -o $@
>+	$(CC) $(CFLAGS) $(LDFLAGS) pbdemo.o pbutil.o $(LIBS) -o $@
> 
> pbinfo.o: pbinfo.c pbutil.h
> 	$(CC) -c -I. -I$(INCDIR) $(X11_INCLUDES) $(CFLAGS) pbinfo.c
>@@ -82,13 +82,13 @@ pbutil.o: pbutil.c pbutil.h
> 	$(CC) -c -I. -I$(INCDIR) $(X11_INCLUDES) $(CFLAGS) pbutil.c
> 
> glxgears_fbconfig: glxgears_fbconfig.o pbutil.o
>-	$(CC) $(LDFLAGS) glxgears_fbconfig.o pbutil.o $(LIBS) -o $@
>+	$(CC) $(CFLAGS) $(LDFLAGS) glxgears_fbconfig.o pbutil.o $(LIBS) -o $@
> 
> glxgears_fbconfig.o: glxgears_fbconfig.c pbutil.h
> 	$(CC) -I$(INCDIR) $(X11_INCLUDES) $(CFLAGS) -c -I. $(CFLAGS) glxgears_fbconfig.c
> 
> xrotfontdemo: xrotfontdemo.o xuserotfont.o
>-	$(CC) $(LDFLAGS) xrotfontdemo.o xuserotfont.o $(LIBS) -o $@
>+	$(CC) $(CFLAGS) $(LDFLAGS) xrotfontdemo.o xuserotfont.o $(LIBS) -o $@
> 
> xuserotfont.o: xuserotfont.c xuserotfont.h
> 	$(CC) -c -I. -I$(INCDIR) $(X11_INCLUDES) $(CFLAGS) xuserotfont.c

Actions: View | Splinter Review

Attachments on bug 16860: 17907

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.