games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-24 22:14:36 +02:00
Code Issues Releases Activity

* Fixed building, installing on Fedora * Updated RPM spec

Browse Source
This commit is contained in:
beegee1 2012-10-06 16:09:20 +00:00
parent 2942e2e824
commit 3f0c225880
3 changed files with 27 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
CMakeLists.txt
View File

@ -48,8 +48,11 @@ if(WIN32) # on Win everything goes into H3 root directory
set(LIB_DIR "" CACHE STRING "Where to install main library") set(LIB_DIR "" CACHE STRING "Where to install main library")
set(DATA_DIR "" CACHE STRING "Where to install data files") set(DATA_DIR "" CACHE STRING "Where to install data files")
else() else()
# includes lib path which determines where to install shared libraries (either /lib or /lib64)
include(GNUInstallDirs)
set(BIN_DIR "bin" CACHE STRING "Where to install binaries") set(BIN_DIR "bin" CACHE STRING "Where to install binaries")
set(LIB_DIR "lib/vcmi" CACHE STRING "Where to install main library") set(LIB_DIR "${CMAKE_INSTALL_LIBDIR}/vcmi" CACHE STRING "Where to install main library")
set(DATA_DIR "share/vcmi" CACHE STRING "Where to install data files") set(DATA_DIR "share/vcmi" CACHE STRING "Where to install data files")
endif() endif()
@ -61,6 +64,10 @@ add_definitions(-DM_DATA_DIR="${CMAKE_INSTALL_PREFIX}/${DATA_DIR}")
add_definitions(-DM_BIN_DIR="${CMAKE_INSTALL_PREFIX}/${BIN_DIR}") add_definitions(-DM_BIN_DIR="${CMAKE_INSTALL_PREFIX}/${BIN_DIR}")
add_definitions(-DM_LIB_DIR="${CMAKE_INSTALL_PREFIX}/${LIB_DIR}") add_definitions(-DM_LIB_DIR="${CMAKE_INSTALL_PREFIX}/${LIB_DIR}")
# remain full RPATH when installing (needed to find shared libraries)
SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/vcmi")
SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
add_subdirectory(lib) add_subdirectory(lib)
add_subdirectory(client) add_subdirectory(client)
add_subdirectory(server) add_subdirectory(server)

5
cmake_modules/FindFFMPEG_swscale.cmake
View File

@ -4,9 +4,8 @@
# FFMPEG_INCLUDE_DIR # FFMPEG_INCLUDE_DIR
# FFMPEG_LIBRARIES # FFMPEG_LIBRARIES
FIND_PATH( FFMPEG_INCLUDE_DIR NAMES ffmpeg/avcodec.h libavcodec/avcodec.h FIND_PATH( FFMPEG_INCLUDE_DIR NAMES libavcodec/avcodec.h ffmpeg/avcodec.h
/usr/include PATHS /usr/include /usr/local/include /usr/include/ffmpeg
/usr/local/include
) )
IF( FFMPEG_INCLUDE_DIR ) IF( FFMPEG_INCLUDE_DIR )

32
rpm/vcmi.spec
View File

@ -1,29 +1,29 @@
Summary: VCMI is an open-source project aiming to reimplement HMM3:WoG game engine, giving it new and extended possibilities. Summary: VCMI is an open-source project aiming to reimplement HMM3:WoG game engine, giving it new and extended possibilities.
Name: vcmi Name: vcmi
Version: 0.89 Version: 0.9
Release: 1%{?dist} Release: 1%{?dist}
License: GPLv2+ License: GPLv2+
Group: Amusements/Games Group: Amusements/Games
# The source for this package was pulled from upstream's vcs. Use the # The source for this package was pulled from upstream's vcs. Use the
# following commands to generate the tarball: # following commands to generate the tarball:
# svn export -r HEAD https://vcmi.svn.sourceforge.net/svnroot/vcmi/tags/0.89 vcmi-0.89-1 # svn export -r HEAD https://vcmi.svn.sourceforge.net/svnroot/vcmi/tags/0.9 vcmi-0.9-1
# tar -cJvf vcmi-0.89-1.tar.xz vcmi-0.89-1 # tar -cJf vcmi-0.9-1.tar.xz vcmi-0.9-1
Source: vcmi-0.89-1.tar.xz Source: vcmi-0.9-1.tar.xz
URL: http://forum.vcmi.eu/portal.php URL: http://forum.vcmi.eu/portal.php
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: SDL-devel BuildRequires: SDL-devel
BuildRequires: SDL_image-devel BuildRequires: SDL_image-devel
BuildRequires: SDL_ttf-devel BuildRequires: SDL_ttf-devel
BuildRequires: SDL_mixer-devel BuildRequires: SDL_mixer-devel >= 1.2.8
BuildRequires: boost BuildRequires: boost >= 1.44
BuildRequires: boost-devel BuildRequires: boost-devel >= 1.44
BuildRequires: boost-filesystem BuildRequires: boost-filesystem >= 1.44
BuildRequires: boost-iostreams BuildRequires: boost-iostreams >= 1.44
BuildRequires: boost-system BuildRequires: boost-system >= 1.44
BuildRequires: boost-thread BuildRequires: boost-thread >= 1.44
BuildRequires: boost-program-options BuildRequires: boost-program-options >= 1.44
BuildRequires: zlib-devel BuildRequires: zlib-devel
BuildRequires: ffmpeg-devel BuildRequires: ffmpeg-devel
BuildRequires: ffmpeg-libs BuildRequires: ffmpeg-libs
@ -39,13 +39,12 @@ As yet VCMI is not standalone program, it uses Wake of Gods files and graphics.
%setup -q -n %{name}-%{version}-1 %setup -q -n %{name}-%{version}-1
%build %build
./configure --datadir=%{_datadir} --bindir=%{_bindir} --libdir=%{_libdir} cmake -DCMAKE_INSTALL_PREFIX=/usr ./
make %{?_smp_mflags} make %{?_smp_mflags}
%install %install
rm -rf %{buildroot} rm -rf %{buildroot}
make DESTDIR=%{buildroot} install make DESTDIR=%{buildroot} install
mkdir -p %{buildroot}%{_datadir}/%{name}/
%files %files
%doc README README.linux COPYING AUTHORS ChangeLog %doc README README.linux COPYING AUTHORS ChangeLog
@ -53,10 +52,13 @@ mkdir -p %{buildroot}%{_datadir}/%{name}/
%{_bindir}/vcmiserver %{_bindir}/vcmiserver
%{_libdir}/%{name}/* %{_libdir}/%{name}/*
%dir %{_datadir}/%{name} %{_datadir}/%{name}/*
%{_datadir}/applications/* %{_datadir}/applications/*
%{_datadir}/icons/* %{_datadir}/icons/*
%changelog %changelog
* Sat Oct 06 2012 VCMI - 0.9-1
- New upstream release
* Sun Jun 08 2012 VCMI - 0.89-1 * Sun Jun 08 2012 VCMI - 0.89-1
- Initial version - Initial version