Revision: 246 http://trac.macosforge.org/projects/xquartz/changeset/246 Author: jeremyhu@freedesktop.org Date: 2009-02-23 11:32:46 -0800 (Mon, 23 Feb 2009) Log Message: ----------- Compilation fixes in the Makefiles for Tiger Modified Paths: -------------- AppleSGLX/trunk/Makefile AppleSGLX/trunk/tests/engine/engine.mk AppleSGLX/trunk/tests/fbconfigs/fbconfigs.mk AppleSGLX/trunk/tests/glxinfo/glxinfo.mk AppleSGLX/trunk/tests/glxpixmap/glxpixmap.mk AppleSGLX/trunk/tests/shared/shared.mk AppleSGLX/trunk/tests/simple/simple.mk AppleSGLX/trunk/tests/tests.mk AppleSGLX/trunk/tests/texenv/texenv.mk AppleSGLX/trunk/tests/triangle/triangle.mk Modified: AppleSGLX/trunk/Makefile =================================================================== --- AppleSGLX/trunk/Makefile 2009-02-23 19:11:45 UTC (rev 245) +++ AppleSGLX/trunk/Makefile 2009-02-23 19:32:46 UTC (rev 246) @@ -3,14 +3,14 @@ CC=gcc GL_CFLAGS=-Wall -ggdb3 -Os -DPTHREADS -D_REENTRANT -DPUBLIC="" $(RC_CFLAGS) $(CFLAGS) -GL_LDFLAGS=-L$(X11_DIR)/lib $(LDFLAGS) +GL_LDFLAGS=-L$(X11_DIR)/lib $(LDFLAGS) -Wl,-single_module MKDIR=mkdir INSTALL=install LN=ln RM=rm -INCLUDE=-I. -Iinclude -Iinclude/internal -DGLX_ALIAS_UNSUPPORTED -F/System/Library/Frameworks/OpenGL.framework -I$(INSTALL_DIR)/include +INCLUDE=-I. -Iinclude -Iinclude/internal -DGLX_ALIAS_UNSUPPORTED -F/System/Library/Frameworks/OpenGL.framework -I$(INSTALL_DIR)/include -I$(X11_DIR)/include COMPILE=$(CC) $(INCLUDE) $(GL_CFLAGS) -c #The directory with the final binaries. @@ -36,7 +36,7 @@ #The tests don't require installation. $(TEST_BUILD_DIR)/libGL.dylib: $(OBJECTS) -if ! test -d $(TEST_BUILD_DIR); then $(MKDIR) $(TEST_BUILD_DIR); fi - $(CC) -o $@ -dynamiclib -lXplugin -framework ApplicationServices -framework CoreFoundation -L$(X11_DIR)/lib -lX11 -lXext -Wl,-exported_symbols_list,exports.list $(OBJECTS) + $(CC) -O0 -ggdb3 -o $@ -dynamiclib -lXplugin -framework ApplicationServices -framework CoreFoundation -L$(X11_DIR)/lib -lX11 -lXext -Wl,-exported_symbols_list,exports.list -Wl,-single_module $(OBJECTS) $(BUILD_DIR)/libGL.1.2.dylib: $(OBJECTS) -if ! test -d $(BUILD_DIR); then $(MKDIR) $(BUILD_DIR); fi @@ -73,10 +73,10 @@ glx_empty.o: glx_empty.c $(BUILD_DIR)/glxinfo: tests/glxinfo/glxinfo.c $(BUILD_DIR)/libGL.1.2.dylib - $(CC) tests/glxinfo/glxinfo.c -I$(DESTDIR)$(INSTALL_DIR)/include -L$(X11_DIR)/lib -lX11 $(BUILD_DIR)/libGL.1.2.dylib -o $@ + $(CC) tests/glxinfo/glxinfo.c $(INCLUDE) -L$(X11_DIR)/lib -lX11 $(BUILD_DIR)/libGL.1.2.dylib -o $@ $(BUILD_DIR)/glxgears: tests/glxgears/glxgears.c $(BUILD_DIR)/libGL.1.2.dylib - $(CC) tests/glxgears/glxgears.c -I$(DESTDIR)$(INSTALL_DIR)/include -L$(X11_DIR)/lib -lX11 $(BUILD_DIR)/libGL.1.2.dylib -o $@ + $(CC) tests/glxgears/glxgears.c $(INCLUDE) -L$(X11_DIR)/lib -lX11 $(BUILD_DIR)/libGL.1.2.dylib -o $@ install_headers: $(INSTALL) -d $(DESTDIR)$(INSTALL_DIR)/include/GL Modified: AppleSGLX/trunk/tests/engine/engine.mk =================================================================== --- AppleSGLX/trunk/tests/engine/engine.mk 2009-02-23 19:11:45 UTC (rev 245) +++ AppleSGLX/trunk/tests/engine/engine.mk 2009-02-23 19:32:46 UTC (rev 246) @@ -1,2 +1,2 @@ $(TEST_BUILD_DIR)/engine: tests/engine/engine.c $(LIBGL) libglut.a - $(CC) tests/engine/engine.c tests/engine/readtex.c tests/engine/trackball.c -Iinclude -I/usr/X11/include -o $(TEST_BUILD_DIR)/engine $(LINK_TEST) libglut.a -L/usr/X11/lib -lXmu -lGLU + $(CC) tests/engine/engine.c tests/engine/readtex.c tests/engine/trackball.c $(INCLUDE) -o $(TEST_BUILD_DIR)/engine $(LINK_TEST) libglut.a -L$(INSTALL_DIR)/lib -L$(X11_DIR)/lib -lXmu -lGLU Modified: AppleSGLX/trunk/tests/fbconfigs/fbconfigs.mk =================================================================== --- AppleSGLX/trunk/tests/fbconfigs/fbconfigs.mk 2009-02-23 19:11:45 UTC (rev 245) +++ AppleSGLX/trunk/tests/fbconfigs/fbconfigs.mk 2009-02-23 19:32:46 UTC (rev 246) @@ -1,2 +1,2 @@ $(TEST_BUILD_DIR)/fbconfigs: tests/fbconfigs/fbconfigs.c $(LIBGL) - $(CC) tests/fbconfigs/fbconfigs.c -Iinclude -I/usr/X11/include -o $(TEST_BUILD_DIR)/fbconfigs $(LINK_TEST) + $(CC) tests/fbconfigs/fbconfigs.c $(INCLUDE) -o $(TEST_BUILD_DIR)/fbconfigs $(LINK_TEST) Modified: AppleSGLX/trunk/tests/glxinfo/glxinfo.mk =================================================================== --- AppleSGLX/trunk/tests/glxinfo/glxinfo.mk 2009-02-23 19:11:45 UTC (rev 245) +++ AppleSGLX/trunk/tests/glxinfo/glxinfo.mk 2009-02-23 19:32:46 UTC (rev 246) @@ -1,2 +1,2 @@ $(TEST_BUILD_DIR)/glxinfo: tests/glxinfo/glxinfo.c $(LIBGL) - $(CC) tests/glxinfo/glxinfo.c -Iinclude -I/usr/X11/include -o $(TEST_BUILD_DIR)/glxinfo $(LINK_TEST) + $(CC) tests/glxinfo/glxinfo.c $(INCLUDE) -o $(TEST_BUILD_DIR)/glxinfo $(LINK_TEST) Modified: AppleSGLX/trunk/tests/glxpixmap/glxpixmap.mk =================================================================== --- AppleSGLX/trunk/tests/glxpixmap/glxpixmap.mk 2009-02-23 19:11:45 UTC (rev 245) +++ AppleSGLX/trunk/tests/glxpixmap/glxpixmap.mk 2009-02-23 19:32:46 UTC (rev 246) @@ -1,8 +1,8 @@ $(TEST_BUILD_DIR)/glxpixmap: tests/glxpixmap/glxpixmap.c $(LIBGL) - $(CC) tests/glxpixmap/glxpixmap.c -Iinclude -I/usr/X11/include -o $(TEST_BUILD_DIR)/glxpixmap $(LINK_TEST) + $(CC) tests/glxpixmap/glxpixmap.c $(INCLUDE) -o $(TEST_BUILD_DIR)/glxpixmap $(LINK_TEST) $(TEST_BUILD_DIR)/glxpixmap_create_destroy: tests/glxpixmap/glxpixmap_create_destroy.c $(LIBGL) - $(CC) tests/glxpixmap/glxpixmap_create_destroy.c -Iinclude -I/usr/X11/include -o $(TEST_BUILD_DIR)/glxpixmap_create_destroy $(LINK_TEST) + $(CC) tests/glxpixmap/glxpixmap_create_destroy.c $(INCLUDE) -o $(TEST_BUILD_DIR)/glxpixmap_create_destroy $(LINK_TEST) $(TEST_BUILD_DIR)/glxpixmap_destroy_invalid: tests/glxpixmap/glxpixmap_destroy_invalid.c $(LIBGL) - $(CC) tests/glxpixmap/glxpixmap_destroy_invalid.c -Iinclude -I/usr/X11/include -o $(TEST_BUILD_DIR)/glxpixmap_destroy_invalid $(LINK_TEST) + $(CC) tests/glxpixmap/glxpixmap_destroy_invalid.c $(INCLUDE) -o $(TEST_BUILD_DIR)/glxpixmap_destroy_invalid $(LINK_TEST) Modified: AppleSGLX/trunk/tests/shared/shared.mk =================================================================== --- AppleSGLX/trunk/tests/shared/shared.mk 2009-02-23 19:11:45 UTC (rev 245) +++ AppleSGLX/trunk/tests/shared/shared.mk 2009-02-23 19:32:46 UTC (rev 246) @@ -1,3 +1,3 @@ $(TEST_BUILD_DIR)/sharedtex: tests/shared/sharedtex.c $(LIBGL) - $(CC) tests/shared/sharedtex.c -Iinclude -I/usr/X11/include -o $(TEST_BUILD_DIR)/sharedtex $(LINK_TEST) + $(CC) tests/shared/sharedtex.c $(INCLUDE) -o $(TEST_BUILD_DIR)/sharedtex $(LINK_TEST) Modified: AppleSGLX/trunk/tests/simple/simple.mk =================================================================== --- AppleSGLX/trunk/tests/simple/simple.mk 2009-02-23 19:11:45 UTC (rev 245) +++ AppleSGLX/trunk/tests/simple/simple.mk 2009-02-23 19:32:46 UTC (rev 246) @@ -1,15 +1,15 @@ $(TEST_BUILD_DIR)/simple: tests/simple/simple.c $(LIBGL) - $(CC) tests/simple/simple.c -Iinclude -I/usr/X11/include -o $(TEST_BUILD_DIR)/simple $(LINK_TEST) + $(CC) tests/simple/simple.c $(INCLUDE) -o $(TEST_BUILD_DIR)/simple $(LINK_TEST) $(TEST_BUILD_DIR)/render_types: tests/simple/render_types.c $(LIBGL) - $(CC) tests/simple/render_types.c -Iinclude -I/usr/X11/include -o $(TEST_BUILD_DIR)/render_types $(LINK_TEST) + $(CC) tests/simple/render_types.c $(INCLUDE) -o $(TEST_BUILD_DIR)/render_types $(LINK_TEST) $(TEST_BUILD_DIR)/drawable_types: tests/simple/drawable_types.c $(LIBGL) - $(CC) tests/simple/drawable_types.c -Iinclude -I/usr/X11/include -o $(TEST_BUILD_DIR)/drawable_types $(LINK_TEST) + $(CC) tests/simple/drawable_types.c $(INCLUDE) -o $(TEST_BUILD_DIR)/drawable_types $(LINK_TEST) $(TEST_BUILD_DIR)/multisample_glx: tests/simple/multisample_glx.c $(LIBGL) - $(CC) tests/simple/multisample_glx.c -Iinclude -I/usr/X11/include -o $(TEST_BUILD_DIR)/multisample_glx $(LINK_TEST) + $(CC) tests/simple/multisample_glx.c $(INCLUDE) -o $(TEST_BUILD_DIR)/multisample_glx $(LINK_TEST) $(TEST_BUILD_DIR)/glthreads: tests/simple/glthreads.c $(LIBGL) - $(CC) -DPTHREADS -pthread tests/simple/glthreads.c -Iinclude -I/usr/X11/include -o $(TEST_BUILD_DIR)/glthreads $(LINK_TEST) + $(CC) -DPTHREADS -pthread tests/simple/glthreads.c $(INCLUDE) -o $(TEST_BUILD_DIR)/glthreads $(LINK_TEST) Modified: AppleSGLX/trunk/tests/tests.mk =================================================================== --- AppleSGLX/trunk/tests/tests.mk 2009-02-23 19:11:45 UTC (rev 245) +++ AppleSGLX/trunk/tests/tests.mk 2009-02-23 19:32:46 UTC (rev 246) @@ -1,7 +1,7 @@ .PHONY : tests LIBGL=$(TEST_BUILD_DIR)/libGL.dylib -LINK_TEST=-L/usr/X11/lib $(LIBGL) -lX11 -lXext -lXplugin -lpthread +LINK_TEST=-L$(INSTALL_DIR)/lib -L$(X11_DIR)/lib $(LIBGL) -lX11 -lXext -lXplugin -lpthread include tests/triangle/triangle.mk include tests/simple/simple.mk Modified: AppleSGLX/trunk/tests/texenv/texenv.mk =================================================================== --- AppleSGLX/trunk/tests/texenv/texenv.mk 2009-02-23 19:11:45 UTC (rev 245) +++ AppleSGLX/trunk/tests/texenv/texenv.mk 2009-02-23 19:32:46 UTC (rev 246) @@ -1,2 +1,2 @@ $(TEST_BUILD_DIR)/texenv: tests/texenv/texenv.c $(LIBGL) - $(CC) tests/texenv/texenv.c -Iinclude -I/usr/X11/include -o $(TEST_BUILD_DIR)/texenv -L/usr/X11/lib -lXmu -lglu libglut.a $(LINK_TEST) + $(CC) tests/texenv/texenv.c $(INCLUDE) -o $(TEST_BUILD_DIR)/texenv -L$(INSTALL_DIR)/lib -L$(X11_DIR)/lib -lXmu -lglu libglut.a $(LINK_TEST) Modified: AppleSGLX/trunk/tests/triangle/triangle.mk =================================================================== --- AppleSGLX/trunk/tests/triangle/triangle.mk 2009-02-23 19:11:45 UTC (rev 245) +++ AppleSGLX/trunk/tests/triangle/triangle.mk 2009-02-23 19:32:46 UTC (rev 246) @@ -1,3 +1,3 @@ triangle: tests/triangle/triangle.m libgl.a libglx.a - $(CC) tests/triangle/triangle.m -Iinclude -I/usr/X11/include -L/usr/X11/lib -lglut libgl.a libglx.a -o triangle \ + $(CC) tests/triangle/triangle.m $(INCLUDE) -L$(INSTALL_DIR)/lib -L$(X11_DIR)/lib -lglut libgl.a libglx.a -o triangle \ -F/System/Library/Frameworks/OpenGL.framework /System/Library/Frameworks/OpenGL.framework/Libraries/libGL.dylib