---- ClanLib-0.7.4/Sources/Application/Makefile.am.orig 2003-09-15 16:18:50.000000000 +0200
-+++ ClanLib-0.7.4/Sources/Application/Makefile.am 2003-10-09 23:15:08.843198880 +0200
-@@ -6,6 +6,7 @@
- libclanApp_la_SOURCES = Unix/clanapp.cpp
- endif
+--- ClanLib-2.2.7/Sources/Core/Makefile.am.orig 2010-07-19 09:10:06.000000000 +0200
++++ ClanLib-2.2.7/Sources/Core/Makefile.am 2011-03-26 14:43:21.808912129 +0100
+@@ -164,7 +164,7 @@
-+libclanApp_la_LIBADD = ../Core/libclanCore.la
- libclanApp_la_LDFLAGS = \
- -release $(LT_RELEASE) \
- -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
---- ClanLib-0.7.8/Sources/Display/Makefile.am.orig 2003-09-15 16:18:50.000000000 +0200
-+++ ClanLib-0.7.8/Sources/Display/Makefile.am 2003-10-09 23:16:41.208157272 +0200
-@@ -3,7 +3,7 @@
- # FIXME: This needs to be @LIBS@ or @X11LIBS@ or something like that
- if WIN32
- else
--libclanDisplay_la_LIBADD = -L/usr/X11R6/lib/ -lX11 -lXmu -lGL -lGLU -lpng -ljpeg -lXxf86vm @X_LIBS@
-+libclanDisplay_la_LIBADD = -lX11 -lpng -ljpeg -lXxf86vm @X_LIBS@ ../Core/libclanCore.la
endif
- libclanDisplay_la_SOURCES = \
---- ClanLib-0.8.0-RC1/Sources/GL/Makefile.am.orig 2005-02-11 15:13:43.000000000 +0100
-+++ ClanLib-0.8.0-RC1/Sources/GL/Makefile.am 2006-01-25 23:38:11.091887750 +0100
-@@ -51,7 +51,7 @@
- GLX/input_device_x11keyboard.h \
- GLX/input_device_xinput.cpp \
- GLX/input_device_xinput.h
--libclanGL_la_LIBADD = -lXxf86vm -lXi -lGLU -lGL
-+libclanGL_la_LIBADD = -lXxf86vm -lXi -lGLU -lGL ../Display/libclanDisplay.la
+-libclan30Core_la_LIBADD = @LIBPTHREAD@
++libclan30Core_la_LIBADD = @LIBPTHREAD@ -lpthread
+
+ libclan30Core_la_LDFLAGS = \
+ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE) \
+--- ClanLib-2.2.7/Sources/Network/Makefile.am.orig 2011-01-27 09:46:22.000000000 +0100
++++ ClanLib-2.2.7/Sources/Network/Makefile.am 2011-03-26 14:55:17.676908777 +0100
+@@ -45,9 +45,10 @@
+ setupnetwork_unix.cpp
endif
- EXTRA_DIST = \
---- ClanLib-0.7.4/Sources/GUI/Makefile.am.orig 2003-09-15 16:18:50.000000000 +0200
-+++ ClanLib-0.7.4/Sources/GUI/Makefile.am 2003-10-09 23:19:13.152058288 +0200
-@@ -82,6 +82,8 @@
- filedialog.cpp \
- window_generic.h
++libclan30Network_la_LIBADD = $(top_builddir)/Sources/Core/libclan30Core.la
+ libclan30Network_la_LDFLAGS = \
+ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE) \
+- $(extra_LIBS_Network)
++ $(extra_LIBS_clanNetwork)
-+libclanGUI_la_LIBADD = ../Display/libclanDisplay.la
-+
- libclanGUI_la_LDFLAGS = \
- -release $(LT_RELEASE) \
- -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
---- ClanLib-0.7.4/Sources/GUIStyleSilver/Makefile.am.orig 2003-09-15 16:18:50.000000000 +0200
-+++ ClanLib-0.7.4/Sources/GUIStyleSilver/Makefile.am 2003-10-09 23:21:06.631806744 +0200
-@@ -10,6 +10,7 @@
- image_silver.h progressbar_silver.h window_silver.h \
- inputbox_silver.h radiobutton_silver.h
-
-+libclanGUIStyleSilver_la_LIBADD = ../GUI/libclanGUI.la
- libclanGUIStyleSilver_la_LDFLAGS = \
- -release $(LT_RELEASE) \
- -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
---- ClanLib-0.7.4/Sources/MikMod/Makefile.am.orig 2003-09-15 16:18:50.000000000 +0200
-+++ ClanLib-0.7.4/Sources/MikMod/Makefile.am 2003-10-09 23:24:59.453412480 +0200
-@@ -8,7 +8,7 @@
- soundprovider_mikmod.cpp \
- soundprovider_mikmod_session.cpp
-
--libclanMikMod_la_LIBADD = -lmikmod
-+libclanMikMod_la_LIBADD = -lmikmod ../Sound/libclanSound.la
-
- libclanMikMod_la_LDFLAGS = \
- -release $(LT_RELEASE) \
---- ClanLib-0.7.4/Sources/Network/Makefile.am.orig 2003-09-15 16:18:50.000000000 +0200
-+++ ClanLib-0.7.4/Sources/Network/Makefile.am 2003-10-09 23:25:43.592702288 +0200
-@@ -69,6 +69,7 @@
- libclanNetwork_la_SOURCES += setupnetwork_unix.cpp
- endif
+ libclan30Sound_la_CXXFLAGS=$(Network_CXXFLAGS) $(extra_CFLAGS_Network)
-+libclanNetwork_la_LIBADD = ../Core/libclanCore.la
- libclanNetwork_la_LDFLAGS = \
- -release $(LT_RELEASE) \
- -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
---- ClanLib-0.7.4/Sources/SDL/Makefile.am.orig 2003-09-15 16:18:50.000000000 +0200
-+++ ClanLib-0.7.4/Sources/SDL/Makefile.am 2003-10-09 23:26:23.644613472 +0200
-@@ -20,7 +20,7 @@
- surface_sdl.h
-
- libclanSDL_la_CXXFLAGS = $(SDL_CFLAGS)
--libclanSDL_la_LIBADD = $(SDL_LIBS)
-+libclanSDL_la_LIBADD = $(SDL_LIBS) ../Display/libclanDisplay.la
-
- libclanSDL_la_LDFLAGS = \
- -release $(LT_RELEASE) \
---- ClanLib-0.7.4/Sources/Sound/Makefile.am.orig 2003-09-15 16:18:50.000000000 +0200
-+++ ClanLib-0.7.4/Sources/Sound/Makefile.am 2003-10-09 23:27:44.491322904 +0200
-@@ -36,6 +36,7 @@
- Unix/soundoutput_oss.h
+--- ClanLib-2.2.7/Sources/Sound/Makefile.am.orig 2010-07-05 16:50:31.000000000 +0200
++++ ClanLib-2.2.7/Sources/Sound/Makefile.am 2011-03-26 14:45:51.348911291 +0100
+@@ -55,6 +55,7 @@
+ SoundProviders/Unix/soundprovider_recorder_oss.h
endif
-+libclanSound_la_LIBADD = ../Core/libclanCore.la
- libclanSound_la_LDFLAGS = \
- -release $(LT_RELEASE) \
- -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
---- ClanLib-0.7.4/Sources/Vorbis/Makefile.am.orig 2003-09-15 16:18:50.000000000 +0200
-+++ ClanLib-0.7.4/Sources/Vorbis/Makefile.am 2003-10-09 23:28:39.064026592 +0200
-@@ -5,7 +5,7 @@
- soundprovider_vorbis.cpp \
- soundprovider_vorbis_session.cpp
-
--libclanVorbis_la_LIBADD = -logg -lvorbis
-+libclanVorbis_la_LIBADD = -logg -lvorbis ../Sound/libclanSound.la
-
- libclanVorbis_la_LDFLAGS = \
- -release $(LT_RELEASE) \
---- ClanLib-0.8.0-RC1/Sources/Core/Makefile.am.orig 2005-07-10 01:25:31.000000000 +0200
-+++ ClanLib-0.8.0-RC1/Sources/Core/Makefile.am 2006-01-26 21:57:59.647858500 +0100
-@@ -125,7 +125,7 @@
++libclan30Sound_la_LIBADD = $(top_builddir)/Sources/Core/libclan30Core.la
+ libclan30Sound_la_LDFLAGS = \
+ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE) \
+ $(extra_LIBS_clanSound)
+--- ClanLib-2.2.7/Sources/CSSLayout/Makefile.am.orig 2010-07-05 16:50:31.000000000 +0200
++++ ClanLib-2.2.7/Sources/CSSLayout/Makefile.am 2011-03-26 14:47:45.184912129 +0100
+@@ -380,6 +380,7 @@
+ precomp.cpp \
+ precomp.h
+
++libclan30CSSLayout_la_LIBADD = $(top_builddir)/Sources/Display/libclan30Display.la $(top_builddir)/Sources/Core/libclan30Core.la
+ libclan30CSSLayout_la_LDFLAGS = \
+ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE) \
+ $(extra_LIBS_clanCSSLayout)
+--- ClanLib-2.2.7/Sources/GL/Makefile.am.orig 2011-01-27 09:46:22.000000000 +0100
++++ ClanLib-2.2.7/Sources/GL/Makefile.am 2011-03-26 14:57:45.268909615 +0100
+@@ -48,6 +48,7 @@
+ GLX/opengl_window_provider_glx.cpp \
+ GLX/opengl_window_provider_glx.h
+ endif
++libclan30GL_la_LIBADD = $(top_builddir)/Sources/Display/libclan30Display.la $(top_builddir)/Sources/Core/libclan30Core.la
+ libclan30GL_la_LDFLAGS = \
+ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE) \
+ $(extra_LIBS_clanGL)
+--- ClanLib-2.2.7/Sources/Database/Makefile.am.orig 2010-11-01 09:26:08.000000000 +0100
++++ ClanLib-2.2.7/Sources/Database/Makefile.am 2011-03-26 15:00:40.788912129 +0100
+@@ -8,6 +8,7 @@
+ db_value.cpp \
+ db_transaction.cpp
+
++libclan30Database_la_LIBADD = $(top_builddir)/Sources/Core/libclan30Core.la
+ libclan30Database_la_LDFLAGS = \
+ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE) \
+ $(extra_LIBS_clanDatabase)
+--- ClanLib-2.2.7/Sources/App/Makefile.am.orig 2010-07-05 16:50:31.000000000 +0200
++++ ClanLib-2.2.7/Sources/App/Makefile.am 2011-03-26 15:01:37.480908777 +0100
+@@ -6,6 +6,7 @@
+ libclan30App_la_SOURCES = Unix/clanapp.cpp
endif
- # FIXME: Hardcoding these here might not be a good idea
--libclanCore_la_LIBADD = @LIBPTHREAD@
-+libclanCore_la_LIBADD = @LIBPTHREAD@ ../Signals/libclanSignals.la -ldl
-
- libclanCore_la_LDFLAGS = \
- -release $(LT_RELEASE) \
---- ClanLib-0.8.0-RC1/configure.ac.orig 2005-10-20 22:57:15.000000000 +0200
-+++ ClanLib-0.8.0-RC1/configure.ac 2006-01-26 18:13:46.567093500 +0100
-@@ -422,16 +422,15 @@
++libclan30App_la_LIBADD = $(top_builddir)/Sources/Core/libclan30Core.la
+ libclan30App_la_LDFLAGS = \
+ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE) \
+ $(extra_LIBS_clanApp)
+--- ClanLib-2.2.7/Sources/GUI/Makefile.am.orig 2010-07-05 16:50:31.000000000 +0200
++++ ClanLib-2.2.7/Sources/GUI/Makefile.am 2011-03-26 15:04:04.180909615 +0100
+@@ -112,6 +112,7 @@
+ gui_theme_default_impl.h \
+ precomp.h
+
++libclan30GUI_la_LIBADD = $(top_builddir)/Sources/CSSLayout/libclan30CSSLayout.la $(top_builddir)/Sources/Display/libclan30Display.la $(top_builddir)/Sources/Core/libclan30Core.la
+ libclan30GUI_la_LDFLAGS = \
+ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE) \
+ $(extra_LIBS_clanGUI)
+--- ClanLib-2.2.7/Sources/Sqlite/Makefile.am.orig 2010-07-05 16:50:31.000000000 +0200
++++ ClanLib-2.2.7/Sources/Sqlite/Makefile.am 2011-03-26 15:06:37.852907938 +0100
+@@ -9,9 +9,10 @@
+ sqlite_reader_provider.cpp \
+ sqlite_transaction_provider.cpp
+
++libclan30Sqlite_la_LIBADD = $(top_builddir)/Sources/Database/libclan30Database.la $(top_builddir)/Sources/Core/libclan30Core.la -lpthread -lsqlite3
+ libclan30Sqlite_la_LDFLAGS = \
+ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE) \
+- $(extra_LIBS_Sqlite)
++ $(extra_LIBS_clanSqlite)
+
+ libclan30Sound_la_CXXFLAGS=$(Sqlite_CXXFLAGS) $(extra_CFLAGS_Sqlite)
+
+--- ClanLib-2.3.1/Sources/Display/Makefile.am.orig 2011-07-26 11:43:05.000000000 +0200
++++ ClanLib-2.3.1/Sources/Display/Makefile.am 2011-08-10 09:48:40.939755410 +0200
+@@ -1,6 +1,7 @@
+ lib_LTLIBRARIES = libclan30Display.la
+
+ if WIN32
++libclan30Display_la_LIBADD =
+ else
+ libclan30Display_la_LIBADD = -lpng -ljpeg
+ endif
+@@ -201,7 +202,7 @@
+ X11/font_config.cpp \
+ X11/font_config.h
+ endif
+-
++libclan30Display_la_LIBADD += $(top_builddir)/Sources/Core/libclan30Core.la $(clanDisplay_LIBS)
+ libclan30Display_la_LDFLAGS = \
+ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE) \
+ $(extra_LIBS_clanDisplay
+--- ClanLib-2.2.7/Sources/SWRender/Makefile.am.orig 2010-07-05 16:50:31.000000000 +0200
++++ ClanLib-2.2.7/Sources/SWRender/Makefile.am 2011-03-27 07:33:24.821729730 +0200
+@@ -69,9 +69,10 @@
+ Canvas/Commands/pixel_command_triangle.cpp \
+ swr_target.cpp
+
++libclan30SWRender_la_LIBADD = $(top_builddir)/Sources/Display/libclan30Display.la $(top_builddir)/Sources/Core/libclan30Core.la
+ libclan30SWRender_la_LDFLAGS = \
+ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE) \
+- $(extra_LIBS_SWRender)
++ $(extra_LIBS_clanSWRender)
+
+ libclan30Sound_la_CXXFLAGS=$(SWRender_CXXFLAGS) $(extra_CFLAGS_SWRender)
+
+--- ClanLib-2.2.7/configure.ac.orig 2011-01-27 09:46:22.000000000 +0100
++++ ClanLib-2.2.7/configure.ac 2011-03-26 15:25:57.540910453 +0100
+@@ -631,9 +631,14 @@
+ dnl Set the include path
CXXFLAGS="$CXXFLAGS -I\$(top_srcdir)/Sources"
- # Modules which will be build
--ClanLib_Modules="Application"
++ClanLib_Modules=
++ClanLib_pkgconfig=
++ClanLib_API_Modules=
+ dnl Modules which will be build
+-ClanLib_Modules="App"
-ClanLib_pkgconfig="clanApp.pc"
-+ClanLib_Modules="Signals Core Application"
-+ClanLib_pkgconfig="clanSignals.pc clanCore.pc clanApp.pc"
-
- # API header files for the Modules which will be installed
--ClanLib_API_Modules="$ClanLib_API_Modules \$(clanApp_includes)"
-+ClanLib_API_Modules="$ClanLib_API_Modules \$(clanSignals_includes) \$(clanCore_includes) \$(clanApp_includes)"
-
- # Default examples which will be build
- ClanLib_Examples="Directory Minimum Resources ResourcesCustom Signals ThreadSync XML Zip"
++CLANLIB_ENABLE_MODULES(Core)
++
++ClanLib_Modules="$ClanLib_Modules App"
++ClanLib_pkgconfig="$ClanLib_pkgconfig clanApp.pc"
--CLANLIB_ENABLE_MODULES([Core Signals])
+ dnl API header files for the Modules which will be installed
+ ClanLib_API_Modules="$ClanLib_API_Modules \$(clanApp_includes)"
+@@ -641,7 +646,6 @@
+ dnl Default examples which will be build
+ dnl (Currently Disabled)
+ ClanLib_Examples=""
+-CLANLIB_ENABLE_MODULES(Core)
if test "$enable_clanDisplay" = "yes"; then
- CLANLIB_ENABLE_MODULES(Display)
-@@ -625,6 +624,8 @@
- AC_SUBST(ClanLib_Examples)
-
- AC_CONFIG_FILES([
-+ pkgconfig/clanSignals.pc
-+ pkgconfig/clanCore.pc
- pkgconfig/clanApp.pc
- pkgconfig/Makefile
- Makefile
-@@ -632,6 +633,8 @@
- Examples/Makefile.conf
- Setup/Makefile
- Sources/API/Makefile
-+ Sources/Signals/Makefile
-+ Sources/Core/Makefile
- Sources/Application/Makefile
- Sources/Makefile
- Tests/Makefile.conf
+ CLANLIB_ENABLE_MODULES(Display)
+@@ -681,14 +686,14 @@
+ if test "$enable_clanGL" = "yes"; then
+ CLANLIB_ENABLE_MODULES(GL)
+ fi
++if test "$enable_clanCSSLayout" = "yes"; then
++ CLANLIB_ENABLE_MODULES(CSSLayout)
++fi
+
+ if test "$enable_clanGUI" = "yes"; then
+ CLANLIB_ENABLE_MODULES(GUI)
+ fi
+
+-if test "$enable_clanCSSLayout" = "yes"; then
+- CLANLIB_ENABLE_MODULES(CSSLayout)
+-fi
+ if test "$enable_clanSWRender" = "yes"; then
+ CLANLIB_ENABLE_MODULES(SWRender)
+ fi
+--- ClanLib-3.0.0/Sources/Compute/Makefile.am.orig 2013-11-05 19:30:01.877180958 +0100
++++ ClanLib-3.0.0/Sources/Compute/Makefile.am 2013-11-05 19:30:17.203847516 +0100
+@@ -21,6 +21,7 @@
+ compute_program.cpp \
+ setup_compute.cpp
+
++libclan30Compute_la_LIBADD = $(top_builddir)/Sources/Core/libclan30Core.la $(top_builddir)/Sources/GL/libclan30GL.la
+ libclan30Compute_la_LDFLAGS = \
+ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE) \
+ $(extra_LIBS_Compute)
+--- ClanLib-3.0.0/Sources/Scene3D/Makefile.am.orig 2013-11-05 19:33:55.787179266 +0100
++++ ClanLib-3.0.0/Sources/Scene3D/Makefile.am 2013-11-05 19:34:39.483845615 +0100
+@@ -46,6 +46,7 @@
+ Performance/gpu_timer.cpp \
+ Performance/scope_timer.cpp
+
++libclan30Scene3D_la_LIBADD = $(top_builddir)/Sources/Core/libclan30Core.la $(top_builddir)/Sources/GL/libclan30GL.la
+ libclan30Scene3D_la_LDFLAGS = \
+ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE) \
+ $(extra_LIBS_clanScene3D)
+--- ClanLib-3.0.0/Sources/Physics3D/Makefile.am.orig 2013-11-05 19:35:36.817178534 +0100
++++ ClanLib-3.0.0/Sources/Physics3D/Makefile.am 2013-11-05 19:35:51.530511761 +0100
+@@ -137,6 +137,7 @@
+ physics3d_ray_test.cpp \
+ physics3d_contact_test.cpp
+
++libclan30Physics3D_la_LIBADD = $(top_builddir)/Sources/Core/libclan30Core.la
+ libclan30Physics3D_la_LDFLAGS = \
+ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE) \
+ $(extra_LIBS_clanPhysics3D)
+--- ClanLib-3.0.0/Sources/Physics2D/Makefile.am.orig 2013-09-24 13:53:31.000000000 +0200
++++ ClanLib-3.0.0/Sources/Physics2D/Makefile.am 2013-11-05 19:37:26.527177740 +0100
+@@ -82,6 +82,7 @@
+ Collision/Shapes/circle_shape.cpp \
+ Collision/physics_object.cpp
+
++libclan30Physics2D_la_LIBADD = $(top_builddir)/Sources/Display/libclan30Display.la $(top_builddir)/Sources/Core/libclan30Core.la
+ libclan30Physics2D_la_LDFLAGS = \
+ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE) \
+ $(extra_LIBS_clanPhysics2D)
+--- ClanLib-3.0.0/Sources/GameIDE/Makefile.am.orig 2013-11-05 19:38:08.570510770 +0100
++++ ClanLib-3.0.0/Sources/GameIDE/Makefile.am 2013-11-05 19:39:03.023843708 +0100
+@@ -157,6 +157,7 @@
+ TextEditor/Scintilla/lexlib/LexerModule.cxx
+ endif
+
++libclan30GameIDE_la_LIBADD = $(top_builddir)/Sources/GUI/libclan30GUI.la
+ libclan30GameIDE_la_LDFLAGS = \
+ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE) \
+ $(extra_LIBS_clanGameIDE)
+--- ClanLib-3.0.0/Sources/Scene3D/Passes/GBuffer/gbuffer_pass.cpp~ 2013-09-24 13:53:31.000000000 +0200
++++ ClanLib-3.0.0/Sources/Scene3D/Passes/GBuffer/gbuffer_pass.cpp 2013-11-05 20:08:58.168398046 +0100
+@@ -35,7 +35,7 @@
+
+ namespace clan
+ {
+-
++extern cl_tls_variable GLFunctions *OpenGL::functions;
+
+ GBufferPass::GBufferPass(ResourceContainer &inout)
+ {
projects / packages / ClanLib.git / blobdiff