ClanLib-link.patch

   1 --- ClanLib-2.2.7/Sources/Core/Makefile.am.orig 2010-07-19 09:10:06.000000000 +0200
   2 +++ ClanLib-2.2.7/Sources/Core/Makefile.am      2011-03-26 14:43:21.808912129 +0100
   3 @@ -164,7 +164,7 @@
   4
   5  endif
   6
   7 -libclan30Core_la_LIBADD = @LIBPTHREAD@
   8 +libclan30Core_la_LIBADD = @LIBPTHREAD@ -lpthread
   9
  10  libclan30Core_la_LDFLAGS = \
  11    -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE) \
  12 --- ClanLib-2.2.7/Sources/Network/Makefile.am.orig      2011-01-27 09:46:22.000000000 +0100
  13 +++ ClanLib-2.2.7/Sources/Network/Makefile.am   2011-03-26 14:55:17.676908777 +0100
  14 @@ -45,9 +45,10 @@
  15  setupnetwork_unix.cpp
  16  endif
  17
  18 +libclan30Network_la_LIBADD = $(top_builddir)/Sources/Core/libclan30Core.la
  19  libclan30Network_la_LDFLAGS = \
  20    -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE) \
  21 -  $(extra_LIBS_Network)
  22 +  $(extra_LIBS_clanNetwork)
  23
  24  libclan30Sound_la_CXXFLAGS=$(Network_CXXFLAGS) $(extra_CFLAGS_Network)
  25
  26 --- ClanLib-2.2.7/Sources/Sound/Makefile.am.orig        2010-07-05 16:50:31.000000000 +0200
  27 +++ ClanLib-2.2.7/Sources/Sound/Makefile.am     2011-03-26 14:45:51.348911291 +0100
  28 @@ -55,6 +55,7 @@
  29  SoundProviders/Unix/soundprovider_recorder_oss.h
  30  endif
  31
  32 +libclan30Sound_la_LIBADD = $(top_builddir)/Sources/Core/libclan30Core.la
  33  libclan30Sound_la_LDFLAGS = \
  34    -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE) \
  35    $(extra_LIBS_clanSound)
  36 --- ClanLib-2.2.7/Sources/CSSLayout/Makefile.am.orig    2010-07-05 16:50:31.000000000 +0200
  37 +++ ClanLib-2.2.7/Sources/CSSLayout/Makefile.am 2011-03-26 14:47:45.184912129 +0100
  38 @@ -380,6 +380,7 @@
  39         precomp.cpp \
  40         precomp.h
  41
  42 +libclan30CSSLayout_la_LIBADD = $(top_builddir)/Sources/Display/libclan30Display.la $(top_builddir)/Sources/Core/libclan30Core.la
  43  libclan30CSSLayout_la_LDFLAGS = \
  44    -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE) \
  45    $(extra_LIBS_clanCSSLayout)
  46 --- ClanLib-2.2.7/Sources/GL/Makefile.am.orig   2011-01-27 09:46:22.000000000 +0100
  47 +++ ClanLib-2.2.7/Sources/GL/Makefile.am        2011-03-26 14:57:45.268909615 +0100
  48 @@ -48,6 +48,7 @@
  49         GLX/opengl_window_provider_glx.cpp \
  50         GLX/opengl_window_provider_glx.h
  51  endif
  52 +libclan30GL_la_LIBADD = $(top_builddir)/Sources/Display/libclan30Display.la $(top_builddir)/Sources/Core/libclan30Core.la
  53  libclan30GL_la_LDFLAGS = \
  54    -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE) \
  55    $(extra_LIBS_clanGL)
  56 --- ClanLib-2.2.7/Sources/Database/Makefile.am.orig     2010-11-01 09:26:08.000000000 +0100
  57 +++ ClanLib-2.2.7/Sources/Database/Makefile.am  2011-03-26 15:00:40.788912129 +0100
  58 @@ -8,6 +8,7 @@
  59  db_value.cpp \
  60  db_transaction.cpp
  61
  62 +libclan30Database_la_LIBADD = $(top_builddir)/Sources/Core/libclan30Core.la
  63  libclan30Database_la_LDFLAGS = \
  64    -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE) \
  65    $(extra_LIBS_clanDatabase)
  66 --- ClanLib-2.2.7/Sources/App/Makefile.am.orig  2010-07-05 16:50:31.000000000 +0200
  67 +++ ClanLib-2.2.7/Sources/App/Makefile.am       2011-03-26 15:01:37.480908777 +0100
  68 @@ -6,6 +6,7 @@
  69  libclan30App_la_SOURCES = Unix/clanapp.cpp
  70  endif
  71
  72 +libclan30App_la_LIBADD = $(top_builddir)/Sources/Core/libclan30Core.la
  73  libclan30App_la_LDFLAGS = \
  74    -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE) \
  75    $(extra_LIBS_clanApp)
  76 --- ClanLib-2.2.7/Sources/GUI/Makefile.am.orig  2010-07-05 16:50:31.000000000 +0200
  77 +++ ClanLib-2.2.7/Sources/GUI/Makefile.am       2011-03-26 15:04:04.180909615 +0100
  78 @@ -112,6 +112,7 @@
  79  gui_theme_default_impl.h \
  80  precomp.h
  81
  82 +libclan30GUI_la_LIBADD = $(top_builddir)/Sources/CSSLayout/libclan30CSSLayout.la $(top_builddir)/Sources/Display/libclan30Display.la $(top_builddir)/Sources/Core/libclan30Core.la
  83  libclan30GUI_la_LDFLAGS = \
  84    -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE) \
  85    $(extra_LIBS_clanGUI)
  86 --- ClanLib-2.2.7/Sources/Sqlite/Makefile.am.orig       2010-07-05 16:50:31.000000000 +0200
  87 +++ ClanLib-2.2.7/Sources/Sqlite/Makefile.am    2011-03-26 15:06:37.852907938 +0100
  88 @@ -9,9 +9,10 @@
  89  sqlite_reader_provider.cpp \
  90  sqlite_transaction_provider.cpp
  91
  92 +libclan30Sqlite_la_LIBADD = $(top_builddir)/Sources/Database/libclan30Database.la $(top_builddir)/Sources/Core/libclan30Core.la -lpthread -lsqlite3
  93  libclan30Sqlite_la_LDFLAGS = \
  94    -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE) \
  95 -  $(extra_LIBS_Sqlite)
  96 +  $(extra_LIBS_clanSqlite)
  97
  98  libclan30Sound_la_CXXFLAGS=$(Sqlite_CXXFLAGS) $(extra_CFLAGS_Sqlite)
  99
 100 --- ClanLib-2.3.1/Sources/Display/Makefile.am.orig      2011-07-26 11:43:05.000000000 +0200
 101 +++ ClanLib-2.3.1/Sources/Display/Makefile.am   2011-08-10 09:48:40.939755410 +0200
 102 @@ -1,6 +1,7 @@
 103  lib_LTLIBRARIES = libclan30Display.la
 104
 105  if WIN32
 106 +libclan30Display_la_LIBADD =
 107  else
 108  libclan30Display_la_LIBADD = -lpng -ljpeg
 109  endif
 110 @@ -201,7 +202,7 @@
 111         X11/font_config.cpp \
 112         X11/font_config.h
 113  endif
 114 -
 115 +libclan30Display_la_LIBADD += $(top_builddir)/Sources/Core/libclan30Core.la $(clanDisplay_LIBS)
 116  libclan30Display_la_LDFLAGS = \
 117    -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE) \
 118    $(extra_LIBS_clanDisplay
 119 --- ClanLib-2.2.7/Sources/SWRender/Makefile.am.orig     2010-07-05 16:50:31.000000000 +0200
 120 +++ ClanLib-2.2.7/Sources/SWRender/Makefile.am  2011-03-27 07:33:24.821729730 +0200
 121 @@ -69,9 +69,10 @@
 122  Canvas/Commands/pixel_command_triangle.cpp \
 123  swr_target.cpp
 124
 125 +libclan30SWRender_la_LIBADD = $(top_builddir)/Sources/Display/libclan30Display.la $(top_builddir)/Sources/Core/libclan30Core.la
 126  libclan30SWRender_la_LDFLAGS = \
 127    -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE) \
 128 -  $(extra_LIBS_SWRender)
 129 +  $(extra_LIBS_clanSWRender)
 130
 131  libclan30Sound_la_CXXFLAGS=$(SWRender_CXXFLAGS) $(extra_CFLAGS_SWRender)
 132
 133 --- ClanLib-2.2.7/configure.ac.orig     2011-01-27 09:46:22.000000000 +0100
 134 +++ ClanLib-2.2.7/configure.ac  2011-03-26 15:25:57.540910453 +0100
 135 @@ -631,9 +631,14 @@
 136  dnl Set the include path
 137  CXXFLAGS="$CXXFLAGS -I\$(top_srcdir)/Sources"
 138
 139 +ClanLib_Modules=
 140 +ClanLib_pkgconfig=
 141 +ClanLib_API_Modules=
 142  dnl Modules which will be build
 143 -ClanLib_Modules="App"
 144 -ClanLib_pkgconfig="clanApp.pc"
 145 +CLANLIB_ENABLE_MODULES(Core)
 146 +
 147 +ClanLib_Modules="$ClanLib_Modules App"
 148 +ClanLib_pkgconfig="$ClanLib_pkgconfig clanApp.pc"
 149
 150  dnl API header files for the Modules which will be installed
 151  ClanLib_API_Modules="$ClanLib_API_Modules \$(clanApp_includes)"
 152 @@ -641,7 +646,6 @@
 153  dnl Default examples which will be build
 154  dnl (Currently Disabled)
 155  ClanLib_Examples=""
 156 -CLANLIB_ENABLE_MODULES(Core)
 157
 158  if test "$enable_clanDisplay" = "yes"; then
 159         CLANLIB_ENABLE_MODULES(Display)
 160 @@ -681,14 +686,14 @@
 161  if test "$enable_clanGL" = "yes"; then
 162         CLANLIB_ENABLE_MODULES(GL)
 163  fi
 164 +if test "$enable_clanCSSLayout" = "yes"; then
 165 +       CLANLIB_ENABLE_MODULES(CSSLayout)
 166 +fi
 167
 168  if test "$enable_clanGUI" = "yes"; then
 169         CLANLIB_ENABLE_MODULES(GUI)
 170  fi
 171
 172 -if test "$enable_clanCSSLayout" = "yes"; then
 173 -       CLANLIB_ENABLE_MODULES(CSSLayout)
 174 -fi
 175  if test "$enable_clanSWRender" = "yes"; then
 176         CLANLIB_ENABLE_MODULES(SWRender)
 177  fi
 178 --- ClanLib-3.0.0/Sources/Compute/Makefile.am.orig      2013-11-05 19:30:01.877180958 +0100
 179 +++ ClanLib-3.0.0/Sources/Compute/Makefile.am   2013-11-05 19:30:17.203847516 +0100
 180 @@ -21,6 +21,7 @@
 181  compute_program.cpp \
 182  setup_compute.cpp
 183
 184 +libclan30Compute_la_LIBADD = $(top_builddir)/Sources/Core/libclan30Core.la $(top_builddir)/Sources/GL/libclan30GL.la
 185  libclan30Compute_la_LDFLAGS = \
 186    -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE) \
 187    $(extra_LIBS_Compute)
 188 --- ClanLib-3.0.0/Sources/Scene3D/Makefile.am.orig      2013-11-05 19:33:55.787179266 +0100
 189 +++ ClanLib-3.0.0/Sources/Scene3D/Makefile.am   2013-11-05 19:34:39.483845615 +0100
 190 @@ -46,6 +46,7 @@
 191  Performance/gpu_timer.cpp \
 192  Performance/scope_timer.cpp
 193
 194 +libclan30Scene3D_la_LIBADD = $(top_builddir)/Sources/Core/libclan30Core.la $(top_builddir)/Sources/GL/libclan30GL.la
 195  libclan30Scene3D_la_LDFLAGS = \
 196    -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE) \
 197    $(extra_LIBS_clanScene3D)
 198 --- ClanLib-3.0.0/Sources/Physics3D/Makefile.am.orig    2013-11-05 19:35:36.817178534 +0100
 199 +++ ClanLib-3.0.0/Sources/Physics3D/Makefile.am 2013-11-05 19:35:51.530511761 +0100
 200 @@ -137,6 +137,7 @@
 201  physics3d_ray_test.cpp \
 202  physics3d_contact_test.cpp
 203
 204 +libclan30Physics3D_la_LIBADD = $(top_builddir)/Sources/Core/libclan30Core.la
 205  libclan30Physics3D_la_LDFLAGS = \
 206    -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE) \
 207    $(extra_LIBS_clanPhysics3D)
 208 --- ClanLib-3.0.0/Sources/Physics2D/Makefile.am.orig    2013-09-24 13:53:31.000000000 +0200
 209 +++ ClanLib-3.0.0/Sources/Physics2D/Makefile.am 2013-11-05 19:37:26.527177740 +0100
 210 @@ -82,6 +82,7 @@
 211  Collision/Shapes/circle_shape.cpp \
 212  Collision/physics_object.cpp
 213
 214 +libclan30Physics2D_la_LIBADD = $(top_builddir)/Sources/Display/libclan30Display.la $(top_builddir)/Sources/Core/libclan30Core.la
 215  libclan30Physics2D_la_LDFLAGS = \
 216    -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE) \
 217    $(extra_LIBS_clanPhysics2D)
 218 --- ClanLib-3.0.0/Sources/GameIDE/Makefile.am.orig      2013-11-05 19:38:08.570510770 +0100
 219 +++ ClanLib-3.0.0/Sources/GameIDE/Makefile.am   2013-11-05 19:39:03.023843708 +0100
 220 @@ -157,6 +157,7 @@
 221  TextEditor/Scintilla/lexlib/LexerModule.cxx
 222  endif
 223
 224 +libclan30GameIDE_la_LIBADD = $(top_builddir)/Sources/GUI/libclan30GUI.la
 225  libclan30GameIDE_la_LDFLAGS = \
 226    -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE) \
 227    $(extra_LIBS_clanGameIDE)
 228 --- /home/users/baggins/devel/PLD/rpm/BUILD/ClanLib-3.0.0/Sources/Scene3D/Passes/GBuffer/gbuffer_pass.cpp~      2013-09-24 13:53:31.000000000 +0200
 229 +++ /home/users/baggins/devel/PLD/rpm/BUILD/ClanLib-3.0.0/Sources/Scene3D/Passes/GBuffer/gbuffer_pass.cpp       2013-11-05 20:08:58.168398046 +0100
 230 @@ -35,7 +35,7 @@
 231
 232  namespace clan
 233  {
 234 -
 235 +extern cl_tls_variable GLFunctions *OpenGL::functions;
 236
 237  GBufferPass::GBufferPass(ResourceContainer &inout)
 238  {