3DKit-make.patch

   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
   3 @@ -24,8 +24,8 @@
   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..
  12  srcdir = .
  13  #
  14 @@ -33,7 +33,7 @@
  15  # Additional libraries
  16  #
  17
  18 -libGeometryKit_LIBRARIES_DEPEND_UPON +=
  19 +libGeometryKit_LIBRARIES_DEPEND_UPON += -lgnustep-base
  20
  21  #
  22
  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
  25 @@ -44,7 +44,7 @@
  26  ADDITIONAL_CFLAGS +=
  27
  28  # Additional include directories the compiler should search
  29 -ADDITIONAL_INCLUDE_DIRS += -I../Headers
  30 +ADDITIONAL_INCLUDE_DIRS += -I../../GeometryKit
  31
  32  # Additional LDFLAGS to pass to the linker
  33  ADDITIONAL_LDFLAGS +=
  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
  36 @@ -24,8 +24,8 @@
  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..
  45  srcdir = .
  46  #
  47 @@ -33,7 +33,7 @@
  48  # Additional libraries
  49  #
  50
  51 -libRenderKit_LIBRARIES_DEPEND_UPON += -lGL
  52 +libRenderKit_LIBRARIES_DEPEND_UPON += -lgnustep-base -L../../GeometryKit/GeometryKit/obj -lGeometryKit -L/usr/X11R6/lib -lGL -lGLU
  53
  54  #
  55
  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
  58 @@ -34,7 +34,7 @@
  59  #
  60
  61  # Additional flags to pass to the preprocessor
  62 -ADDITIONAL_CPPFLAGS +=
  63 +ADDITIONAL_CPPFLAGS += -I../3DKit/GeometryKit -I../3DKit/RenderKit
  64
  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
  69 @@ -24,8 +24,8 @@
  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..
  78  srcdir = .
  79  #
  80 @@ -33,7 +33,7 @@
  81  # Additional libraries
  82  #
  83
  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
  86
  87  #
  88
  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
  91 @@ -34,7 +34,7 @@
  92  #
  93
  94  # Additional flags to pass to the preprocessor
  95 -ADDITIONAL_CPPFLAGS +=
  96 +ADDITIONAL_CPPFLAGS += -I../3DKit/GeometryKit -I../3DKit/RenderKit
  97
  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
 102 @@ -24,8 +24,8 @@
 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..
 111  srcdir = .
 112  #
 113 @@ -33,7 +33,7 @@
 114  # Additional libraries
 115  #
 116
 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
 119
 120  #
 121
 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
 124 @@ -36,7 +36,7 @@
 125  #
 126
 127  # Additional flags to pass to the preprocessor
 128 -ADDITIONAL_CPPFLAGS +=
 129 +ADDITIONAL_CPPFLAGS += -I../../3DKit/GeometryKit -I../../3DKit/RenderKit -I../..
 130
 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
 135 @@ -45,7 +45,7 @@
 136         G3DWaterSurface.m       \
 137         GlutDemo.m
 138
 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
 141
 142  -include GNUmakefile.preamble
 143
 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
 146 @@ -36,7 +36,7 @@
 147  #
 148
 149  # Additional flags to pass to the preprocessor
 150 -ADDITIONAL_CPPFLAGS +=
 151 +ADDITIONAL_CPPFLAGS += -I../../3DKit/GeometryKit -I../../3DKit/RenderKit -I../..
 152
 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
 157 @@ -46,7 +46,7 @@
 158         G3DVtxArray+ASEExtensions.m     \
 159         ASEViewer.m
 160
 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
 163
 164  -include GNUmakefile.preamble
 165