~vanvugt/ubuntu/quantal/nux/fix-1039155

Committer: Jay Taoko
Date: 2012-05-25 20:36:09 UTC
mto: (159.372.1 nux.api-3.0)
mto: This revision was merged to the branch mainline in revision 349.
Revision ID: jay.taoko@canonical.com-20120525203609-zhgdionqh4wnq87o

* Deprecated nux-image library. The feature by nux-image has been merged into nux-graphics.
* Removed NuxImage Directory.
* Tests are compiling.
* Updated Nux API version to 3.0.

files removed:
NuxImage

NuxImage/Makefile.am

NuxImage/nux-image.pc.in

files renamed:
NuxImage/BitmapFormats.cpp => NuxGraphics/BitmapFormats.cpp

NuxImage/BitmapFormats.h => NuxGraphics/BitmapFormats.h

NuxImage/CairoGraphics.cpp => NuxGraphics/CairoGraphics.cpp

NuxImage/CairoGraphics.h => NuxGraphics/CairoGraphics.h

NuxImage/GdkGraphics.cpp => NuxGraphics/GdkGraphics.cpp

NuxImage/GdkGraphics.h => NuxGraphics/GdkGraphics.h

NuxImage/ImageSurface.cpp => NuxGraphics/ImageSurface.cpp

NuxImage/ImageSurface.h => NuxGraphics/ImageSurface.h

files modified:
Makefile.am

Nux/AnimatedTextureArea.cpp

Nux/Makefile.am

Nux/PangoText.cpp

Nux/StaticText.cpp

Nux/TextEntry.cpp

Nux/TextEntry.h

Nux/TextLoader.cpp

Nux/TextureArea.cpp

Nux/nux.pc.in

NuxGraphics/GLResource.h

NuxGraphics/GraphicsEngine.cpp

NuxGraphics/Makefile.am

NuxGraphics/RenderingPipeGLSL.cpp

NuxGraphics/RenderingPipeTextureBlend.cpp

NuxGraphics/nux-graphics.pc.in

configure.ac

examples/Makefile.am

gputests/Makefile.am

gputests/arb_programs_limits.cpp

gputests/framebufferobject.cpp

gputests/quad_2texmod.cpp

gputests/texture_blur.cpp

gputests/texture_copy_blur.cpp

gputests/texture_data.cpp

gputests/texture_power_of_2.cpp

tests/Makefile.am

Show diffs side-by-side

added added

removed removed

Nux/Makefile.am

libnux_@NUX_API_VERSION@_la_LIBADD = \

$(top_builddir)/NuxCore/libnux-core-@NUX_API_VERSION@.la \

$(top_builddir)/NuxImage/libnux-image-@NUX_API_VERSION@.la \

$(top_builddir)/NuxGraphics/libnux-graphics-@NUX_API_VERSION@.la \

$(NUX_LIBS) \

$(IBUS_LIBS)

Older »