1 --- GNU3DKit/3DKit/GeometryKit/GeometryKit/GNUmakefile.orig 2001-07-07 16:48:58.000000000 +0200
2 +++ GNU3DKit/3DKit/GeometryKit/GeometryKit/GNUmakefile 2003-07-29 08:28:13.000000000 +0200
4 LIBRARY_NAME=libGeometryKit
5 libGeometryKit_HEADER_FILES_DIR=.
6 libGeometryKit_HEADER_FILES_INSTALL_DIR=/GeometryKit
7 -GEOMETRYKIT_INSTALLATION_DIR=$(GNUSTEP_LOCAL_ROOT)
8 -GEOMETRYKIT_INSTALL_PREFIX=$(GNUSTEP_LOCAL_ROOT)
9 +GEOMETRYKIT_INSTALLATION_DIR=$(GNUSTEP_INSTALLATION_DIR)
10 +GEOMETRYKIT_INSTALL_PREFIX=$(GNUSTEP_INSTALLATION_DIR)
11 ADDITIONAL_INCLUDE_DIRS = -I..
15 # Additional libraries
18 -libGeometryKit_LIBRARIES_DEPEND_UPON +=
19 +libGeometryKit_LIBRARIES_DEPEND_UPON += -lgnustep-base
23 --- GNU3DKit/3DKit/RenderKit/RenderKit/GNUmakefile.preamble.orig 2001-07-07 17:35:47.000000000 +0200
24 +++ GNU3DKit/3DKit/RenderKit/RenderKit/GNUmakefile.preamble 2003-07-29 08:20:40.000000000 +0200
28 # Additional include directories the compiler should search
29 -ADDITIONAL_INCLUDE_DIRS += -I../Headers
30 +ADDITIONAL_INCLUDE_DIRS += -I../../GeometryKit
32 # Additional LDFLAGS to pass to the linker
34 --- GNU3DKit/3DKit/RenderKit/RenderKit/GNUmakefile.orig 2001-07-15 15:00:19.000000000 +0200
35 +++ GNU3DKit/3DKit/RenderKit/RenderKit/GNUmakefile 2003-07-29 08:31:37.000000000 +0200
37 LIBRARY_NAME=libRenderKit
38 libRenderKit_HEADER_FILES_DIR=.
39 libRenderKit_HEADER_FILES_INSTALL_DIR=/RenderKit
40 -RENDERKIT_INSTALLATION_DIR=$(GNUSTEP_LOCAL_ROOT)
41 -RENDERKIT_INSTALL_PREFIX=$(GNUSTEP_LOCAL_ROOT)
42 +RENDERKIT_INSTALLATION_DIR=$(GNUSTEP_INSTALLATION_DIR)
43 +RENDERKIT_INSTALL_PREFIX=$(GNUSTEP_INSTALLATION_DIR)
44 ADDITIONAL_INCLUDE_DIRS = -I..
48 # Additional libraries
51 -libRenderKit_LIBRARIES_DEPEND_UPON += -lGL
52 +libRenderKit_LIBRARIES_DEPEND_UPON += -lgnustep-base -L../../GeometryKit/GeometryKit/obj -lGeometryKit -L/usr/X11R6/lib -lGL -lGLU
56 --- GNU3DKit/GlutKit/GNUmakefile.preamble.orig 2000-08-20 17:25:45.000000000 +0200
57 +++ GNU3DKit/GlutKit/GNUmakefile.preamble 2003-07-29 08:24:58.000000000 +0200
61 # Additional flags to pass to the preprocessor
62 -ADDITIONAL_CPPFLAGS +=
63 +ADDITIONAL_CPPFLAGS += -I../3DKit/GeometryKit -I../3DKit/RenderKit
65 # Additional flags to pass to the Objective-C compiler
66 ADDITIONAL_OBJCFLAGS +=
67 --- GNU3DKit/GlutKit/GNUmakefile.orig 2000-09-23 17:49:11.000000000 +0200
68 +++ GNU3DKit/GlutKit/GNUmakefile 2003-07-29 08:36:47.000000000 +0200
70 LIBRARY_NAME=libGlutKit
71 libGlutKit_HEADER_FILES_DIR=.
72 libGlutKit_HEADER_FILES_INSTALL_DIR=/GlutKit
73 -GLUTKIT_INSTALLATION_DIR=$(GNUSTEP_LOCAL_ROOT)
74 -GLUTKIT_INSTALL_PREFIX=$(GNUSTEP_LOCAL_ROOT)
75 +GLUTKIT_INSTALLATION_DIR=$(GNUSTEP_INSTALLATION_DIR)
76 +GLUTKIT_INSTALL_PREFIX=$(GNUSTEP_INSTALLATION_DIR)
77 ADDITIONAL_INCLUDE_DIRS = -I..
81 # Additional libraries
84 -libGlutKit_LIBRARIES_DEPEND_UPON += -lGL -lGLU -lglut
85 +libGlutKit_LIBRARIES_DEPEND_UPON += -lgnustep-base -L../3DKit/RenderKit/RenderKit/obj -lRenderKit -L/usr/X11R6/lib -lGL -lGLU -lglut
89 --- GNU3DKit/SDLKit/GNUmakefile.preamble.orig 2000-08-20 17:25:46.000000000 +0200
90 +++ GNU3DKit/SDLKit/GNUmakefile.preamble 2003-07-29 08:37:59.000000000 +0200
94 # Additional flags to pass to the preprocessor
95 -ADDITIONAL_CPPFLAGS +=
96 +ADDITIONAL_CPPFLAGS += -I../3DKit/GeometryKit -I../3DKit/RenderKit
98 # Additional flags to pass to the Objective-C compiler
99 ADDITIONAL_OBJCFLAGS +=
100 --- GNU3DKit/SDLKit/GNUmakefile.orig 2000-09-23 17:49:11.000000000 +0200
101 +++ GNU3DKit/SDLKit/GNUmakefile 2003-07-29 08:39:11.000000000 +0200
103 LIBRARY_NAME=libSDLKit
104 libSDLKit_HEADER_FILES_DIR=.
105 libSDLKit_HEADER_FILES_INSTALL_DIR=/SDLKit
106 -SDLKIT_INSTALLATION_DIR=$(GNUSTEP_LOCAL_ROOT)
107 -SDLKIT_INSTALL_PREFIX=$(GNUSTEP_LOCAL_ROOT)
108 +SDLKIT_INSTALLATION_DIR=$(GNUSTEP_INSTALLATION_DIR)
109 +SDLKIT_INSTALL_PREFIX=$(GNUSTEP_INSTALLATION_DIR)
110 ADDITIONAL_INCLUDE_DIRS = -I..
114 # Additional libraries
117 -libSDLKit_LIBRARIES_DEPEND_UPON += -lGL -lGLU -lSDL
118 +libSDLKit_LIBRARIES_DEPEND_UPON += -lgnustep-base -L../3DKit/RenderKit/RenderKit/obj -lRenderKit -L/usr/X11R6/lib -lGL -lGLU -lSDL
122 --- GNU3DKit/Examples/glut/GNUmakefile.preamble.orig 2001-01-18 14:07:39.000000000 +0100
123 +++ GNU3DKit/Examples/glut/GNUmakefile.preamble 2003-07-29 08:52:38.000000000 +0200
127 # Additional flags to pass to the preprocessor
128 -ADDITIONAL_CPPFLAGS +=
129 +ADDITIONAL_CPPFLAGS += -I../../3DKit/GeometryKit -I../../3DKit/RenderKit -I../..
131 # Additional flags to pass to the Objective-C compiler
132 ADDITIONAL_OBJCFLAGS += -D__RKUSEOPENAL__ -D__RKUSEAPPKIT__
133 --- GNU3DKit/Examples/glut/GNUmakefile.orig 2001-07-15 17:40:58.000000000 +0200
134 +++ GNU3DKit/Examples/glut/GNUmakefile 2003-07-29 18:24:25.000000000 +0200
139 -GlutDemo_TOOL_LIBS += -lGeometryKit -lRenderKit -lGlutKit -lglut -L/usr/X11R6/lib -lXmu -lXi -lXext -lX11
140 +GlutDemo_TOOL_LIBS += -L../../3DKit/GeometryKit/GeometryKit/obj -lGeometryKit -L../../3DKit/RenderKit/RenderKit/obj -lRenderKit -L../../GlutKit/obj -lGlutKit -lglut -L/usr/X11R6/lib -lXmu -lXi -lXext -lX11
142 -include GNUmakefile.preamble
144 --- GNU3DKit/Examples/SDL/GNUmakefile.preamble.orig 2001-01-18 14:05:01.000000000 +0100
145 +++ GNU3DKit/Examples/SDL/GNUmakefile.preamble 2003-07-29 18:26:23.000000000 +0200
149 # Additional flags to pass to the preprocessor
150 -ADDITIONAL_CPPFLAGS +=
151 +ADDITIONAL_CPPFLAGS += -I../../3DKit/GeometryKit -I../../3DKit/RenderKit -I../..
153 # Additional flags to pass to the Objective-C compiler
154 ADDITIONAL_OBJCFLAGS += -D__RKUSEOPENAL__ -D__RKUSEAPPKIT__
155 --- GNU3DKit/Examples/SDL/GNUmakefile.orig 2001-07-15 16:03:37.000000000 +0200
156 +++ GNU3DKit/Examples/SDL/GNUmakefile 2003-07-29 18:27:22.000000000 +0200
158 G3DVtxArray+ASEExtensions.m \
161 -ASEViewer_TOOL_LIBS += -lGeometryKit -lRenderKit -lSDLKit -lSDL
162 +ASEViewer_TOOL_LIBS += -L../../3DKit/GeometryKit/GeometryKit/obj -lGeometryKit -L../../3DKit/RenderKit/RenderKit/obj -lRenderKit -L../../SDLKit/obj -lSDLKit -lSDL
164 -include GNUmakefile.preamble
167 diff -urNbB GNU3DKit.org/3DKit/GeometryKit/GNUmakefile GNU3DKit/3DKit/GeometryKit/GNUmakefile
168 --- GNU3DKit.org/3DKit/GeometryKit/GNUmakefile 2000-11-03 18:01:20.000000000 +0100
169 +++ GNU3DKit/3DKit/GeometryKit/GNUmakefile 2005-09-06 22:42:10.281857512 +0200
171 # Install into the system root by default
172 #GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT)
174 -GNUSTEP_MAKEFILES = $(GNUSTEP_SYSTEM_ROOT)/Makefiles
176 include $(GNUSTEP_MAKEFILES)/common.make
178 include ./GeometryKit/Version
179 diff -urNbB GNU3DKit.org/3DKit/GNUmakefile GNU3DKit/3DKit/GNUmakefile
180 --- GNU3DKit.org/3DKit/GNUmakefile 2001-07-15 15:14:20.000000000 +0200
181 +++ GNU3DKit/3DKit/GNUmakefile 2005-09-06 22:41:26.487515264 +0200
183 # Install into the system root by default
184 GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT)
186 -GNUSTEP_MAKEFILES = $(GNUSTEP_SYSTEM_ROOT)/Makefiles
188 include $(GNUSTEP_MAKEFILES)/common.make
191 diff -urNbB GNU3DKit.org/3DKit/RenderKit/GNUmakefile GNU3DKit/3DKit/RenderKit/GNUmakefile
192 --- GNU3DKit.org/3DKit/RenderKit/GNUmakefile 2000-09-23 16:49:03.000000000 +0200
193 +++ GNU3DKit/3DKit/RenderKit/GNUmakefile 2005-09-06 22:43:28.873909704 +0200
196 # Install into the system root by default
197 GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT)
198 -GNUSTEP_MAKEFILES = $(GNUSTEP_SYSTEM_ROOT)/Makefiles
200 include $(GNUSTEP_MAKEFILES)/common.make
202 diff -urNbB GNU3DKit.org/Examples/glut/GNUmakefile GNU3DKit/Examples/glut/GNUmakefile
203 --- GNU3DKit.org/Examples/glut/GNUmakefile 2001-07-15 17:40:58.000000000 +0200
204 +++ GNU3DKit/Examples/glut/GNUmakefile 2005-09-06 22:46:47.654690432 +0200
207 GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT)
209 -GNUSTEP_MAKEFILES = $(GNUSTEP_SYSTEM_ROOT)/Makefiles
211 include $(GNUSTEP_MAKEFILES)/common.make
213 # The applications to be compiled
214 diff -urNbB GNU3DKit.org/Examples/SDL/GNUmakefile GNU3DKit/Examples/SDL/GNUmakefile
215 --- GNU3DKit.org/Examples/SDL/GNUmakefile 2001-07-15 16:03:37.000000000 +0200
216 +++ GNU3DKit/Examples/SDL/GNUmakefile 2005-09-06 22:46:57.012267864 +0200
219 GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT)
221 -GNUSTEP_MAKEFILES = $(GNUSTEP_SYSTEM_ROOT)/Makefiles
223 include $(GNUSTEP_MAKEFILES)/common.make
225 # The applications to be compiled