rpms/mygui/F-12 MyGUI-Demos, NONE, 1.1 MyGUI-Tools, NONE, 1.1 mygui-layouteditor.desktop, NONE, 1.1 mygui.spec, NONE, 1.1 mygui_missing_headers.patch, NONE, 1.1 mygui_multilib_cflags.patch, NONE, 1.1 resources.xml, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Guido Grazioli
guidograzioli at fedoraproject.org
Sat Dec 5 11:16:28 UTC 2009
Author: guidograzioli
Update of /cvs/pkgs/rpms/mygui/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30934/F-12
Modified Files:
.cvsignore sources
Added Files:
MyGUI-Demos MyGUI-Tools mygui-layouteditor.desktop mygui.spec
mygui_missing_headers.patch mygui_multilib_cflags.patch
resources.xml
Log Message:
* Fri Nov 27 2009 Guido Grazioli <guido.grazioli at gmail.com> - 3.0.0-0.4.2332svn
- Install OGRE platform headers
* Wed Nov 18 2009 Guido Grazioli <guido.grazioli at gmail.com> - 3.0.0-0.3.2332svn
- Fix macros usage
- Fix Release tag
- Add desktop entry for LayoutEditor
- Update patch to fix missing undefined non-weak symbols
- Improve summaries and descriptions
- Remove redundant VERBOSE flag
- Add graphviz BR to generate doxygen graphs
* Fri Oct 30 2009 Guido Grazioli <guido.grazioli at gmail.com> - 3.0.0-2.2332svn
- Fix includes dir
- Remove plugin
* Fri Oct 13 2009 Guido Grazioli <guido.grazioli at gmail.com> - 3.0.0-1.2332svn
- Upstream to svn revision 2332
- Patch cmake build scripts to support multilib
- Fix package summaries
- Fix changelog
- Fix %%doc
- Add Require: ogre-devel to -devel subpackage
- Add -devel-doc subpackage
- Revert source tarball from xz to bzip2
* Sat Oct 03 2009 Guido Grazioli <guido.grazioli at gmail.com> - 2.3.0-4.1861svn
- Add BR: rpm >= 4.6.1-2 needed for F-10 builds (BZ #514480)
* Thu Oct 01 2009 Guido Grazioli <guido.grazioli at gmail.com> - 2.3.0-3.1861svn
- Improve package summary
- Provide scripts to run MyGUI tools
* Wed Sep 30 2009 Guido Grazioli <guido.grazioli at gmail.com> - 2.3.0-2.1861svn
- Add BR: libuuid-devel instead of BR: e2fsprogs-devel for F12+
- Fix License
* Tue Sep 29 2009 Guido Grazioli <guido.grazioli at gmail.com> - 2.3.0-1.1861svn
- Rename from libmygui to mygui
- Symlink fonts in media dir to dejavu-sans-fonts ones
- Add doxygen generated docs to -devel
- Provide a generic script to setup and run demos
- Fix rpmlint warnings
* Mon Sep 28 2009 Guido Grazioli <guido.grazioli at gmail.com> - 2.3.0-0.1861svn
- Initial packaging
--- NEW FILE MyGUI-Demos ---
#!/bin/sh
# Based on Ogre-Samples by Alexey Torkhov shipped with ogre-samples package.
runSample()
{
sample=$1
echo "Running $sample..."
$LIBDIR/MYGUI/Demos/$sample
}
set -e
# find out LIBDIR
if [ -f /usr/lib64/MYGUI/Demos/resources.xml ]; then
LIBDIR=/usr/lib64
else
LIBDIR=/usr/lib
fi
mkdir -p $HOME/.mygui-demos
cd $HOME/.mygui-demos
for i in plugins.cfg resources.xml; do
cp -f $LIBDIR/MYGUI/Demos/$i .
done
set +e
if [ "$1" = "-a" ]; then
for i in `(cd $LIBDIR/MYGUI/Demos/; find -type f -perm +111 | sort)`; do
runSample `echo $i | sed 's|./||'`
done
elif [ $# -ge 1 ]; then
while [ $# -ge 1 ]; do
runSample $1
shift
done
else
echo "Usage:" `basename $0` "(sample)"
echo
echo "sample - runs specified sample from list"
echo
echo -n "Available samples:"
for i in `(cd $LIBDIR/MYGUI/Demos/; find -type f -perm +111 | sort)`; do
echo -n " $i" | sed 's|./||'
done
echo
fi
--- NEW FILE MyGUI-Tools ---
#!/bin/sh
# Based on Ogre-Samples by Alexey Torkhov shipped with ogre-samples package.
runSample()
{
sample=$1
echo "Running $sample..."
$LIBDIR/MYGUI/Tools/$sample
}
set -e
# find out LIBDIR
if [ -f /usr/lib64/MYGUI/Tools/resources.xml ]; then
LIBDIR=/usr/lib64
else
LIBDIR=/usr/lib
fi
mkdir -p $HOME/.mygui-tools
cd $HOME/.mygui-tools
for i in plugins.cfg resources.xml; do
cp -f $LIBDIR/MYGUI/Tools/$i .
done
set +e
if [ "$1" = "-a" ]; then
for i in `(cd $LIBDIR/MYGUI/Tools/; find -type f -perm +111 | sort)`; do
runSample `echo $i | sed 's|./||'`
done
elif [ $# -ge 1 ]; then
while [ $# -ge 1 ]; do
runSample $1
shift
done
else
echo "Usage:" `basename $0` "(tool)"
echo
echo "tool - Runs specified tool from list"
echo
echo -n "Available tools:"
for i in `(cd $LIBDIR/MYGUI/Tools/; find -type f -perm +111 | sort)`; do
echo -n " $i" | sed 's|./||'
done
echo
fi
--- NEW FILE mygui-layouteditor.desktop ---
[Desktop Entry]
Name=MyGUI Layout Editor
GenericName=MyGUI Layout Editor
Comment=Design UIs usgin MyGUI library
Exec=MyGUI-Tools LayoutEditor
Icon=preferences-system-windows.png
Terminal=false
Type=Application
Categories=Development;
--- NEW FILE mygui.spec ---
Name: mygui
Version: 3.0.0
Release: 0.4.2332svn%{?dist}
Summary: Fast, simple and flexible GUI library for Ogre
Group: Development/Libraries
# UnitTests include agg-2.4, which is under a BSD variant (not built or installed here)
License: LGPLv3+
URL: http://my-gui.sourceforge.net/
## tar creation instructions
# svn export -r 2332 https://my-gui.svn.sourceforge.net/svnroot/my-gui/trunk mygui
# tar cfj mygui-2.3.0-2332svn.tar.bz2 mygui
Source0: mygui-2.3.0-2332svn.tar.bz2
# Helper to run demos, based on A. Torkhov Ogre-Samples shipped with ogre-samples
Source1: MyGUI-Demos
# Another helper for the tools
Source2: MyGUI-Tools
# Demo and tools resources configuration
Source3: resources.xml
# LayoutEditor desktop entry
Source4: mygui-layouteditor.desktop
# Fix multilib and flags with cmake
Patch0: mygui_multilib_cflags.patch
# Fix compilation problems with gcc4.4
Patch1: mygui_missing_headers.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: automake, autoconf, libtool, freetype-devel, desktop-file-utils
BuildRequires: ois-devel, ogre-devel, doxygen, graphviz, cmake
%if 0%{?fedora} < 12
BuildRequires: e2fsprogs-devel
%else
BuildRequires: libuuid-devel
%endif
Requires: dejavu-sans-fonts
%description
MyGUI is a GUI library for Ogre Rendering Engine which aims to be fast,
flexible and simple in using.
%package devel
Summary: Development files for MyGUI
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: pkgconfig, ois-devel, ogre-devel
%description devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.
%package devel-doc
Summary: Development documentation for MyGUI
Group: Development/Libraries
BuildArch: noarch
%description devel-doc
The %{name}-devel-doc package contains reference documentation for
developing applications that use %{name}.
%package demos
Summary: MyGUI demo executables and media
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
%description demos
This package contains the compiled (not the source) sample applications coming
with MyGUI. It also contains some media (meshes, textures,...) needed by these
samples. The samples are installed in %{_libdir}/MYGUI/Demos, and an helper
script MyGUI-Demos is provided and installed in %{_bindir}.
%package tools
Summary: MyGUI tools
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
%description tools
This package contains the MyGUI tools, installed in %{_libdir}/MYGUI/Tools.
LayoutEditor is an application for designing UIs using MyGUI library,
ImageSetViewer and FontViewer are simple tools to preview graphical
resources in the media repository.
An helper script MyGUI-Tools is provided and installed in %{_bindir}.
%prep
%setup -q -n %{name}
%patch0 -p1
%patch1 -p1
# Fix eol
sed -i 's/\r//' COPYING.LESSER
# Fix non-UTF8 files
for file in Tools/LayoutEditor/Readme.txt ; do
mv $file timestamp && \
iconv -f ISO-8859-1 -t UTF-8 -o $file timestamp && \
touch -r timestamp $file && \
rm timestamp
done
# Generate README for -tools and -demos
cat > Tools/README << EOT
This package contains the MyGUI tools: ImageSetViewer, FontViewer
and LayoutEditor; to run the tools, launch the helper script
%{_bindir}/MyGUI-Tools
EOT
cat > Demos/README << EOT
This package contains MyGUI demos; to run the demos, launch the
helper script %{_bindir}/MyGUI-Demos
EOT
%build
# Have to run it two times to make it find ogre and freetype
%cmake .
# Plugins are windows only atm
%cmake . \
-DMYGUI_INSTALL_PDB:INTERNAL=FALSE -DCMAKE_BUILD_TYPE:STRING=Release \
-DMYGUI_BUILD_PLUGINS:BOOL=OFF
# -DTARGET_LINK_LIBRARIES:STRING="-luuid -ldl"
make %{?_smp_mflags}
# Generate doxygen documentation
pushd Docs
doxygen
rm -f html/installdox
popd
%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot} INSTALL="install -p"
# install missing headers
install -Dp -m 644 MyGUIEngine/include/*Alloc*.h %{buildroot}/%{_includedir}/MyGUI
install -Dp -m 644 Platforms/Ogre/OgrePlatform/include/* %{buildroot}/%{_includedir}/MyGUI
# Remove any archive
find %{buildroot} -name '*.la' -exec rm -f {} ';'
# Remove binaries installed in %%{_bindir}
rm -rf %{buildroot}/%{_bindir}/
# Create config for ldconfig
mkdir -p %{buildroot}/etc/ld.so.conf.d
echo "%{_libdir}/MYGUI" > %{buildroot}/etc/ld.so.conf.d/%{name}-%{_arch}.conf
# Install the samples
mkdir -p %{buildroot}%{_libdir}/MYGUI/Demos
cp -p %{SOURCE3} bin/plugins.cfg %{buildroot}%{_libdir}/MYGUI/Demos
sed -i 's|^PluginFolder=.*$|PluginFolder=%{_libdir}/OGRE|' \
%{buildroot}%{_libdir}/MYGUI/Demos/plugins.cfg
sed -i 's|^Plugin=RenderSystem_Direct3D9$|#Plugin=RenderSystem_Direct3D9|' \
%{buildroot}%{_libdir}/MYGUI/Demos/plugins.cfg
# Remove sample showing plugin usage
rm bin/Demo_PluginStrangeButton
for file in bin/Demo_* ; do
install -Dp -m 755 $file %{buildroot}%{_libdir}/MYGUI/Demos/`basename $file`
done
mkdir -p %{buildroot}%{_bindir}
install -Dp -m 755 %{SOURCE1} %{buildroot}%{_bindir}
# Install the tools
mkdir -p %{buildroot}%{_libdir}/MYGUI/Tools
cp -p %{SOURCE3} bin/plugins.cfg %{buildroot}%{_libdir}/MYGUI/Tools
sed -i 's|^PluginFolder=.*$|PluginFolder=%{_libdir}/OGRE|' \
%{buildroot}%{_libdir}/MYGUI/Tools/plugins.cfg
sed -i 's|^Plugin=RenderSystem_Direct3D9$|#Plugin=RenderSystem_Direct3D9|' \
%{buildroot}%{_libdir}/MYGUI/Tools/plugins.cfg
for file in bin/LayoutEditor bin/ImageSetViewer bin/FontViewer ; do
install -Dp -m 755 $file %{buildroot}%{_libdir}/MYGUI/Tools/`basename $file`
done
install -Dp -m 755 %{SOURCE2} %{buildroot}%{_bindir}
# Install desktop entry for LayoutEditor
desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE4}
# Copy Media files
mkdir -p %{buildroot}%{_datadir}/MyGUI/
cp -a Media %{buildroot}%{_datadir}/MyGUI/
# Install libMyGUI.OgrePlatform.so
mkdir -p %{buildroot}%{_libdir}/MYGUI
install -Dp -m 755 %{_lib}/libMyGUI.OgrePlatform.so %{buildroot}%{_libdir}/MYGUI/
# Move plugins to %{libdir}/MYGUI (no plugins atm)
#mv %{buildroot}%{_libdir}/libPlugin*.so %{buildroot}%{_libdir}/MYGUI
# Strip away code in media dir
#rm -rf %{buildroot}%{_datadir}/MyGUI/Media/Tools/LayoutEditor/CodeTemplates/
# Strip away unittests media
rm -rf %{buildroot}%{_datadir}/MyGUI/Media/UnitTests
# Link fonts from dejavu package
ln -fs %{_datadir}/fonts/dejavu/DejaVuSans.ttf \
%{buildroot}%{_datadir}/MyGUI/Media/MyGUI_Media/DejaVuSans.ttf
ln -fs %{_datadir}/fonts/dejavu/DejaVuSans-ExtraLight.ttf \
%{buildroot}%{_datadir}/MyGUI/Media/MyGUI_Media/DejaVuSans-ExtraLight.ttf
%clean
rm -rf %{buildroot}
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files
%defattr(-,root,root,-)
%doc COPYING.LESSER
%{_libdir}/*.so.*
%{_libdir}/MYGUI
%dir %{_datadir}/MyGUI/Media
%{_datadir}/MyGUI/Media/Common
%{_datadir}/MyGUI/Media/MyGUI_Media
%{_datadir}/MyGUI/Media/*.layout
%{_datadir}/MyGUI/Media/*.xml
%config(noreplace) %{_sysconfdir}/ld.so.conf.d/*
%files devel
%defattr(-,root,root,-)
%{_includedir}/*
%{_libdir}/*.so
%{_libdir}/pkgconfig/*.pc
%files devel-doc
%defattr(-,root,root,-)
%doc Docs/html
%files demos
%defattr(-,root,root,-)
%doc Demos/README
%{_bindir}/MyGUI-Demos
%{_libdir}/MYGUI/Demos
%{_datadir}/MyGUI/Media/Demos
%files tools
%defattr(-,root,root,-)
%doc Tools/README Tools/LayoutEditor/Readme.txt
%{_bindir}/MyGUI-Tools
%{_libdir}/MYGUI/Tools
%{_datadir}/MyGUI/Media/Tools
%{_datadir}/applications/mygui-layouteditor.desktop
%changelog
* Fri Nov 27 2009 Guido Grazioli <guido.grazioli at gmail.com> - 3.0.0-0.4.2332svn
- Install OGRE platform headers
* Wed Nov 18 2009 Guido Grazioli <guido.grazioli at gmail.com> - 3.0.0-0.3.2332svn
- Fix macros usage
- Fix Release tag
- Add desktop entry for LayoutEditor
- Update patch to fix missing undefined non-weak symbols
- Improve summaries and descriptions
- Remove redundant VERBOSE flag
- Add graphviz BR to generate doxygen graphs
* Fri Oct 30 2009 Guido Grazioli <guido.grazioli at gmail.com> - 3.0.0-2.2332svn
- Fix includes dir
- Remove plugin
* Fri Oct 13 2009 Guido Grazioli <guido.grazioli at gmail.com> - 3.0.0-1.2332svn
- Upstream to svn revision 2332
- Patch cmake build scripts to support multilib
- Fix package summaries
- Fix changelog
- Fix %%doc
- Add Require: ogre-devel to -devel subpackage
- Add -devel-doc subpackage
- Revert source tarball from xz to bzip2
* Sat Oct 03 2009 Guido Grazioli <guido.grazioli at gmail.com> - 2.3.0-4.1861svn
- Add BR: rpm >= 4.6.1-2 needed for F-10 builds (BZ #514480)
* Thu Oct 01 2009 Guido Grazioli <guido.grazioli at gmail.com> - 2.3.0-3.1861svn
- Improve package summary
- Provide scripts to run MyGUI tools
* Wed Sep 30 2009 Guido Grazioli <guido.grazioli at gmail.com> - 2.3.0-2.1861svn
- Add BR: libuuid-devel instead of BR: e2fsprogs-devel for F12+
- Fix License
* Tue Sep 29 2009 Guido Grazioli <guido.grazioli at gmail.com> - 2.3.0-1.1861svn
- Rename from libmygui to mygui
- Symlink fonts in media dir to dejavu-sans-fonts ones
- Add doxygen generated docs to -devel
- Provide a generic script to setup and run demos
- Fix rpmlint warnings
* Mon Sep 28 2009 Guido Grazioli <guido.grazioli at gmail.com> - 2.3.0-0.1861svn
- Initial packaging
mygui_missing_headers.patch:
MyGUIEngine/include/MyGUI_IRenderTarget.h | 1 +
MyGUIEngine/include/MyGUI_ITexture.h | 1 +
MyGUIEngine/include/MyGUI_RenderFormat.h | 2 ++
MyGUIEngine/include/MyGUI_VertexData.h | 1 +
Platforms/Ogre/OgrePlatform/include/MyGUI_OgrePlatform.h | 2 +-
Platforms/Ogre/OgrePlatform/include/MyGUI_OgreRenderManager.h | 1 +
6 files changed, 7 insertions(+), 1 deletion(-)
--- NEW FILE mygui_missing_headers.patch ---
--- A/Platforms/Ogre/OgrePlatform/include/MyGUI_OgrePlatform.h 2009-09-30 01:35:13.000000000 +0200
+++ B/Platforms/Ogre/OgrePlatform/include/MyGUI_OgrePlatform.h 2009-11-27 17:19:29.488111573 +0100
@@ -29,7 +29,7 @@
#include "MyGUI_OgreRenderManager.h"
#include "MyGUI_OgreDataManager.h"
#include "MyGUI_OgreDiagnostic.h"
-#include "MyGUI_OgreTexture.h"
+#include "MyGUI_LogManager.h"
namespace MyGUI
{
--- A/Platforms/Ogre/OgrePlatform/include/MyGUI_OgreRenderManager.h 2009-09-30 02:10:57.000000000 +0200
+++ B/Platforms/Ogre/OgrePlatform/include/MyGUI_OgreRenderManager.h 2009-11-27 17:08:52.381859930 +0100
@@ -27,6 +27,7 @@
#include "MyGUI_RenderFormat.h"
#include "MyGUI_IVertexBuffer.h"
#include "MyGUI_RenderManager.h"
+#include "MyGUI_Types.h"
#include <Ogre.h>
--- A/MyGUIEngine/include/MyGUI_IRenderTarget.h 2009-09-24 01:54:35.000000000 +0200
+++ B/MyGUIEngine/include/MyGUI_IRenderTarget.h 2009-11-27 17:41:13.102861792 +0100
@@ -23,6 +23,7 @@
#ifndef __MYGUI_I_RENDER_TARGET_H__
#define __MYGUI_I_RENDER_TARGET_H__
+#include <string>
#include "MyGUI_Prerequest.h"
#include "MyGUI_RenderTargetInfo.h"
--- A/MyGUIEngine/include/MyGUI_ITexture.h 2009-09-24 01:54:35.000000000 +0200
+++ B/MyGUIEngine/include/MyGUI_ITexture.h 2009-11-27 17:41:48.046874847 +0100
@@ -26,6 +26,7 @@
#include "MyGUI_Prerequest.h"
#include "MyGUI_IRenderTarget.h"
#include "MyGUI_RenderFormat.h"
+#include <string>
namespace MyGUI
{
--- A/MyGUIEngine/include/MyGUI_RenderFormat.h 2009-09-28 03:19:58.000000000 +0200
+++ B/MyGUIEngine/include/MyGUI_RenderFormat.h 2009-11-27 17:02:14.622875175 +0100
@@ -23,6 +23,8 @@
#ifndef __MYGUI_RENDER_FORMAT_H__
#define __MYGUI_RENDER_FORMAT_H__
+#include "MyGUI_Macros.h"
+
namespace MyGUI
{
--- A/MyGUIEngine/include/MyGUI_VertexData.h 2009-06-04 04:34:12.000000000 +0200
+++ B/MyGUIEngine/include/MyGUI_VertexData.h 2009-11-27 17:08:23.382859907 +0100
@@ -24,6 +24,7 @@
#define __MYGUI_VERTEX_DATA_H__
#include "MyGUI_Prerequest.h"
+#include "MyGUI_Types.h"
namespace MyGUI
{
mygui_multilib_cflags.patch:
CMake/ConfigureBuild.cmake | 2 +-
CMake/Templates/MYGUI.pc.in | 6 +++---
CMake/Utils/MyGUIConfigTargets.cmake | 10 ++++++----
CMakeLists.txt | 10 +++++-----
4 files changed, 15 insertions(+), 13 deletions(-)
--- NEW FILE mygui_multilib_cflags.patch ---
--- A/CMakeLists.txt 2009-10-12 23:45:57.564750326 +0200
+++ B/CMakeLists.txt 2009-10-12 23:46:25.879489254 +0200
@@ -46,9 +46,9 @@
endif ()
# Set compiler specific build flags
-if (CMAKE_COMPILER_IS_GNUCXX)
- add_definitions(-msse)
-endif ()
+#if (CMAKE_COMPILER_IS_GNUCXX)
+# add_definitions(-msse)
+#endif ()
if (MSVC)
add_definitions(/fp:fast)
endif ()
@@ -87,8 +87,8 @@
set(MYGUI_LIBRARIES MyGUIEngine)
# Specify build paths
-set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/lib)
-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/lib)
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/lib${LIB_SUFFIX})
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/lib${LIB_SUFFIX})
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/bin)
if (WIN32 OR APPLE)
if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
--- A/CMake/ConfigureBuild.cmake 2009-10-12 23:53:41.447496281 +0200
+++ B/CMake/ConfigureBuild.cmake 2009-10-13 00:02:30.243489356 +0200
@@ -44,7 +44,7 @@
else ()
configure_file(${MYGUI_TEMPLATES_DIR}/MYGUI.pc.in ${MYGUI_BINARY_DIR}/pkgconfig/MYGUI${MYGUI_LIB_SUFFIX}.pc @ONLY)
endif ()
- install(FILES ${MYGUI_BINARY_DIR}/pkgconfig/MYGUI${MYGUI_LIB_SUFFIX}.pc DESTINATION lib/pkgconfig)
+ install(FILES ${MYGUI_BINARY_DIR}/pkgconfig/MYGUI${MYGUI_LIB_SUFFIX}.pc DESTINATION lib${LIB_SUFFIX}/pkgconfig)
# configure additional packages
--- A/CMake/Utils/MyGUIConfigTargets.cmake 2009-10-13 00:44:05.003749853 +0200
+++ B/CMake/Utils/MyGUIConfigTargets.cmake 2009-10-13 00:48:18.378490236 +0200
@@ -38,8 +38,8 @@
function(mygui_install_target TARGETNAME SUFFIX)
install(TARGETS ${TARGETNAME}
RUNTIME DESTINATION "bin${MYGUI_RELEASE_PATH}" CONFIGURATIONS Release None ""
- LIBRARY DESTINATION "lib${MYGUI_LIB_RELEASE_PATH}${SUFFIX}" CONFIGURATIONS Release None ""
- ARCHIVE DESTINATION "lib${MYGUI_LIB_RELEASE_PATH}${SUFFIX}" CONFIGURATIONS Release None ""
+ LIBRARY DESTINATION "lib${LIB_SUFFIX}${MYGUI_LIB_RELEASE_PATH}${SUFFIX}" CONFIGURATIONS Release None ""
+ ARCHIVE DESTINATION "lib${LIB_SUFFIX}${MYGUI_LIB_RELEASE_PATH}${SUFFIX}" CONFIGURATIONS Release None ""
FRAMEWORK DESTINATION "bin${MYGUI_RELEASE_PATH}" CONFIGURATIONS Release None ""
)
install(TARGETS ${TARGETNAME}
@@ -65,8 +65,8 @@
# setup common target settings
function(mygui_config_common TARGETNAME)
set_target_properties(${TARGETNAME} PROPERTIES
- ARCHIVE_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/lib
- LIBRARY_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/lib
+ ARCHIVE_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/lib${LIB_SUFFIX}
+ LIBRARY_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/lib${LIB_SUFFIX}
RUNTIME_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/bin
)
mygui_create_vcproj_userfile(${TARGETNAME})
@@ -198,6 +198,8 @@
set_target_properties(${LIBNAME} PROPERTIES OUTPUT_NAME ${LIBNAME}Static)
else (MYGUI_STATIC)
if (CMAKE_COMPILER_IS_GNUCXX)
+ target_link_libraries(${LIBNAME} uuid)
+ target_link_libraries(${LIBNAME} dl)
# add GCC visibility flags to shared library build
set_target_properties(${LIBNAME} PROPERTIES COMPILE_FLAGS "${MYGUI_GCC_VISIBILITY_FLAGS}")
endif (CMAKE_COMPILER_IS_GNUCXX)
--- A/CMake/Templates/MYGUI.pc.in 2009-10-13 00:29:15.429738822 +0200
+++ B/CMake/Templates/MYGUI.pc.in 2009-10-30 15:22:03.687723109 +0100
@@ -1,11 +1,11 @@
prefix=@MYGUI_PREFIX_PATH@
exec_prefix=${prefix}
-libdir=${prefix}/lib
+libdir=${prefix}/lib at LIB_SUFFIX@
includedir=${prefix}/include
Name: MyGUI
Description: Fast, flexible and simple GUI
Version: @MYGUI_VERSION@
URL: http://www.my-gui.sourceforge.net
-Libs: -L${libdir} -lMyGUIEngine at MYGUI_LIB_SUFFIX@ @MYGUI_ADDITIONAL_LIBS@
-Cflags: -I${includedir} -I${includedir}/MYGUI @MYGUI_CFLAGS@
+Libs: -L${libdir} -L${libdir}/MYGUI -lMyGUIEngine at MYGUI_LIB_SUFFIX@ -lMyGUI.OgrePlatform @MYGUI_ADDITIONAL_LIBS@
+Cflags: -I${includedir} -I${includedir}/MyGUI @MYGUI_CFLAGS@
--- NEW FILE resources.xml ---
<?xml version="1.0" encoding="UTF-8"?>
<Paths>
<Path root="true">/usr/share/MyGUI/Media</Path>
<Path>/usr/share/MyGUI/Media/MyGUI_Media</Path>
<Path>/usr/share/MyGUI/Media/Tools/LayoutEditor</Path>
</Paths>
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mygui/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore 27 Nov 2009 05:51:10 -0000 1.1
+++ .cvsignore 5 Dec 2009 11:16:27 -0000 1.2
@@ -0,0 +1 @@
+mygui-2.3.0-2332svn.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mygui/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources 27 Nov 2009 05:51:10 -0000 1.1
+++ sources 5 Dec 2009 11:16:27 -0000 1.2
@@ -0,0 +1 @@
+4b4fb317f253c42b56756faeeb3ef8c4 mygui-2.3.0-2332svn.tar.bz2
More information about the fedora-extras-commits
mailing list