Merge branch 'release/3.12.0'

This commit is contained in:
filux 2016-01-24 12:33:56 +01:00
commit 0fcffb1d84
904 changed files with 14993 additions and 114497 deletions

1
.gitattributes vendored
View File

@ -38,3 +38,4 @@ robots.txt eol=lf
.gitignore export-ignore
.gitattributes export-ignore
.gitmodules export-ignore
README.md export-ignore

6
.gitignore vendored
View File

@ -39,6 +39,7 @@ $RECYCLE.BIN/
*.tar
*.zip
*.bz2
*.tar.xz
## Logs and databases
*.log
@ -51,6 +52,8 @@ $RECYCLE.BIN/
!.gitattributes
!.gitmodules
!.travis-before_install.sh
## Repo
*.blend
*.blend1
@ -58,6 +61,3 @@ $RECYCLE.BIN/
# breakpad symlink / directory
/google-breakpad
/google-breakpad/
# convert_faction_xml2html
/html/

6
.gitmodules vendored
View File

@ -1,3 +1,9 @@
[submodule "data/glest_game"]
path = data/glest_game
url = https://github.com/MegaGlest/megaglest-data.git
[submodule "source/masterserver"]
path = source/masterserver
url = https://github.com/MegaGlest/megaglest-masterserver.git
[submodule "mk/linux/tools-for-standalone-client/installer/mojosetup"]
path = mk/linux/tools-for-standalone-client/installer/mojosetup
url = https://github.com/MegaGlest-Community/mojosetup-fork.git

12
.travis-before_install.sh Executable file
View File

@ -0,0 +1,12 @@
#!/bin/sh
set -ex
wget https://www.libsdl.org/release/SDL2-2.0.3.tar.gz
tar xf SDL2-2.0.3.tar.gz
(
cd SDL2-2.0.3
./configure --enable-static --disable-shared
make
sudo make install
)

View File

@ -1,16 +1,42 @@
# http://docs.travis-ci.com/user/build-configuration/
# https://docs.travis-ci.com/user/customizing-the-build/
language: cpp
sudo: required
os:
- linux
- osx
compiler:
- gcc
- clang
env:
- GCC_VERSION="5"
- GCC_VERSION="native"
- LLVM_VERSION="3.7"
- LLVM_VERSION="native"
matrix:
#include:
# - compiler: gcc
# - compiler: clang
allow_failures:
exclude:
- compiler: gcc
env: LLVM_VERSION="3.7"
- compiler: gcc
env: LLVM_VERSION="native"
- compiler: clang
env: GCC_VERSION="5"
- compiler: clang
env: GCC_VERSION="native"
- os: linux
compiler: clang
env: LLVM_VERSION="native" # broken compiler
- os: osx
compiler: gcc # unsupported compiler
- os: osx
compiler: clang
env: LLVM_VERSION="3.7" # missing compiler by brew
#allow_failures:
# - os: osx
git:
submodules: false
@ -20,24 +46,41 @@ git:
# - master
before_install:
- sudo apt-get update -qq # UPDATE REPOS
#- sudo apt-get upgrade -qq # UPGRADE SYSTEM TO LATEST PATCH LEVEL
- sudo apt-get install -y -qq
- sudo mk/linux/setupBuildDeps.sh --quiet # INSTALL OUR DEPENDENCIES
- if [ "$TRAVIS_OS_NAME" = "linux" ] && [ "$GCC_VERSION" != "native" ]; then sudo add-apt-repository --yes ppa:ubuntu-toolchain-r/test; fi
# https://launchpad.net/~ubuntu-toolchain-r/+archive/ubuntu/test
- if [ "$TRAVIS_OS_NAME" = "linux" ] && [ "$CXX" == "clang++" ] && [ "$LLVM_VERSION" != "native" ]; then sudo add-apt-repository --yes 'deb http://llvm.org/apt/precise/ llvm-toolchain-precise main'; fi
- if [ "$TRAVIS_OS_NAME" = "linux" ] && [ "$CXX" == "clang++" ] && [ "$LLVM_VERSION" != "native" ]; then sudo add-apt-repository --yes "deb http://llvm.org/apt/precise/ llvm-toolchain-precise-${LLVM_VERSION} main"; fi
# http://llvm.org/apt/
- if [ "$TRAVIS_OS_NAME" = "linux" ] && [ "$CXX" == "clang++" ] && [ "$LLVM_VERSION" != "native" ]; then wget -O - http://llvm.org/apt/llvm-snapshot.gpg.key | sudo apt-key add -; fi
- if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get update -qq; fi # UPDATE REPOS
- if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew update; fi
#- if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get upgrade -qq; fi # UPGRADE SYSTEM TO LATEST PATCH LEVEL
- if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get install -y -qq; fi
- if [ "$TRAVIS_OS_NAME" = "linux" ] && [ "$CXX" = "g++" ] && [ "$GCC_VERSION" != "native" ]; then sudo apt-get install -qq gcc-${GCC_VERSION} g++-${GCC_VERSION}; fi
- if [ "$CXX" = "g++" ] && [ "$GCC_VERSION" != "native" ]; then export CXX="g++-${GCC_VERSION}" CC="gcc-${GCC_VERSION}"; fi
- if [ "$TRAVIS_OS_NAME" = "linux" ] && [ "$CXX" == "clang++" ] && [ "$LLVM_VERSION" != "native" ]; then sudo apt-get --allow-unauthenticated -qq install clang-${LLVM_VERSION}; fi
- if [ "$CXX" == "clang++" ] && [ "$LLVM_VERSION" != "native" ]; then export CXX="clang++-${LLVM_VERSION}" CC="clang-${LLVM_VERSION}"; fi
- if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo mk/linux/setupBuildDeps.sh --quiet; fi # INSTALL OUR DEPENDENCIES
- if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew install sdl2 lua freetype ftgl libogg glew libvorbis cppunit glib fribidi miniupnpc wxmac; fi
- $CXX --version
- cmake --version
- if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo ./.travis-before_install.sh; fi
script:
# ALL THE BUILD COMMANDS HERE
- mk/linux/build-mg.sh -c 4
- if [ "$TRAVIS_OS_NAME" = "linux" ]; then mk/linux/build-mg.sh -c 4; fi
- if [ "$TRAVIS_OS_NAME" = "osx" ]; then mk/macosx/build-mg.sh -c 4; fi
# https://docs.travis-ci.com/user/notifications/#IRC-notification
notifications:
irc:
channels:
- "irc.freenode.org#megaglest"
skip_join: true
use_notice: true
on_success: change
template:
#- "[%{commit}: %{author}] %{message}"
#- "%{build_url}"
- "[%{repository}#%{branch} @%{commit}] %{author}): %{message}"
- "Diff: %{compare_url}"
- "Build: %{build_url}"
#- "[%{repository_slug}#%{branch} @%{commit}] %{author}): %{message}"
#- "Diff: %{compare_url}"
#- "Build: %{build_url}"
- "[%{repository_name}#%{branch}@%{commit}] %{author}: %{message} %{build_url}"

View File

@ -1,4 +1,4 @@
CMAKE_MINIMUM_REQUIRED( VERSION 2.6.2 )
CMAKE_MINIMUM_REQUIRED( VERSION 2.8.2 )
PROJECT( MegaGlest )
#SET(CMAKE_VERBOSE_MAKEFILE ON)
@ -8,10 +8,15 @@ PROJECT( MegaGlest )
# VC++ users should not use CMake yet but rather the build-mg.bat file in mk/windoze
#
# build type defaults to release
if(NOT DEFINED CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE Release CACHE STRING "Choose build type: None(CMAKE_CXX_FLAGS or CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel.")
endif(NOT DEFINED CMAKE_BUILD_TYPE)
# build type
IF(NOT CMAKE_BUILD_TYPE)
SET(CMAKE_BUILD_TYPE "RelWithDebInfo" CACHE STRING "Choose build type: None(CMAKE_CXX_FLAGS or CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel." FORCE)
ENDIF()
SET_PROPERTY(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS None Debug Release RelWithDebInfo MinSizeRel)
IF(NOT CMAKE_VERSION VERSION_LESS "3.1")
cmake_policy(SET CMP0054 NEW)
ENDIF()
# add additional CMake modules
MESSAGE(STATUS "CMAKE_SOURCE_DIR = ${CMAKE_SOURCE_DIR}")
@ -30,8 +35,14 @@ OPTION(BUILD_MEGAGLEST_MODEL_VIEWER "Build model viewer" ON)
OPTION(BUILD_MEGAGLEST_MAP_EDITOR "Build map editor" ON)
OPTION(BUILD_MEGAGLEST "Build MegaGlest" ON)
OPTION(BUILD_MEGAGLEST_TESTS "Build MegaGlest Unit Tests" OFF)
OPTION(WITH_VLC "Use libVLC to play videos" ON)
OPTION(SINGLE_INSTALL_DIRECTORY "Use single install directory for everything. It is useful for example for MacOS cpack bundles." OFF)
OPTION(WANT_SINGLE_INSTALL_DIRECTORY "Use single install directory for everything. It is useful for example for MacOS cpack bundles." OFF)
OPTION(WANT_STATIC_LIBS "Builds as many static libs as possible." OFF)
OPTION(WANT_USE_VLC "Use libVLC to play videos." ON)
OPTION(WANT_USE_OpenSSL "Use libOpenSSL during CURL linking." ON)
OPTION(WANT_USE_FriBiDi "Enable libFriBIDi support." ON)
OPTION(WANT_USE_GoogleBreakpad "Enable GoogleBreakpad support." ON)
OPTION(WANT_USE_STREFLOP "Use the library streflop." ON)
OPTION(WANT_USE_XercesC "Enable libXercesC support." OFF)
FIND_PROGRAM(HELP2MAN "help2man")
@ -41,8 +52,10 @@ if (NOT ${XVFB_RUN} MATCHES "XVFB_RUN-NOTFOUND")
set(XVFB_EXEC ${XVFB_RUN})
message(STATUS "Using xvfb-run to run man2help.")
endif()
MARK_AS_ADVANCED(HELP2MAN XVFB_RUN)
include(${CMAKE_SOURCE_DIR}/mk/cmake/Modules/SpecialMacros.cmake)
include(${CMAKE_SOURCE_DIR}/mk/cmake/Modules/SpecialMacros.cmake)
include(${CMAKE_SOURCE_DIR}/mk/cmake/Modules/ReqVersAndStaticConf.cmake)
SET(PKG_NAME "megaglest")
# read version
@ -76,6 +89,12 @@ FOREACH(ver_var VER_MAJOR;VER_MINOR;VER_PATCH;MEGAGLEST_VERSION)
ENDFOREACH()
MESSAGE(STATUS "Detected MegaGlest Version is [v${MEGAGLEST_VERSION}] ")
SET(PIC_FLAG "${PIC_FLAG} -fPIC")
IF(WANT_STATIC_LIBS AND "${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
# CMAKE_SIZEOF_VOID_P=8 => 64bit
ADD_DEFINITIONS("${PIC_FLAG}")
ENDIF()
## Compiler flags, CPACK configuration and other Apple specific code.
IF(APPLE)
include(${PROJECT_SOURCE_DIR}/mk/macosx/CMakeLists.txt)
@ -90,13 +109,6 @@ IF(CMAKE_COMPILER_IS_GNUCXX OR MINGW)
MESSAGE(STATUS "Detected MINGW Compiler...")
ENDIF()
if (NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE RelWithDebInfo)
endif (NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE)
# Default compiler flags
#SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -s") ## Strip binary
# Common generic GNU type compiler options that work with all generic GCC compatible compilers
ADD_DEFINITIONS("-Wuninitialized -Wsign-compare -Wunused-function -Wunused-variable -Wreturn-type -fno-strict-aliasing")
@ -127,34 +139,30 @@ IF(CMAKE_COMPILER_IS_GNUCXX OR MINGW)
#SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
#MESSAGE(STATUS "*TEST: Checking for max SSE LEVEL [${MAX_SSE_LEVEL_DESIRED}]")
#MESSAGE(STATUS "*TEST: Checking for max SSE LEVEL [${FORCE_MAX_SSE_LEVEL}]")
IF(NOT STREFLOP_SOFTWRAPPER_FORCE)
SET(STREFLOP_SOFTWRAPPER_FORCE "0" CACHE STRING "Set the streflop library to be forced to use the software emulator")
OPTION(FORCE_STREFLOP_SOFTWRAPPER "Set the streflop library to be forced to use the software emulator" OFF)
IF(NOT FORCE_MAX_SSE_LEVEL AND NOT FORCE_STREFLOP_SOFTWRAPPER)
SET(FORCE_MAX_SSE_LEVEL "1" CACHE STRING "Set the max SSE level to use if supported (0-3)")
ENDIF()
IF(NOT MAX_SSE_LEVEL_DESIRED AND NOT STREFLOP_SOFTWRAPPER_FORCE)
SET(MAX_SSE_LEVEL_DESIRED "1" CACHE STRING "Set the max SSE level to use if supported (0-3)")
ENDIF()
IF(NOT STREFLOP_SOFTWRAPPER_FORCE)
MESSAGE(STATUS "*NOTE: Checking for max SSE LEVEL [${MAX_SSE_LEVEL_DESIRED}]")
special_check_for_sse( ${MAX_SSE_LEVEL_DESIRED} )
IF(NOT FORCE_STREFLOP_SOFTWRAPPER)
MESSAGE(STATUS "*NOTE: Checking for max SSE LEVEL [${FORCE_MAX_SSE_LEVEL}]")
special_check_for_sse( ${FORCE_MAX_SSE_LEVEL} )
ENDIF()
OPTION(WANT_STREFLOP "use the library streflop" ON)
IF(WANT_STREFLOP)
IF(WANT_USE_STREFLOP)
ADD_DEFINITIONS("-DUSE_STREFLOP -DSTREFLOP_RANDOM_GEN_SIZE=32 -DLIBM_COMPILING_FLT32 -DN_SPECIALIZED=32")
IF(HAS_SSE_EXTENSIONS AND NOT ${MAX_SSE_LEVEL_DESIRED} MATCHES "0" AND NOT STREFLOP_SOFTWRAPPER_FORCE)
IF(HAS_SSE_EXTENSIONS AND NOT ${FORCE_MAX_SSE_LEVEL} MATCHES "0" AND NOT FORCE_STREFLOP_SOFTWRAPPER)
ADD_DEFINITIONS("-DSTREFLOP_SSE")
MESSAGE(STATUS "*NOTE: using SSE for STREFLOP.")
ELSE()
IF(NOT STREFLOP_SOFTWRAPPER_FORCE)
IF(NOT FORCE_STREFLOP_SOFTWRAPPER)
special_check_for_x87()
ENDIF()
IF(HAS_X87_SUPPORT AND NOT STREFLOP_SOFTWRAPPER_FORCE)
IF(HAS_X87_SUPPORT AND NOT FORCE_STREFLOP_SOFTWRAPPER)
ADD_DEFINITIONS("-DSTREFLOP_X87")
MESSAGE(STATUS "*NOTE: using X87 for STREFLOP.")
ELSE()
@ -186,30 +194,21 @@ IF(CMAKE_COMPILER_IS_GNUCXX OR MINGW)
message(STATUS "**WARNING DID NOT Find GCC backtrace lib")
ENDIF()
# Default compiler flags
SET(CMAKE_CXX_FLAGS_NONE "${CMAKE_CXX_FLAGS_NONE}")
# Debug compiler flags
SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -g3")
# Release compiler flags
SET(CMAKE_CXX_FLAGS_RELEASE "-O3 ${CMAKE_CXX_FLAGS_RELEASE} -O3 ")
IF(CMAKE_GENERATOR STREQUAL Xcode)
SET(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE}") ## Strip binary
ELSE()
IF(NOT CMAKE_GENERATOR STREQUAL Xcode)
SET(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} -s") ## Strip binary
ENDIF()
# Release with debug info compiler flags
SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 ${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -g -O3 ")
SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 ${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -g -O3 ")
# Release minimum size compiler flags
SET(CMAKE_CXX_FLAGS_MINSIZEREL "-O3 ${CMAKE_CXX_FLAGS_MINSIZEREL} -O3 ")
SET(CMAKE_EXE_LINKER_FLAGS_MINSIZEREL "${CMAKE_EXE_LINKER_FLAGS_MINSIZEREL}") ## Strip binary
IF(CMAKE_GENERATOR STREQUAL Xcode)
SET(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE}") ## Strip binary
ELSE()
SET(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} -s") ## Strip binary
IF(NOT CMAKE_GENERATOR STREQUAL Xcode)
SET(CMAKE_EXE_LINKER_FLAGS_MINSIZEREL "${CMAKE_EXE_LINKER_FLAGS_MINSIZEREL} -s") ## Strip binary
ENDIF()
# Get the git revision info for the binary
@ -257,45 +256,33 @@ IF(CMAKE_COMPILER_IS_GNUCXX OR MINGW)
IF(CMAKE_INSTALL_PREFIX STREQUAL "")
MESSAGE(STATUS "*NOTE: NOT USING a Custom Data Install Path...")
ELSE()
IF(SINGLE_INSTALL_DIRECTORY AND NOT MEGAGLEST_SINGLE_DIRECTORY_INSTALL_PATH)
IF(WANT_SINGLE_INSTALL_DIRECTORY AND NOT MEGAGLEST_SINGLE_DIRECTORY_INSTALL_PATH)
SET(MEGAGLEST_SINGLE_DIRECTORY_INSTALL_PATH "megaglest-game/" CACHE STRING "The single directory installation path for game (this is appended to the CMAKE_INSTALL_PREFIX)")
ENDIF()
IF(NOT MEGAGLEST_BIN_INSTALL_PATH)
IF(NOT SINGLE_INSTALL_DIRECTORY)
SET(MEGAGLEST_BIN_INSTALL_PATH "bin/" CACHE STRING "The installation path for binaries (this is appended to the CMAKE_INSTALL_PREFIX)")
ELSE()
SET(MEGAGLEST_BIN_INSTALL_PATH "${MEGAGLEST_SINGLE_DIRECTORY_INSTALL_PATH}")
ENDIF()
IF(NOT MEGAGLEST_BIN_INSTALL_PATH AND NOT WANT_SINGLE_INSTALL_DIRECTORY)
SET(MEGAGLEST_BIN_INSTALL_PATH "bin/" CACHE STRING "The installation path for binaries (this is appended to the CMAKE_INSTALL_PREFIX)")
ENDIF()
IF(NOT MEGAGLEST_DATA_INSTALL_PATH)
IF(NOT SINGLE_INSTALL_DIRECTORY)
SET(MEGAGLEST_DATA_INSTALL_PATH "share/megaglest/" CACHE STRING "The installation path for data files (this is appended to the CMAKE_INSTALL_PREFIX)")
ELSE()
SET(MEGAGLEST_DATA_INSTALL_PATH "${MEGAGLEST_SINGLE_DIRECTORY_INSTALL_PATH}")
ENDIF()
IF(NOT MEGAGLEST_DATA_INSTALL_PATH AND NOT WANT_SINGLE_INSTALL_DIRECTORY)
SET(MEGAGLEST_DATA_INSTALL_PATH "share/megaglest/" CACHE STRING "The installation path for data files (this is appended to the CMAKE_INSTALL_PREFIX)")
ENDIF()
IF(NOT MEGAGLEST_DESKTOP_INSTALL_PATH)
IF(NOT SINGLE_INSTALL_DIRECTORY)
SET(MEGAGLEST_DESKTOP_INSTALL_PATH "share/applications/" CACHE STRING "The installation path for desktop files (this is appended to the CMAKE_INSTALL_PREFIX)")
ELSE()
SET(MEGAGLEST_DESKTOP_INSTALL_PATH "${MEGAGLEST_SINGLE_DIRECTORY_INSTALL_PATH}")
ENDIF()
IF(NOT MEGAGLEST_DESKTOP_INSTALL_PATH AND NOT WANT_SINGLE_INSTALL_DIRECTORY)
SET(MEGAGLEST_DESKTOP_INSTALL_PATH "share/applications/" CACHE STRING "The installation path for desktop files (this is appended to the CMAKE_INSTALL_PREFIX)")
ENDIF()
IF(NOT MEGAGLEST_ICON_INSTALL_PATH)
IF(NOT SINGLE_INSTALL_DIRECTORY)
SET(MEGAGLEST_ICON_INSTALL_PATH "share/pixmaps/" CACHE STRING "The installation path for icon files (this is appended to the CMAKE_INSTALL_PREFIX)")
ELSE()
SET(MEGAGLEST_ICON_INSTALL_PATH "${MEGAGLEST_SINGLE_DIRECTORY_INSTALL_PATH}")
ENDIF()
IF(NOT MEGAGLEST_ICON_INSTALL_PATH AND NOT WANT_SINGLE_INSTALL_DIRECTORY)
SET(MEGAGLEST_ICON_INSTALL_PATH "share/pixmaps/" CACHE STRING "The installation path for icon files (this is appended to the CMAKE_INSTALL_PREFIX)")
ENDIF()
IF(NOT MEGAGLEST_MANPAGE_INSTALL_PATH AND NOT SINGLE_INSTALL_DIRECTORY)
IF(NOT SINGLE_INSTALL_DIRECTORY)
SET(MEGAGLEST_MANPAGE_INSTALL_PATH "share/man/man6/" CACHE STRING "The installation path for manpage files (this is appended to the CMAKE_INSTALL_PREFIX)")
ELSE()
SET(MEGAGLEST_MANPAGE_INSTALL_PATH "${MEGAGLEST_SINGLE_DIRECTORY_INSTALL_PATH}")
ENDIF()
IF(NOT MEGAGLEST_MANPAGE_INSTALL_PATH AND NOT WANT_SINGLE_INSTALL_DIRECTORY)
SET(MEGAGLEST_MANPAGE_INSTALL_PATH "share/man/man6/" CACHE STRING "The installation path for manpage files (this is appended to the CMAKE_INSTALL_PREFIX)")
ENDIF()
IF(NOT CUSTOM_DATA_INSTALL_PATH AND NOT SINGLE_INSTALL_DIRECTORY)
IF(WANT_SINGLE_INSTALL_DIRECTORY)
FOREACH(MG_PATH BIN DATA DESKTOP ICON)
IF(NOT MEGAGLEST_${MG_PATH}_INSTALL_PATH)
SET(MEGAGLEST_${MG_PATH}_INSTALL_PATH "${MEGAGLEST_SINGLE_DIRECTORY_INSTALL_PATH}")
ENDIF()
ENDFOREACH()
ENDIF()
IF(NOT CUSTOM_DATA_INSTALL_PATH AND NOT WANT_SINGLE_INSTALL_DIRECTORY)
SET(CUSTOM_DATA_INSTALL_PATH "${CMAKE_INSTALL_PREFIX}/${MEGAGLEST_DATA_INSTALL_PATH}" CACHE STRING "The FULL installation path for data files (this is build automatically by combining CMAKE_INSTALL_PREFIX and MEGAGLEST_DATA_INSTALL_PATH)")
SET(CUSTOM_DATA_INSTALL_PATH_VALUE "-DCUSTOM_DATA_INSTALL_PATH=${CUSTOM_DATA_INSTALL_PATH}")
ENDIF()
@ -305,48 +292,58 @@ IF(CMAKE_COMPILER_IS_GNUCXX OR MINGW)
MESSAGE(STATUS "*NOTE: Custom Data Install Path is [${CUSTOM_DATA_INSTALL_PATH}]")
ENDIF()
string(TOUPPER "${CMAKE_BUILD_TYPE}" MG_BUILD_TYPE)
IF(HAS_GIT STREQUAL "TRUE")
SET(CMAKE_CXX_FLAGS_NONE "${CMAKE_CXX_FLAGS_NONE} ${GIT_VERSION_CMD}")
SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${GIT_VERSION_CMD}")
SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${GIT_VERSION_CMD}")
SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} ${GIT_VERSION_CMD}")
SET(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} ${GIT_VERSION_CMD}")
SET(CMAKE_CXX_FLAGS_${MG_BUILD_TYPE} "${CMAKE_CXX_FLAGS_${MG_BUILD_TYPE}} ${GIT_VERSION_CMD}")
ENDIF()
SET(CMAKE_CXX_FLAGS_NONE "${CMAKE_CXX_FLAGS_NONE} ${CUSTOM_DATA_INSTALL_PATH_VALUE}")
SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${CUSTOM_DATA_INSTALL_PATH_VALUE}")
SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${CUSTOM_DATA_INSTALL_PATH_VALUE}")
SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} ${CUSTOM_DATA_INSTALL_PATH_VALUE}")
SET(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} ${CUSTOM_DATA_INSTALL_PATH_VALUE}")
SET(CMAKE_CXX_FLAGS_${MG_BUILD_TYPE} "${CMAKE_CXX_FLAGS_${MG_BUILD_TYPE}} ${CUSTOM_DATA_INSTALL_PATH_VALUE}")
# We do some funky character escaping to get the right stuff written out to
# the final Makefile so we get the GIT Global Revsion #
string(REPLACE "'" "\"" CMAKE_CXX_FLAGS_NONE "${CMAKE_CXX_FLAGS_NONE}")
string(REPLACE "'" "\"" CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}")
string(REPLACE "'" "\"" CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}")
string(REPLACE "'" "\"" CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")
string(REPLACE "'" "\"" CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL}")
string(REPLACE "'" "\"" CMAKE_CXX_FLAGS_${MG_BUILD_TYPE} "${CMAKE_CXX_FLAGS_${MG_BUILD_TYPE}}")
IF( CMAKE_BUILD_TYPE STREQUAL None )
message("CMAKE_CXX_FLAGS_NONE: ${CMAKE_CXX_FLAGS_NONE}")
ELSEIF( CMAKE_BUILD_TYPE STREQUAL Debug )
message("CMAKE_CXX_FLAGS_DEBUG: ${CMAKE_CXX_FLAGS_DEBUG}")
ELSEIF( CMAKE_BUILD_TYPE STREQUAL Release )
message("CMAKE_CXX_FLAGS_RELEASE: ${CMAKE_CXX_FLAGS_RELEASE}")
ELSEIF( CMAKE_BUILD_TYPE STREQUAL RelWithDebInfo )
message("CMAKE_CXX_FLAGS_RELWITHDEBINFO: ${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")
ELSEIF( CMAKE_BUILD_TYPE STREQUAL MinSizeRel )
message("CMAKE_CXX_FLAGS_MINSIZEREL: ${CMAKE_CXX_FLAGS_MINSIZEREL}")
ENDIF()
message(STATUS "CMAKE_CXX_FLAGS_${MG_BUILD_TYPE}: ${CMAKE_CXX_FLAGS_${MG_BUILD_TYPE}}")
# Win32 specific Compiler Flags
IF(WIN32)
ADD_DEFINITIONS("-D_WINDOWS -D_WIN32 -D_STDCALL_SUPPORTED -D_M_IX86 -DXML_LIBRARY -D_LIB -DCURL_STATICLIB")
ELSE()
ADD_DEFINITIONS("-DCURL_STATICLIB")
ENDIF()
ENDIF()
IF(UNIX AND NOT "${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
OPTION(WANT_DEPRECATION_WARNINGS "Want to see warnings related with deprecated code parts." OFF)
# We don't wanna see bug reports with deprecation warnings from OSes where game isn't
# actively developed, and where usually those warnings can make "make log" completely unreadable.
# Main targets are: bsd and macos
MARK_AS_ADVANCED(CLEAR wxWidgets_CONFIG_EXECUTABLE)
# This variable may be sometimes necessary to set manually.
ELSE()
OPTION(WANT_DEPRECATION_WARNINGS "Want to see warnings related with deprecated code parts." ON)
ENDIF()
IF(NOT WANT_DEPRECATION_WARNINGS)
ADD_DEFINITIONS(-Wno-deprecated -Wno-deprecated-declarations)
ENDIF()
MARK_AS_ADVANCED(WANT_DEPRECATION_WARNINGS)
SET(WANT_USE_SDL2 ON)
IF(WANT_USE_SDL2)
SET(SDL_WINDOWS_DIR_DINC "SDL-2.0.x")
SET(SDL_VERSION_NAME "SDL2")
SET(SDL_VERSION_SNAME "sdl")
ENDIF()
OPTION(WANT_DEV_OUTPATH "Use developer friendly output paths." OFF)
IF(UNIX AND "${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
SET(MEGAGLEST_FRIENDLY_OUTPUT_PATH "${PROJECT_SOURCE_DIR}/mk/linux/")
ELSEIF(UNIX AND APPLE)
SET(MEGAGLEST_FRIENDLY_OUTPUT_PATH "${PROJECT_SOURCE_DIR}/mk/macosx/")
ELSEIF(UNIX AND NOT APPLE)
SET(MEGAGLEST_FRIENDLY_OUTPUT_PATH "${PROJECT_SOURCE_DIR}/mk/other_unix/")
ELSE()
SET(MEGAGLEST_FRIENDLY_OUTPUT_PATH "${PROJECT_SOURCE_DIR}/data/glest_game/")
ENDIF()
IF(WIN32)
SET(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH}
${PROJECT_SOURCE_DIR}/source/win32_deps/lib
@ -364,7 +361,7 @@ IF(WIN32)
${PROJECT_SOURCE_DIR}/source/win32_deps/lpng141
${PROJECT_SOURCE_DIR}/source/win32_deps/zlib-1.2.5
${PROJECT_SOURCE_DIR}/source/win32_deps/curl-7.21.3/include
${PROJECT_SOURCE_DIR}/source/win32_deps/SDL-1.2.x/include
${PROJECT_SOURCE_DIR}/source/win32_deps/${SDL_WINDOWS_DIR_DINC}/include
${PROJECT_SOURCE_DIR}/source/win32_deps/wxWidgets-2.8.10/include)
link_directories(${PROJECT_SOURCE_DIR}/source/win32_deps/lib)
@ -405,61 +402,39 @@ IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
MESSAGE(WARNING ">> CLANG is NOT currently compatible as it does not support the following essential GCC compiler settings: -frounding-math -fsignaling-nans")
ENDIF()
IF(NOT DEFINED CPACK_GENERATOR)
SET(CPACK_GENERATOR "DEB")
ENDIF()
# CPack configuration shared accross platforms
SET(CPACK_PACKAGE_NAME ${PKG_NAME})
SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "MegaGlest")
IF(EXISTS "${PROJECT_SOURCE_DIR}/data/glest_game/others/megaglest-long-description.txt.in")
FILE(READ "${PROJECT_SOURCE_DIR}/data/glest_game/others/megaglest-long-description.txt.in" MEGAGLEST_LONG_DESCRIPTION)
SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "${MEGAGLEST_LONG_DESCRIPTION}")
ELSE()
SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "MegaGlest")
ENDIF()
SET(CPACK_PACKAGE_VENDOR "megaglest.org")
#SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README")
#SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING")
SET(CPACK_PACKAGE_INSTALL_DIRECTORY "megaglest")
SET(CPACK_PACKAGING_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}")
SET(CPACK_PACKAGE_VERSION "${MEGAGLEST_VERSION}")
SET(CPACK_PACKAGE_VERSION_MAJOR "${VER_MAJOR}")
SET(CPACK_PACKAGE_VERSION_MINOR "${VER_MINOR}")
SET(CPACK_PACKAGE_VERSION_PATCH "${VER_PATCH}")
# Debian specific generator options
IF(NOT DEFINED CPACK_GENERATOR)
SET(CPACK_GENERATOR "DEB")
IF("${CPACK_GENERATOR}" STREQUAL "DEB")
SET(CPACK_DEBIAN_PACKAGE_MAINTAINER "Mark Vejvoda") #required
SET(CPACK_DEBIAN_PACKAGE_DEPENDS "
libcurl4-gnutls-dev | libcurl4-nss-dev,
libfontconfig1-dev,
libftgl-dev,
libglew-dev,
libircclient-dev,
libjpeg-dev,
liblua5.1-0-dev,
libminiupnpc-dev,
libogg-dev,
libopenal-dev,
libpng12-dev,
libsdl1.2-dev,
libvlc-dev,
libvorbis-dev,
libwxgtk2.8-dev,
libxerces-c2-dev,
libxml2-dev,
libz-dev,
libfribidi-dev")
# FIXME ^ cpack configuration should be fixed and tested
#find_program(DPKG_PROGRAM dpkg DOC "dpkg program of Debian-based systems")
#if(DPKG_PROGRAM)
# execute_process(
# COMMAND ${DPKG_PROGRAM} --print-architecture
# OUTPUT_VARIABLE CPACK_DEBIAN_PACKAGE_ARCHITECTURE
# OUTPUT_STRIP_TRAILING_WHITESPACE
# )
#endif(DPKG_PROGRAM)
ENDIF(NOT DEFINED CPACK_GENERATOR)
IF(CPACK_GENERATOR STREQUAL "NSIS")
SET(CPACK_DEBIAN_PACKAGE_SECTION "games")
SET(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
SET(CPACK_DEBIAN_PACKAGE_SUGGESTS "p7zip-full")
ENDIF()
IF("${CPACK_GENERATOR}" STREQUAL "NSIS")
SET(CPACK_NSIS_DISPLAY_NAME "MegaGlest")
SET(CPACK_NSIS_MUI_ICON "${PROJECT_SOURCE_DIR}/mk/windoze/glest.ico")
SET(CPACK_PACKAGE_ICON "${PROJECT_SOURCE_DIR}/mk/windoze/megaglest.ico")
SET(CPACK_NSIS_URL_INFO_ABOUT "http://megaglest.org")
ENDIF(CPACK_GENERATOR STREQUAL "NSIS")
ENDIF()
INCLUDE(CPack)
@ -470,6 +445,9 @@ endforeach()
#MESSAGE( STATUS "=====> DirDefs: " ${DirDefs} )
#MESSAGE(STATUS "*** Compiler definitions are [${COMPILE_DEFINITIONS}]")
MARK_AS_ADVANCED(SDLMAIN_LIBRARY)
MARK_AS_ADVANCED(SDL_INCLUDE_DIR)
MARK_AS_ADVANCED(SDL_LIBRARY)
MARK_AS_ADVANCED(${SDL_VERSION_NAME}MAIN_LIBRARY)
MARK_AS_ADVANCED(${SDL_VERSION_NAME}_INCLUDE_DIR)
MARK_AS_ADVANCED(${SDL_VERSION_NAME}_LIBRARY)
MARK_AS_ADVANCED(wxWidgets_CONFIG_EXECUTABLE)
MARK_AS_ADVANCED(wxWidgets_wxrc_EXECUTABLE)
MARK_AS_ADVANCED(wxWidgets_USE_DEBUG)

31
README.md Normal file
View File

@ -0,0 +1,31 @@
**This is the game engine source code repository.**
MegaGlest (http://megaglest.org) is a libre software cross
platform real-time strategy game.
[![logo](http://megaglest.org/uploads/megaglest2011/logo/logo.png)]
(http://megaglest.org/)
MegaGlest is an entertaining free (freeware and free software)
and open source cross-platform 3D real-time strategy (RTS) game,
where you control the armies of one of seven different factions:
Tech, Magic, Egypt, Indians, Norsemen, Persian or Romans. The
game is setup in one of 17 naturally looking settings, which
-like the unit models- are crafted with great appreciation for
detail. A lot of additional game data can be downloaded from
within the game at no cost.
[**MegaGlest Downloads**](http://megaglest.org/download.html)
[![gif](http://megaglest.org/uploads/images/screenshots/game_screens.gif)]
(http://megaglest.org/screenshots.html)
[![intro](http://megaglest.org/uploads/images/trailer3.png)]
(http://downloads.megaglest.org/videos/megaglest_game_trailer_lq.webm)
If you want compile MegaGlest yourself then you should read the
[**tutorial**](https://docs.megaglest.org/MG/Development) or
[tutorial2](https://github.com/MegaGlest/megaglest-source/wiki/Git-How-To)
go to the [Main Repository](https://github.com/MegaGlest/megaglest-source)
( e.g. from the fork ... )

View File

@ -1 +0,0 @@
Please refer to docs/ for all documentation, license and copyright information.

@ -1 +1 @@
Subproject commit e92df160ae6b5495d2590be1e8b4a9efaf91b995
Subproject commit c256b69196d8aae7f00b833e75d6acdcb73953b0

View File

@ -3,6 +3,16 @@ MEGAGLEST CHANGELOG
To see a timeline of detail changes please visit:
https://github.com/MegaGlest/megaglest-source/commits/master
v3.12.0
- MegaGlest uses SDL2 now
- glowing meshes. ( models can glow like particles do )
- console message for finished upgrades
- new parameter to set servers titles
- 5 new maps
- improved network performance
- better stability in the lobby
v3.11.1
- no more false clicks when commanding via mini map
- map editor has a more useful and powerful map height randomizer

View File

@ -32,10 +32,10 @@ OR
folder
* MegaGlest Windows 32 bit dependencies for building with VC++:
http://sourceforge.net/projects/megaglest/files/windows_deps.7z/download
https://github.com/MegaGlest/megaglest-source/releases/download/3.2.3/windows_deps.7z
OR
* MegaGlest Windows 32 bit dependencies for building with mingw:
http://sourceforge.net/projects/megaglest/files/win32_deps_mingw.7z/download
https://github.com/MegaGlest/megaglest-source/releases/download/3.2.3/win32_deps_mingw.7z
These include:
* Xerces-C

View File

@ -70,13 +70,16 @@ To build this archive open a terminal and from the mk/linux folder run:
This will produce megaglest-data-source-<VERSION>.tar.xz in the release subfolder
*NOTE: Currently this script only works for the trunk level release
Once these files have been built they should be ftp'd to the sourceforge
files repository and and announcement made to the community. The folder on
sourceforge where these files belong would following this naming convention:
Once these files have been built they should be published / uploaded to the binary
file storage (currently GitHub) and an announcement made to the community. On GitHub,
files are uploaded as an attachment to tagged releases, search the GitHub blog for
"GitHub releases" for more information.
http://sourceforge.net/projects/megaglest/files/megaglest_<VERSION>/
https://github.com/aktau/github-release provides a handy CLI for file uploading to
this GitHub specific blob storage API.
#5 To produce a standalone gcc based binary and data archive you may run:
#5. To produce a standalone gcc based binary and data archive you may run:
./make-binary-archive.sh
./make-data-archive.sh

View File

@ -98,14 +98,21 @@ Windows:
All you should need to do on Windows is to double-click the downloaded file.
You may get to see a warning saying that this file you downloaded from the
Internet may be unsafe. However, if you downloaded this file from a trusted
source, i.e. megaglest.org or *.mirror.sourceforge.net, it is generally safe
to proceed. However, we can not make any guarantees. You are encouraged to
scan the downloaded installer for viruses.
source, i.e. megaglest.org (which currently forwards to GitHub, which then
forwards to Amazon AWS S3), it should be safe to proceed. However, we can not
make any guarantees. You are encouraged to scan the downloaded installer for
viruses.
Other platforms:
Please refer to the packagers' installation guides.
All platforms:
We have lately started to cryptographically sign (OpenPGP) releases and also
provide checksums, so please use these to iverify the authenticity of the files
you have downloaded.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
3. Configuration

View File

@ -0,0 +1,50 @@
#
# Curl Get Config
#
# IF we are using a system that supports curl-config use it.
#
IF(CURL_FOUND)
IF(UNIX AND NOT APPLE)
FIND_PROGRAM( CMAKE_CURL_CONFIG curl-config)
MARK_AS_ADVANCED(CMAKE_CURL_CONFIG)
IF(CMAKE_CURL_CONFIG)
IF(STATIC_CURL)
# run the curl-config program to get --static-libs
EXEC_PROGRAM(sh
ARGS "${CMAKE_CURL_CONFIG} --static-libs"
OUTPUT_VARIABLE CURL_STATIC_LIBS
RETURN_VALUE RET)
MESSAGE(STATUS "CURL RET = ${RET} libs: [${CURL_STATIC_LIBS}]")
ELSE()
SET(RET 1)
ENDIF()
IF(RET EQUAL 0 AND CURL_STATIC_LIBS)
MESSAGE(STATUS "#2 CURL RET = ${RET}, using CURL static libs")
SET(CURL_LIBRARIES "-Bstatic ${CURL_STATIC_LIBS}")
ELSE()
EXEC_PROGRAM(sh
ARGS "${CMAKE_CURL_CONFIG} --libs"
OUTPUT_VARIABLE CURL_DYNAMIC_LIBS
RETURN_VALUE RET2)
IF(RET2 EQUAL 0 AND CURL_DYNAMIC_LIBS)
MESSAGE(STATUS "#2 CURL RET = ${RET2}, using CURL dynamic libs: ${CURL_DYNAMIC_LIBS}")
SET(CURL_LIBRARIES "${CURL_DYNAMIC_LIBS}")
ELSE()
MESSAGE(STATUS "#3 CURL RET = ${RET2}, using CURL libs found by cmake: ${CURL_LIBRARIES}")
ENDIF()
ENDIF()
ENDIF()
ENDIF()
IF(CURL_VERSION_STRING AND "${CURL_VERSION_STRING}" VERSION_LESS "${CURL_MIN_VERSION_MG}")
MESSAGE(STATUS "(please visit http://curl.haxx.se/libcurl/ to find a newer version)")
MESSAGE(FATAL_ERROR " CURL version = [${CURL_VERSION_STRING}] we require AT LEAST [7.16.4]")
ENDIF()
ELSE()
SET(CURL_LIBRARIES)
SET(CURL_INCLUDE_DIRS)
ENDIF()

View File

@ -1,72 +0,0 @@
# - Find curl
# Find the native CURL headers and libraries.
#
# CURL_INCLUDE_DIRS - where to find curl/curl.h, etc.
# CURL_LIBRARIES - List of libraries when using curl.
# CURL_FOUND - True if curl found.
# Look for the header file.
FIND_PATH(CURL_INCLUDE_DIR NAMES curl/curl.h
PATHS /usr/local/include/
/opt/local/include/)
MARK_AS_ADVANCED(CURL_INCLUDE_DIR)
# Look for the library.
FIND_LIBRARY(CURL_LIBRARY NAMES curl curl-gnutls
PATHS /usr/local/lib/
/opt/local/lib/)
MARK_AS_ADVANCED(CURL_LIBRARY)
# handle the QUIETLY and REQUIRED arguments and set CURL_FOUND to TRUE if
# all listed variables are TRUE
INCLUDE(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(CURL DEFAULT_MSG CURL_LIBRARY CURL_INCLUDE_DIR)
IF(CURL_FOUND)
SET(CURL_LIBRARIES ${CURL_LIBRARY})
SET(CURL_INCLUDE_DIRS ${CURL_INCLUDE_DIR})
# IF we are using a system that supports curl-config use it
# and force using static libs
IF(UNIX AND NOT APPLE)
FIND_PROGRAM( CMAKE_CURL_CONFIG curl-config)
MARK_AS_ADVANCED(CMAKE_CURL_CONFIG)
IF(CMAKE_CURL_CONFIG)
OPTION(WANT_STATIC_LIBS "builds as many static libs as possible" OFF)
OPTION(FORCE_CURL_DYNAMIC_LIBS "force the use of dynamic libs for CURL" OFF)
MESSAGE(STATUS "Force Curl dynamic: ${FORCE_CURL_DYNAMIC_LIBS}")
IF(WANT_STATIC_LIBS AND NOT FORCE_CURL_DYNAMIC_LIBS)
# run the curl-config program to get --static-libs
EXEC_PROGRAM(sh
ARGS "${CMAKE_CURL_CONFIG} --static-libs"
OUTPUT_VARIABLE CURL_STATIC_LIBS
RETURN_VALUE RET)
MESSAGE(STATUS "CURL RET = ${RET} libs: [${CURL_STATIC_LIBS}]")
ELSE()
SET(RET 1)
ENDIF()
IF(RET EQUAL 0 AND CURL_STATIC_LIBS)
MESSAGE(STATUS "USING CURL STATIC LIBS: ${CURL_STATIC_LIBS}")
SET(CURL_LIBRARIES "-Bstatic ${CURL_STATIC_LIBS}")
ELSE()
EXEC_PROGRAM(sh
ARGS "${CMAKE_CURL_CONFIG} --libs"
OUTPUT_VARIABLE CURL_STATIC_LIBS
RETURN_VALUE RET)
MESSAGE(STATUS "#2 CURL RET = ${RET} using CURL dynamic libs: ${CURL_STATIC_LIBS}")
SET(CURL_LIBRARIES "${CURL_STATIC_LIBS}")
ENDIF()
ENDIF()
ENDIF()
ELSE(CURL_FOUND)
SET(CURL_LIBRARIES)
SET(CURL_INCLUDE_DIRS)
ENDIF(CURL_FOUND)

View File

@ -15,81 +15,76 @@ set (_cppunit_DEBUG false)
# If CPPUNIT_ROOT was defined in the environment, use it.
if (NOT CPPUNIT_ROOT AND NOT $ENV{CPPUNIT_ROOT} STREQUAL "")
set(CPPUNIT_ROOT $ENV{CPPUNIT_ROOT})
endif(NOT CPPUNIT_ROOT AND NOT $ENV{CPPUNIT_ROOT} STREQUAL "")
set(CPPUNIT_ROOT $ENV{CPPUNIT_ROOT})
endif()
# If CPPUNIT_INCLUDEDIR was defined in the environment, use it.
if( NOT $ENV{CPPUNIT_INCLUDEDIR} STREQUAL "" )
set(CPPUNIT_INCLUDEDIR $ENV{CPPUNIT_INCLUDEDIR})
endif( NOT $ENV{CPPUNIT_INCLUDEDIR} STREQUAL "" )
set(CPPUNIT_INCLUDEDIR $ENV{CPPUNIT_INCLUDEDIR})
endif()
# If CPPUNIT_LIBRARYDIR was defined in the environment, use it.
if( NOT $ENV{CPPUNIT_LIBRARYDIR} STREQUAL "" )
set(CPPUNIT_LIBRARYDIR $ENV{CPPUNIT_LIBRARYDIR})
endif( NOT $ENV{CPPUNIT_LIBRARYDIR} STREQUAL "" )
set(CPPUNIT_LIBRARYDIR $ENV{CPPUNIT_LIBRARYDIR})
endif()
if( CPPUNIT_ROOT )
set(_cppunit_INCLUDE_SEARCH_DIRS
${CPPUNIT_ROOT}/include )
set(_cppunit_LIBRARY_SEARCH_DIRS
${CPPUNIT_ROOT}/lib )
endif( CPPUNIT_ROOT )
set(_cppunit_INCLUDE_SEARCH_DIRS
${CPPUNIT_ROOT}/include )
set(_cppunit_LIBRARY_SEARCH_DIRS
${CPPUNIT_ROOT}/lib )
endif()
if( CPPUNIT_INCLUDEDIR )
file(TO_CMAKE_PATH ${CPPUNIT_INCLUDEDIR} CPPUNIT_INCLUDEDIR)
SET(_cppunit_INCLUDE_SEARCH_DIRS
${CPPUNIT_INCLUDEDIR} )
endif( CPPUNIT_INCLUDEDIR )
file(TO_CMAKE_PATH ${CPPUNIT_INCLUDEDIR} CPPUNIT_INCLUDEDIR)
SET(_cppunit_INCLUDE_SEARCH_DIRS
${CPPUNIT_INCLUDEDIR} )
endif()
if( CPPUNIT_LIBRARYDIR )
file(TO_CMAKE_PATH ${CPPUNIT_LIBRARYDIR} CPPUNIT_LIBRARYDIR)
SET(_cppunit_LIBRARY_SEARCH_DIRS
${CPPUNIT_LIBRARYDIR} )
endif( CPPUNIT_LIBRARYDIR )
# now find CPPUNIT_INCLUDE_DIR
file(TO_CMAKE_PATH ${CPPUNIT_LIBRARYDIR} CPPUNIT_LIBRARYDIR)
SET(_cppunit_LIBRARY_SEARCH_DIRS
${CPPUNIT_LIBRARYDIR} )
endif()
if ( _cppunit_DEBUG)
message(STATUS "search include dirs for cppunit = ${_cppunit_INCLUDE_SEARCH_DIRS}")
endif ( _cppunit_DEBUG)
endif ()
find_path(CPPUNIT_INCLUDE_DIR
NAMES cppunit/Test.h
HINTS ${_cppunit_INCLUDE_SEARCH_DIRS})
# now find CPPUNIT_INCLUDE_DIR
find_path(CPPUNIT_INCLUDE_DIR
NAMES cppunit/Test.h
HINTS ${_cppunit_INCLUDE_SEARCH_DIRS})
if ( _cppunit_DEBUG)
message(STATUS "include dir for cppunit = ${CPPUNIT_INCLUDE_DIR}")
endif ( _cppunit_DEBUG)
message(STATUS "include dir for cppunit = ${CPPUNIT_INCLUDE_DIR}")
message(STATUS "search library dirs for cppunit = ${_cppunit_LIBRARY_SEARCH_DIRS}")
endif ()
# now find CPPUNIT_LIBRARY
find_library(CPPUNIT_LIBRARY
NAMES cppunit
HINTS ${_cppunit_LIBRARY_SEARCH_DIRS})
if ( _cppunit_DEBUG)
message(STATUS "search library dirs for cppunit = ${_cppunit_LIBRARY_SEARCH_DIRS}")
endif ( _cppunit_DEBUG)
find_library(CPPUNIT_LIBRARY
NAMES cppunit
HINTS ${_cppunit_LIBRARY_SEARCH_DIRS})
if ( _cppunit_DEBUG)
message(STATUS "library dir for cppunit = ${CPPUNIT_LIBRARY}")
endif ( _cppunit_DEBUG)
message(STATUS "library dir for cppunit = ${CPPUNIT_LIBRARY}")
endif ()
if (CPPUNIT_INCLUDE_DIR AND CPPUNIT_LIBRARY)
SET(CPPUNIT_FOUND TRUE)
endif (CPPUNIT_INCLUDE_DIR AND CPPUNIT_LIBRARY)
SET(CPPUNIT_FOUND TRUE)
endif ()
if (CPPUNIT_FOUND)
# show which CppUnit was found only if not quiet
if (NOT CppUnit_FIND_QUIETLY)
message(STATUS "Found CppUnit: ${CPPUNIT_LIBRARY}")
endif (NOT CppUnit_FIND_QUIETLY)
else (CPPUNIT_FOUND)
# fatal error if CppUnit is required but not found
if (CppUnit_FIND_REQUIRED)
message(FATAL_ERROR "Could not find CppUnit")
endif (CppUnit_FIND_REQUIRED)
endif (CPPUNIT_FOUND)
# show which CppUnit was found only if not quiet
if (NOT CppUnit_FIND_QUIETLY)
#message(STATUS "Found CppUnit: ${CPPUNIT_LIBRARY}")
endif ()
else ()
# fatal error if CppUnit is required but not found
if (CppUnit_FIND_REQUIRED)
message(FATAL_ERROR "Could not find CppUnit")
endif ()
endif ()
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(CPPUNIT DEFAULT_MSG CPPUNIT_LIBRARY CPPUNIT_INCLUDE_DIR)

View File

@ -10,11 +10,6 @@
#
#
OPTION(WANT_STATIC_LIBS "builds as many static libs as possible" OFF)
IF(WANT_STATIC_LIBS)
OPTION(FTGL_STATIC "Set to ON to link your project with static library (instead of DLL)." ON)
ENDIF()
#message(STATUS "!!!!!!!!!!!!!!!!!!!!!!!!!!!!! #1 Searching for FTGL lib in custom path: [${FTGL_LIBRARY_PATH}]")
IF (FTGL_LIBRARY AND FTGL_INCLUDE_DIR)
@ -30,9 +25,9 @@ ELSE (FTGL_LIBRARY AND FTGL_INCLUDE_DIR)
PATHS /usr/local/include
/usr/include)
IF (FTGL_STATIC AND NOT FTGL_LIBRARY)
IF (STATIC_FTGL AND NOT FTGL_LIBRARY)
FIND_LIBRARY(FTGL_LIBRARY
NAMES libftgl.a ftgl libftgl libftgl.dll
NAMES libftgl.a ftgl.a ftgl libftgl libftgl.dll
PATHS /usr/local/lib
/usr/lib
${FTGL_LIBRARY_PATH})
@ -59,3 +54,4 @@ ELSE (FTGL_FOUND)
ENDIF (FTGL_FIND_REQUIRED)
ENDIF (FTGL_FOUND)
MARK_AS_ADVANCED(FTGL_INCLUDE_DIR FTGL_LIBRARY)

View File

@ -5,15 +5,18 @@
# FONTCONFIG_LIBRARIES - List of libraries when using FONTCONFIG.
# FONTCONFIG_FOUND - True if FONTCONFIG found.
# Look for the header file.
FIND_PATH( FONTCONFIG_INCLUDE_DIR NAMES fontconfig/fontconfig.h
DOC "Path in which the file fontconfig/fontconfig.h is located." )
MARK_AS_ADVANCED(FONTCONFIG_INCLUDE_DIR)
# Look for the library.
FIND_LIBRARY( FONTCONFIG_LIBRARY NAMES fontconfig
DOC "Path to fontconfig library." )
IF(STATIC_FontConfig)
FIND_LIBRARY( FONTCONFIG_LIBRARY NAMES libfontconfig.a fontconfig.a fontconfig
DOC "Path to fontconfig library." )
ELSE()
FIND_LIBRARY( FONTCONFIG_LIBRARY NAMES fontconfig
DOC "Path to fontconfig library." )
ENDIF()
MARK_AS_ADVANCED(FONTCONFIG_LIBRARY)
# Copy the results to the output variables.

View File

@ -28,12 +28,11 @@ set(FRIBIDI_INCLUDE_DIR ${xFRIBIDI_INCLUDE_DIR})
SET(FRIBIDI_NAMES ${FRIBIDI_NAMES} fribidi libfribidi)
OPTION(WANT_STATIC_LIBS "builds as many static libs as possible" OFF)
IF(WANT_STATIC_LIBS)
SET(FRIBIDI_NAMES fribidi.a libfribidi.a ${FRIBIDI_NAMES})
IF(STATIC_FriBiDi)
SET(FRIBIDI_NAMES libfribidi.a fribidi.a ${FRIBIDI_NAMES})
ENDIF()
MESSAGE(STATUS "** Searching for library names: [${FRIBIDI_NAMES}] ...")
#MESSAGE(STATUS "** Searching for library names: [${FRIBIDI_NAMES}] ...")
FIND_LIBRARY(FRIBIDI_LIBRARY
NAMES ${FRIBIDI_NAMES}
@ -80,3 +79,4 @@ ELSE (FRIBIDI_FOUND)
ENDIF (FRIBIDI_FIND_REQUIRED)
ENDIF (FRIBIDI_FOUND)
MARK_AS_ADVANCED(FRIBIDI_LIBRARY xFRIBIDI_INCLUDE_DIR)

View File

@ -1,55 +1,62 @@
# Try to find GLEW library and include path.
# Once done this will define
#.rst:
# FindGLEW
# --------
#
# GLEW_FOUND
# GLEW_INCLUDE_PATH
# GLEW_LIBRARY
#
# Find the OpenGL Extension Wrangler Library (GLEW)
#
# IMPORTED Targets
# ^^^^^^^^^^^^^^^^
#
# This module defines the :prop_tgt:`IMPORTED` target ``GLEW::GLEW``,
# if GLEW has been found.
#
# Result Variables
# ^^^^^^^^^^^^^^^^
#
# This module defines the following variables:
#
# ::
#
# GLEW_INCLUDE_DIRS - include directories for GLEW
# GLEW_LIBRARIES - libraries to link against GLEW
# GLEW_FOUND - true if GLEW has been found and can be used
IF (WIN32)
FIND_PATH( GLEW_INCLUDE_PATH GL/glew.h
$ENV{PROGRAMFILES}/GLEW/include
${PROJECT_SOURCE_DIR}/src/nvgl/glew/include
DOC "The directory where GL/glew.h resides")
FIND_LIBRARY( GLEW_LIBRARY
NAMES glew GLEW glew32 glew32s
PATHS
$ENV{PROGRAMFILES}/GLEW/lib
${PROJECT_SOURCE_DIR}/src/nvgl/glew/bin
${PROJECT_SOURCE_DIR}/src/nvgl/glew/lib
DOC "The GLEW library")
ELSE (WIN32)
#=============================================================================
# Copyright 2012 Benjamin Eikel
# Copyright 2015 filux <heross(@@)o2.pl>
#
# Distributed under the OSI-approved BSD License (the "License");
# see accompanying file Copyright.txt for details.
#
# This software is distributed WITHOUT ANY WARRANTY; without even the
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
# See the License for more information.
#=============================================================================
# (To distribute this file outside of CMake, substitute the full
# License text for the above reference.)
SET(GLEW_NAMES ${GLEW_NAMES} GLEW glew)
OPTION(WANT_STATIC_LIBS "builds as many static libs as possible" OFF)
IF(WANT_STATIC_LIBS)
SET(GLEW_NAMES libGLEW.a libglew.a ${GLEW_NAMES})
ENDIF()
find_path(GLEW_INCLUDE_DIR GL/glew.h)
FIND_PATH( GLEW_INCLUDE_PATH GL/glew.h
/usr/include
/usr/local/include
/sw/include
/opt/local/include
DOC "The directory where GL/glew.h resides")
FIND_LIBRARY( GLEW_LIBRARY
NAMES ${GLEW_NAMES}
PATHS
/usr/lib64
/usr/lib
/usr/local/lib64
/usr/local/lib
/sw/lib
/opt/local/lib
DOC "The GLEW library")
ENDIF (WIN32)
SET(GLEW_NAMES ${GLEW_NAMES} GLEW glew32 glew glew32s)
IF(STATIC_GLEW)
SET(GLEW_NAMES libGLEW.a libglew32.a libglew.a libglew32s.a GLEW.a glew32.a glew.a glew32s.a ${GLEW_NAMES})
ENDIF()
IF (GLEW_INCLUDE_PATH)
SET( GLEW_FOUND 1 CACHE STRING "Set to 1 if GLEW is found, 0 otherwise")
ELSE (GLEW_INCLUDE_PATH)
SET( GLEW_FOUND 0 CACHE STRING "Set to 1 if GLEW is found, 0 otherwise")
ENDIF (GLEW_INCLUDE_PATH)
find_library(GLEW_LIBRARY NAMES ${GLEW_NAMES} PATH_SUFFIXES lib64)
MARK_AS_ADVANCED( GLEW_FOUND )
set(GLEW_INCLUDE_DIRS ${GLEW_INCLUDE_DIR})
set(GLEW_LIBRARIES ${GLEW_LIBRARY})
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(GLEW REQUIRED_VARS GLEW_INCLUDE_DIR GLEW_LIBRARY)
if(GLEW_FOUND AND NOT TARGET GLEW::GLEW)
add_library(GLEW::GLEW UNKNOWN IMPORTED)
set_target_properties(GLEW::GLEW PROPERTIES
IMPORTED_LOCATION "${GLEW_LIBRARY}"
INTERFACE_INCLUDE_DIRECTORIES "${GLEW_INCLUDE_DIRS}")
message(STATUS "GLEW_LIBRARY: ${GLEW_LIBRARIES}")
endif()
mark_as_advanced(GLEW_INCLUDE_DIR GLEW_LIBRARY)

View File

@ -57,14 +57,15 @@ ELSE (GLIB2_LIBRARIES AND GLIB2_INCLUDE_DIRS )
NAMES
glibconfig.h
PATHS
/usr/local/include
/usr/include
/usr/lib64
/usr/lib
/opt/gnome/lib64
/opt/gnome/lib
/opt/lib/
/opt/local/lib
/sw/lib/
/usr/lib64
/usr/lib
/usr/local/include
${CMAKE_LIBRARY_PATH}
PATH_SUFFIXES
glib-2.0/include
@ -75,11 +76,11 @@ ELSE (GLIB2_LIBRARIES AND GLIB2_INCLUDE_DIRS )
NAMES
glib.h
PATHS
/usr/include
/usr/local/include
/opt/gnome/include
/opt/local/include
/sw/include
/usr/include
/usr/local/include
PATH_SUFFIXES
glib-2.0
)
@ -92,11 +93,11 @@ ELSE (GLIB2_LIBRARIES AND GLIB2_INCLUDE_DIRS )
glib-2.0
glib
PATHS
/usr/lib
/usr/local/lib
/opt/gnome/lib
/opt/local/lib
/sw/lib
/usr/lib
/usr/local/lib
)
IF ( _glib2_include_DIR AND _glib2_link_DIR )
SET ( _glib2_FOUND TRUE )
@ -118,22 +119,22 @@ ELSE (GLIB2_LIBRARIES AND GLIB2_INCLUDE_DIRS )
NAMES
libintl.h
PATHS
/usr/include
/usr/local/include
/opt/gnome/include
/opt/local/include
/sw/include
/usr/include
/usr/local/include
)
FIND_LIBRARY(LIBINTL_LIBRARY
NAMES
intl
PATHS
/usr/local/lib
/usr/lib
/opt/gnome/lib
/opt/local/lib
/sw/lib
/usr/local/lib
/usr/lib
)
IF (LIBINTL_LIBRARY AND LIBINTL_INCLUDE_DIR)
@ -147,13 +148,11 @@ ELSE (GLIB2_LIBRARIES AND GLIB2_INCLUDE_DIRS )
NAMES
iconv.h
PATHS
/opt/gnome/include
/opt/local/include
/opt/local/include
/sw/include
/sw/include
/usr/local/include
/usr/include
/opt/gnome/include
/opt/local/include
/sw/include
PATH_SUFFIXES
glib-2.0
)
@ -162,11 +161,11 @@ ELSE (GLIB2_LIBRARIES AND GLIB2_INCLUDE_DIRS )
NAMES
iconv
PATHS
/usr/lib
/usr/local/lib
/opt/gnome/lib
/opt/local/lib
/sw/lib
/usr/lib
/usr/local/lib
)
IF (LIBICONV_LIBRARY AND LIBICONV_INCLUDE_DIR)

View File

@ -132,4 +132,4 @@ IF(BREAKPAD_FOUND)
#SET(BREAKPAD_FOUND FALSE)
ENDIF(BREAKPAD_DUMPSYMS_EXE)
ENDIF(BREAKPAD_FOUND)
MARK_AS_ADVANCED(BREAKPAD_INCLUDE_DIR)

View File

@ -41,12 +41,8 @@ FIND_PATH(IRCCLIENT_INCLUDE_DIR libircclient.h
SET(IRCCLIENT_FIND_LIBRARIES ircclient)
OPTION(WANT_STATIC_LIBS "builds as many static libs as possible" OFF)
OPTION(FORCE_IRCCLIENT_DYNAMIC_LIBS "force the use of dynamic libs for IRCCLIENT" OFF)
MESSAGE(STATUS "Force IRCCLient dynamic: ${FORCE_IRCCLIENT_DYNAMIC_LIBS}")
IF(WANT_STATIC_LIBS AND NOT FORCE_IRCCLIENT_DYNAMIC_LIBS)
SET(IRCCLIENT_FIND_LIBRARIES libircclient.a ircclient.a)
IF(STATIC_Ircclient)
SET(IRCCLIENT_FIND_LIBRARIES libircclient.a ircclient.a libircclient ircclient)
ELSE()
SET(IRCCLIENT_FIND_LIBRARIES libircclient ircclient)
ENDIF()

View File

@ -45,8 +45,11 @@ PATHS
find_path(LIBVLC_INCLUDE_DIR PATHS "${CMAKE_INCLUDE_PATH}/vlc" NAMES vlc.h
HINTS ${PC_LIBVLC_INCLUDEDIR} ${PC_LIBVLC_INCLUDE_DIRS})
if (WANT_USE_VLC AND NOT LIBVLC_FIND_QUIETLY)
message(STATUS "Found LibVLC include-dir path: [${LIBVLC_INCLUDE_DIR}]")
endif ()
# dream on libvlc doesn't support static linking
#OPTION(WANT_STATIC_LIBS "builds as many static libs as possible" OFF)
set(LIBVLC_LIB_NAMES vlc libvlc)
set(LIBVLC_LIB_CORE_NAMES vlccore libvlccore)
#IF(WANT_STATIC_LIBS)
@ -66,6 +69,11 @@ PATHS
c:/msys/local/lib
)
find_library(LIBVLC_LIBRARY NAMES ${LIBVLC_LIB_NAMES})
if (WANT_USE_VLC AND NOT LIBVLC_FIND_QUIETLY)
message(STATUS "Found LibVLC library path: [${LIBVLC_LIBRARY}]")
endif ()
find_library(LIBVLCCORE_LIBRARY NAMES ${LIBVLC_LIB_CORE_NAMES}
HINTS "$ENV{LIBVLC_LIBRARY_PATH}" ${PC_LIBVLC_LIBDIR} ${PC_LIBVLC_LIBRARY_DIRS}
PATHS
@ -75,6 +83,10 @@ PATHS
)
find_library(LIBVLCCORE_LIBRARY NAMES ${LIBVLC_LIB_CORE_NAMES})
if (WANT_USE_VLC AND NOT LIBVLC_FIND_QUIETLY)
message(STATUS "Found LibVLCcore library path: [${LIBVLCCORE_LIBRARY}]")
endif ()
set(LIBVLC_VERSION ${PC_LIBVLC_VERSION})
if (NOT LIBVLC_VERSION)
# implement means to detect version on windows (vlc --version && regex? ... ultimately we would get it from a header though...)
@ -91,7 +103,6 @@ if (LIBVLC_VERSION STRLESS "${LIBVLC_MIN_VERSION}")
endif (LIBVLC_VERSION STRLESS "${LIBVLC_MIN_VERSION}")
if (LIBVLC_FOUND)
if(LIBVLC_VERSION STRLESS "2.0.0")
set(LIBVLC_VERSION_PRE_V2 TRUE)
ENDIF()
@ -100,9 +111,6 @@ if (LIBVLC_FOUND)
ENDIF()
if (NOT LIBVLC_FIND_QUIETLY)
message(STATUS "Found LibVLC include-dir path: ${LIBVLC_INCLUDE_DIR}")
message(STATUS "Found LibVLC library path:${LIBVLC_LIBRARY}")
message(STATUS "Found LibVLCcore library path:${LIBVLCCORE_LIBRARY}")
message(STATUS "Found LibVLC version: ${LIBVLC_VERSION} (searched for: ${LIBVLC_MIN_VERSION})")
endif (NOT LIBVLC_FIND_QUIETLY)
else (LIBVLC_FOUND)
@ -111,3 +119,4 @@ else (LIBVLC_FOUND)
endif (LIBVLC_FIND_REQUIRED)
endif (LIBVLC_FOUND)
MARK_AS_ADVANCED(LIBVLCCORE_LIBRARY LIBVLC_INCLUDE_DIR LIBVLC_LIBRARY)

View File

@ -1,95 +1,195 @@
# Find the Lua 5.1 includes and library
#.rst:
# FindLua
# -------
#
# LUA_INCLUDE_DIR - where to find lua.h
# LUA_LIBRARIES - List of fully qualified libraries to link against
# LUA_FOUND - Set to TRUE if found
# Copyright (c) 2007, Pau Garcia i Quiles, <pgquiles@elpauer.org>
#
# Redistribution and use is allowed according to the terms of the BSD license.
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
#
# Locate Lua library This module defines
#
# ::
#
# LUA_FOUND - if false, do not try to link to Lua
# LUA_LIBRARIES - both lua and lualib
# LUA_INCLUDE_DIR - where to find lua.h
# LUA_VERSION_STRING - the version of Lua found
# LUA_VERSION_MAJOR - the major version of Lua
# LUA_VERSION_MINOR - the minor version of Lua
# LUA_VERSION_PATCH - the patch version of Lua
#
#
#
# Note that the expected include convention is
#
# ::
#
# #include "lua.h"
#
# and not
#
# ::
#
# #include <lua/lua.h>
#
# This is because, the lua location is not standardized and may exist in
# locations other than lua/
OPTION(WANT_STATIC_LIBS "builds as many static libs as possible" OFF)
IF(WANT_STATIC_LIBS)
OPTION(LUA_STATIC "Set to ON to link your project with static library (instead of DLL)." ON)
ENDIF()
#=============================================================================
# Copyright 2007-2009 Kitware, Inc.
# Copyright 2013 Rolf Eike Beer <eike@sf-mail.de>
# Copyright 2015 filux <heross(@@)o2.pl>
#
# Distributed under the OSI-approved BSD License (the "License");
# see accompanying file Copyright.txt for details.
#
# This software is distributed WITHOUT ANY WARRANTY; without even the
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
# See the License for more information.
#=============================================================================
# (To distribute this file outside of CMake, substitute the full
# License text for the above reference.)
IF(LUA_INCLUDE_DIR AND LUA_LIBRARIES)
#SET(LUA_FIND_QUIETLY TRUE)
ENDIF(LUA_INCLUDE_DIR AND LUA_LIBRARIES)
unset(_lua_include_subdirs)
unset(_lua_library_names)
IF(FORCE_LUA_5_2)
MESSAGE(STATUS "Trying to FORCE LUA 5.2 ...")
SET(LUA_FIND_INCLUDE_PATHS /usr/include/lua5.2
/usr/include
/usr/include/lua )
SET(LUA_FIND_STATIC_LIB_NAMES liblua5.2.a lua5.2 liblua.a lua )
SET(LUA_FIND_DYNAMIC_LIB_NAMES lua5.2 lua )
ELSEIF(FORCE_LUA_5_1)
MESSAGE(STATUS "Trying to FORCE LUA 5.1 ...")
SET(LUA_FIND_INCLUDE_PATHS /usr/include/lua5.1
/usr/include
/usr/include/lua )
SET(LUA_FIND_STATIC_LIB_NAMES liblua5.1.a lua5.1 liblua.a lua )
SET(LUA_FIND_DYNAMIC_LIB_NAMES lua5.1 lua )
IF("${FORCE_LUA_VERSION}" STREQUAL "OFF")
IF(DEFINED ALL_LUA_VERSIONS_IN_ORDER)
SET(LUA_VERSIONS5 "${ALL_LUA_VERSIONS_IN_ORDER}")
ELSE()
SET(LUA_VERSIONS5 5.3 5.2 5.1 5.0)
ENDIF()
ELSE()
SET(LUA_FIND_INCLUDE_PATHS /usr/include
/usr/include/lua5.2
/usr/include/lua
/usr/include/lua5.1 )
SET(LUA_FIND_STATIC_LIB_NAMES liblua5.2.a liblua.a liblua5.1.a lua5.2 lua lua5.1 )
SET(LUA_FIND_DYNAMIC_LIB_NAMES lua5.2 lua lua5.1 )
SET(LUA_VERSIONS5 "${FORCE_LUA_VERSION}")
ENDIF()
FIND_PATH(LUA_INCLUDE_DIR NAMES lua.hpp
PATHS ${LUA_FIND_INCLUDE_PATHS}
IF(FreeBSD)
SET(PATHS "/usr/local/include/lua51")
ENDIF()
$ENV{LUA_HOME}
)
# this is a function only to have all the variables inside go away automatically
function(set_lua_version_vars)
if (Lua_FIND_VERSION_EXACT)
if (Lua_FIND_VERSION_COUNT GREATER 1)
set(lua_append_versions ${Lua_FIND_VERSION_MAJOR}.${Lua_FIND_VERSION_MINOR})
endif ()
elseif (Lua_FIND_VERSION)
# once there is a different major version supported this should become a loop
if (NOT Lua_FIND_VERSION_MAJOR GREATER 5)
if (Lua_FIND_VERSION_COUNT EQUAL 1)
set(lua_append_versions ${LUA_VERSIONS5})
else ()
foreach (subver IN LISTS LUA_VERSIONS5)
if (NOT subver VERSION_LESS ${Lua_FIND_VERSION})
list(APPEND lua_append_versions ${subver})
endif ()
endforeach ()
endif ()
endif ()
else ()
# once there is a different major version supported this should become a loop
set(lua_append_versions ${LUA_VERSIONS5})
endif ()
IF (LUA_STATIC AND NOT LUA_LIBRARIES)
FIND_LIBRARY(LUA_LIBRARIES NAMES ${LUA_FIND_STATIC_LIB_NAMES}
PATHS
IF(FreeBSD)
SET(PATHS "/usr/local/lib/lua51")
ENDIF()
$ENV{LUA_HOME})
foreach (ver IN LISTS lua_append_versions)
string(REGEX MATCH "^([0-9]+)\\.([0-9]+)$" _ver "${ver}")
list(APPEND _lua_include_subdirs
include/lua${CMAKE_MATCH_1}${CMAKE_MATCH_2}
include/lua${CMAKE_MATCH_1}.${CMAKE_MATCH_2}
include/lua-${CMAKE_MATCH_1}.${CMAKE_MATCH_2}
)
IF(STATIC_LUA)
list(APPEND _lua_library_names
liblua${CMAKE_MATCH_1}${CMAKE_MATCH_2}.a
liblua${CMAKE_MATCH_1}.${CMAKE_MATCH_2}.a
liblua-${CMAKE_MATCH_1}.${CMAKE_MATCH_2}.a
lua${CMAKE_MATCH_1}${CMAKE_MATCH_2}.a
lua${CMAKE_MATCH_1}.${CMAKE_MATCH_2}.a
lua-${CMAKE_MATCH_1}.${CMAKE_MATCH_2}.a
)
ENDIF()
list(APPEND _lua_library_names
lua${CMAKE_MATCH_1}${CMAKE_MATCH_2}
lua${CMAKE_MATCH_1}.${CMAKE_MATCH_2}
lua-${CMAKE_MATCH_1}.${CMAKE_MATCH_2}
)
endforeach ()
ELSE()
FIND_LIBRARY(LUA_LIBRARIES NAMES ${LUA_FIND_DYNAMIC_LIB_NAMES}
PATHS
IF(FreeBSD)
SET(PATHS "/usr/local/lib/lua51")
ENDIF()
$ENV{LUA_HOME})
set(_lua_include_subdirs "${_lua_include_subdirs}" PARENT_SCOPE)
set(_lua_library_names "${_lua_library_names}" PARENT_SCOPE)
endfunction(set_lua_version_vars)
set_lua_version_vars()
find_path(LUA_INCLUDE_DIR lua.h
HINTS
ENV LUA_DIR
PATH_SUFFIXES ${_lua_include_subdirs} include/lua include
PATHS
~/Library/Frameworks
/Library/Frameworks
/sw # Fink
/opt/local # DarwinPorts
/opt/csw # Blastwave
/opt
)
unset(_lua_include_subdirs)
IF(STATIC_LUA AND APPLE)
# at least in mac ports, static lib is without numbers in name
SET(_lua_library_names lua.a liblua.a ${_lua_library_names})
ENDIF()
MESSAGE(STATUS "LUA_INC: ${LUA_INCLUDE_DIR}")
MESSAGE(STATUS "LUA_LIB: ${LUA_LIBRARIES}")
find_library(LUA_LIBRARY
NAMES ${_lua_library_names} lua
HINTS
ENV LUA_DIR
PATH_SUFFIXES lib
PATHS
~/Library/Frameworks
/Library/Frameworks
/sw
/opt/local
/opt/csw
/opt
)
unset(_lua_library_names)
IF(LUA_INCLUDE_DIR AND LUA_LIBRARIES)
SET(LUA_FOUND TRUE)
INCLUDE(CheckLibraryExists)
CHECK_LIBRARY_EXISTS(${LUA_LIBRARIES} lua_close "" LUA_NEED_PREFIX)
ELSE(LUA_INCLUDE_DIR AND LUA_LIBRARIES)
SET(LUA_FOUND FALSE)
ENDIF (LUA_INCLUDE_DIR AND LUA_LIBRARIES)
if (LUA_LIBRARY)
# include the math library for Unix
if (UNIX AND NOT APPLE AND NOT BEOS)
find_library(LUA_MATH_LIBRARY m)
set(LUA_LIBRARIES "${LUA_LIBRARY};${LUA_MATH_LIBRARY}")
# For Windows and Mac, don't need to explicitly include the math library
else ()
set(LUA_LIBRARIES "${LUA_LIBRARY}")
endif ()
endif ()
IF(LUA_FOUND)
IF (NOT LUA_FIND_QUIETLY)
MESSAGE(STATUS "Found Lua library: ${LUA_LIBRARIES}")
MESSAGE(STATUS "Found Lua headers: ${LUA_INCLUDE_DIR}")
ENDIF (NOT LUA_FIND_QUIETLY)
ELSE(LUA_FOUND)
IF(LUA_FIND_REQUIRED)
MESSAGE(FATAL_ERROR "Could NOT find Lua")
ENDIF(LUA_FIND_REQUIRED)
ENDIF(LUA_FOUND)
if (LUA_INCLUDE_DIR AND EXISTS "${LUA_INCLUDE_DIR}/lua.h")
# At least 5.[012] have different ways to express the version
# so all of them need to be tested. Lua 5.2 defines LUA_VERSION
# and LUA_RELEASE as joined by the C preprocessor, so avoid those.
file(STRINGS "${LUA_INCLUDE_DIR}/lua.h" lua_version_strings
REGEX "^#define[ \t]+LUA_(RELEASE[ \t]+\"Lua [0-9]|VERSION([ \t]+\"Lua [0-9]|_[MR])).*")
MARK_AS_ADVANCED(LUA_INCLUDE_DIR LUA_LIBRARIES)
string(REGEX REPLACE ".*;#define[ \t]+LUA_VERSION_MAJOR[ \t]+\"([0-9])\"[ \t]*;.*" "\\1" LUA_VERSION_MAJOR ";${lua_version_strings};")
if (LUA_VERSION_MAJOR MATCHES "^[0-9]+$")
string(REGEX REPLACE ".*;#define[ \t]+LUA_VERSION_MINOR[ \t]+\"([0-9])\"[ \t]*;.*" "\\1" LUA_VERSION_MINOR ";${lua_version_strings};")
string(REGEX REPLACE ".*;#define[ \t]+LUA_VERSION_RELEASE[ \t]+\"([0-9])\"[ \t]*;.*" "\\1" LUA_VERSION_PATCH ";${lua_version_strings};")
set(LUA_VERSION_STRING "${LUA_VERSION_MAJOR}.${LUA_VERSION_MINOR}.${LUA_VERSION_PATCH}")
else ()
string(REGEX REPLACE ".*;#define[ \t]+LUA_RELEASE[ \t]+\"Lua ([0-9.]+)\"[ \t]*;.*" "\\1" LUA_VERSION_STRING ";${lua_version_strings};")
if (NOT LUA_VERSION_STRING MATCHES "^[0-9.]+$")
string(REGEX REPLACE ".*;#define[ \t]+LUA_VERSION[ \t]+\"Lua ([0-9.]+)\"[ \t]*;.*" "\\1" LUA_VERSION_STRING ";${lua_version_strings};")
endif ()
string(REGEX REPLACE "^([0-9]+)\\.[0-9.]*$" "\\1" LUA_VERSION_MAJOR "${LUA_VERSION_STRING}")
string(REGEX REPLACE "^[0-9]+\\.([0-9]+)[0-9.]*$" "\\1" LUA_VERSION_MINOR "${LUA_VERSION_STRING}")
string(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.([0-9]).*" "\\1" LUA_VERSION_PATCH "${LUA_VERSION_STRING}")
endif ()
unset(lua_version_strings)
endif()
include(FindPackageHandleStandardArgs)
# handle the QUIETLY and REQUIRED arguments and set LUA_FOUND to TRUE if
# all listed variables are TRUE
FIND_PACKAGE_HANDLE_STANDARD_ARGS(Lua
REQUIRED_VARS LUA_LIBRARIES LUA_INCLUDE_DIR
VERSION_VAR LUA_VERSION_STRING)
mark_as_advanced(LUA_INCLUDE_DIR LUA_LIBRARY LUA_MATH_LIBRARY)

View File

@ -1,36 +0,0 @@
# Find the LuaJIT includes and library
#
# LUAJIT_INCLUDE_DIR - where to find lua.h
# LUAJIT_LIBRARIES - List of fully qualified libraries to link against
# LUAJIT_FOUND - Set to TRUE if found
# Copyright (c) 2012, Mark Vejvoda, <mark_vejvoda@hotmail.com>
#
# Redistribution and use is allowed according to the terms of the BSD license.
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
OPTION(WANT_STATIC_LIBS "builds as many static libs as possible" OFF)
IF(WANT_STATIC_LIBS)
OPTION(LUAJIT_FIND_STATIC "Set to ON to link your project with static library (instead of DLL)." ON)
ENDIF()
find_path(LUAJIT_INCLUDE_DIR luajit.h
NAMES luajit.h
PATH_SUFFIXES luajit-2.0)
if (LUAJIT_FIND_STATIC)
find_library(LUAJIT_LIBRARIES luajit.a
NAMES libluajit-5.1.a)
else (LUATJIT_FIND_STATIC)
find_library(LUAJIT_LIBRARIES luajit
NAMES luajit-5.1)
endif (LUAJIT_FIND_STATIC)
mark_as_advanced(LUAJIT_INCLUDE_DIR)
mark_as_advanced(LUAJIT_LIBRARIES)
# handle the QUIETLY and REQUIRED arguments and set LUAJIT_FOUND to TRUE if
# all listed variables are TRUE
INCLUDE(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(LUAJIT DEFAULT_MSG LUAJIT_LIBRARIES LUAJIT_INCLUDE_DIR)

View File

@ -40,36 +40,35 @@ SET(MINIUPNPC_DIR_SEARCH $ENV{MINIUPNPC_ROOT})
#find_path(MINIUPNP_INCLUDE_DIR miniupnpc.h
# PATH_SUFFIXES miniupnpc)
FIND_PATH(MINIUPNP_INCLUDE_DIR miniupnpc.h
${MINIUPNPC_DIR_SEARCH}/include/miniupnpc
/usr/include/miniupnpc
/usr/local/include/miniupnpc)
FIND_PATH(MINIUPNP_INCLUDE_DIR miniupnpc.h
PATHS ${MINIUPNPC_DIR_SEARCH}/include
/usr/include
/usr/local/include
PATH_SUFFIXES miniupnpc)
message(STATUS "Finding miniupnpc.h result: ${MINIUPNP_INCLUDE_DIR}")
#message(STATUS "Finding miniupnpc.h result: ${MINIUPNP_INCLUDE_DIR}")
#find_library(MINIUPNP_LIBRARY miniupnpc)
set(MINIUPNPC_LIBRARY_NAMES ${MINIUPNPC_LIBRARY_DYNAMIC_NAME} libminiupnpc miniupnpc)
IF(WANT_STATIC_LIBS)
set(MINIUPNPC_LIBRARY_NAMES ${MINIUPNPC_LIBRARY_STATIC_NAME} libminiupnpc.a)
ELSE()
set(MINIUPNPC_LIBRARY_NAMES ${MINIUPNPC_LIBRARY_DYNAMIC_NAME} libminiupnpc.so miniupnpc)
IF(STATIC_Miniupnpc)
set(MINIUPNPC_LIBRARY_NAMES ${MINIUPNPC_LIBRARY_STATIC_NAME} libminiupnpc.a miniupnpc.a ${MINIUPNPC_LIBRARY_NAMES})
ENDIF()
FIND_LIBRARY(MINIUPNP_LIBRARY NAMES ${MINIUPNPC_LIBRARY_NAMES})
message(STATUS "Finding miniupnpc lib result: ${MINIUPNP_LIBRARY}")
#message(STATUS "Finding miniupnpc lib result: ${MINIUPNP_LIBRARY}")
if (MINIUPNP_INCLUDE_DIR AND MINIUPNP_LIBRARY)
set (MINIUPNP_FOUND TRUE)
endif ()
include(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(MINIUPNP REQUIRED_VARS MINIUPNP_LIBRARY MINIUPNP_INCLUDE_DIR)
if (MINIUPNP_FOUND)
if (NOT MINIUPNP_FIND_QUIETLY)
message (STATUS "Found the miniupnpc libraries at ${MINIUPNP_LIBRARY}")
#message (STATUS "Found the miniupnpc libraries at ${MINIUPNP_LIBRARY}")
message (STATUS "Found the miniupnpc headers at ${MINIUPNP_INCLUDE_DIR}")
endif (NOT MINIUPNP_FIND_QUIETLY)
message(STATUS "Detecting version of miniupnpc in path: ${MINIUPNP_INCLUDE_DIR}")
#message(STATUS "Detecting version of miniupnpc in path: ${MINIUPNP_INCLUDE_DIR}")
set(CMAKE_REQUIRED_INCLUDES ${MINIUPNP_INCLUDE_DIR})
set(CMAKE_REQUIRED_LIBRARIES ${MINIUPNP_LIBRARY})
@ -201,7 +200,5 @@ else ()
message (STATUS "Could not find miniupnp")
endif ()
MARK_AS_ADVANCED(
MINIUPNPC_INCLUDE_DIR
MINIUPNPC_LIBRARY)
MARK_AS_ADVANCED(MINIUPNP_INCLUDE_DIR MINIUPNP_LIBRARY)

View File

@ -6,40 +6,34 @@
# VORBIS_FILE_LIBRARY
#
OPTION(WANT_STATIC_LIBS "builds as many static libs as possible" OFF)
IF(WANT_STATIC_LIBS)
OPTION(OGG_STATIC "Set to ON to link your project with static library (instead of DLL)." ON)
ENDIF()
# check for cache to avoid littering log
IF(OGG_INCLUDE_DIR AND OGG_LIBRARY AND VORBIS_LIBRARY)
SET(OGG_BE_QUIET TRUE)
ENDIF(OGG_INCLUDE_DIR AND OGG_LIBRARY AND VORBIS_LIBRARY)
ENDIF()
FIND_PATH(OGG_INCLUDE_DIR ogg/ogg.h)
#IF (OGG_STATIC AND NOT OGG_LIBRARY)
# FIND_LIBRARY(OGG_LIBRARY NAMES libogg.a ogg)
#ELSE()
IF (STATIC_OGG AND NOT OGG_LIBRARY)
FIND_LIBRARY(OGG_LIBRARY NAMES libogg.a ogg.a ogg)
ELSE()
FIND_LIBRARY(OGG_LIBRARY NAMES ogg)
#ENDIF()
ENDIF()
#IF (OGG_STATIC AND NOT VORBIS_LIBRARY)
# FIND_LIBRARY(VORBIS_LIBRARY NAMES libvorbis.a vorbis)
#ELSE()
IF (STATIC_OGG AND NOT VORBIS_LIBRARY)
FIND_LIBRARY(VORBIS_LIBRARY NAMES libvorbis.a vorbis.a vorbis)
ELSE()
FIND_LIBRARY(VORBIS_LIBRARY NAMES vorbis)
#ENDIF()
ENDIF()
#on macosx the vorbisfile library is part of the vorbisone...
#on macosx the vorbisfile library is part of the vorbisone...
#IF(NOT APPLE)
# comment above is full of lies
#IF (OGG_STATIC AND NOT VORBIS_FILE_LIBRARY)
# FIND_LIBRARY(VORBIS_FILE_LIBRARY NAMES libvorbisfile.a vorbisfile)
#ELSE()
IF (STATIC_OGG AND NOT VORBIS_FILE_LIBRARY)
FIND_LIBRARY(VORBIS_FILE_LIBRARY NAMES libvorbisfile.a vorbisfile.a vorbisfile)
ELSE()
FIND_LIBRARY(VORBIS_FILE_LIBRARY NAMES vorbisfile)
#ENDIF()
ENDIF()
#ENDIF(NOT APPLE)
@ -51,10 +45,10 @@ IF(OGG_INCLUDE_DIR AND OGG_LIBRARY AND VORBIS_LIBRARY AND (APPLE OR VORBIS_FILE_
MESSAGE(STATUS "Vorbis library : ${VORBIS_LIBRARY}")
MESSAGE(STATUS "Vorbis file library: ${VORBIS_FILE_LIBRARY}")
ENDIF(NOT OGG_BE_QUIET)
ELSE(OGG_INCLUDE_DIR AND OGG_LIBRARY AND VORBIS_LIBRARY AND (APPLE OR VORBIS_FILE_LIBRARY))
ELSE()
SET(OGG_FOUND FALSE)
MESSAGE("OGG/Vorbis was not found on this system!")
ENDIF(OGG_INCLUDE_DIR AND OGG_LIBRARY AND VORBIS_LIBRARY AND (APPLE OR VORBIS_FILE_LIBRARY))
ENDIF()
MARK_AS_ADVANCED(
OGG_INCLUDE_DIR

View File

@ -1,263 +0,0 @@
# FIND_PACKAGE_HANDLE_STANDARD_ARGS(<name> ... )
#
# This function is intended to be used in FindXXX.cmake modules files.
# It handles the REQUIRED, QUIET and version-related arguments to FIND_PACKAGE().
# It also sets the <UPPERCASED_NAME>_FOUND variable.
# The package is considered found if all variables <var1>... listed contain
# valid results, e.g. valid filepaths.
#
# There are two modes of this function. The first argument in both modes is
# the name of the Find-module where it is called (in original casing).
#
# The first simple mode looks like this:
# FIND_PACKAGE_HANDLE_STANDARD_ARGS(<name> (DEFAULT_MSG|"Custom failure message") <var1>...<varN> )
# If the variables <var1> to <varN> are all valid, then <UPPERCASED_NAME>_FOUND
# will be set to TRUE.
# If DEFAULT_MSG is given as second argument, then the function will generate
# itself useful success and error messages. You can also supply a custom error message
# for the failure case. This is not recommended.
#
# The second mode is more powerful and also supports version checking:
# FIND_PACKAGE_HANDLE_STANDARD_ARGS(NAME [REQUIRED_VARS <var1>...<varN>]
# [VERSION_VAR <versionvar>
# [CONFIG_MODE]
# [FAIL_MESSAGE "Custom failure message"] )
#
# As above, if <var1> through <varN> are all valid, <UPPERCASED_NAME>_FOUND
# will be set to TRUE.
# After REQUIRED_VARS the variables which are required for this package are listed.
# Following VERSION_VAR the name of the variable can be specified which holds
# the version of the package which has been found. If this is done, this version
# will be checked against the (potentially) specified required version used
# in the find_package() call. The EXACT keyword is also handled. The default
# messages include information about the required version and the version
# which has been actually found, both if the version is ok or not.
# Use the option CONFIG_MODE if your FindXXX.cmake module is a wrapper for
# a find_package(... NO_MODULE) call, in this case all the information
# provided by the config-mode of find_package() will be evaluated
# automatically.
# Via FAIL_MESSAGE a custom failure message can be specified, if this is not
# used, the default message will be displayed.
#
# Example for mode 1:
#
# FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibXml2 DEFAULT_MSG LIBXML2_LIBRARY LIBXML2_INCLUDE_DIR)
#
# LibXml2 is considered to be found, if both LIBXML2_LIBRARY and
# LIBXML2_INCLUDE_DIR are valid. Then also LIBXML2_FOUND is set to TRUE.
# If it is not found and REQUIRED was used, it fails with FATAL_ERROR,
# independent whether QUIET was used or not.
# If it is found, success will be reported, including the content of <var1>.
# On repeated Cmake runs, the same message won't be printed again.
#
# Example for mode 2:
#
# FIND_PACKAGE_HANDLE_STANDARD_ARGS(BISON REQUIRED_VARS BISON_EXECUTABLE
# VERSION_VAR BISON_VERSION)
# In this case, BISON is considered to be found if the variable(s) listed
# after REQUIRED_VAR are all valid, i.e. BISON_EXECUTABLE in this case.
# Also the version of BISON will be checked by using the version contained
# in BISON_VERSION.
# Since no FAIL_MESSAGE is given, the default messages will be printed.
#
# Another example for mode 2:
#
# FIND_PACKAGE(Automoc4 QUIET NO_MODULE HINTS /opt/automoc4)
# FIND_PACKAGE_HANDLE_STANDARD_ARGS(Automoc4 CONFIG_MODE)
# In this case, FindAutmoc4.cmake wraps a call to FIND_PACKAGE(Automoc4 NO_MODULE)
# and adds an additional search directory for automoc4.
# The following FIND_PACKAGE_HANDLE_STANDARD_ARGS() call produces a proper
# success/error message.
#=============================================================================
# Copyright 2007-2009 Kitware, Inc.
#
# Distributed under the OSI-approved BSD License (the "License");
# see accompanying file Copyright.txt for details.
#
# This software is distributed WITHOUT ANY WARRANTY; without even the
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
# See the License for more information.
#=============================================================================
# (To distribute this file outside of CMake, substitute the full
# License text for the above reference.)
INCLUDE(FindPackageMessage)
IF(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
INCLUDE(CMakeParseArguments)
ENDIF()
# internal helper macro
MACRO(_FPHSA_FAILURE_MESSAGE _msg)
IF (${_NAME}_FIND_REQUIRED)
MESSAGE(FATAL_ERROR "${_msg}")
ELSE (${_NAME}_FIND_REQUIRED)
IF (NOT ${_NAME}_FIND_QUIETLY)
MESSAGE(STATUS "${_msg}")
ENDIF (NOT ${_NAME}_FIND_QUIETLY)
ENDIF (${_NAME}_FIND_REQUIRED)
ENDMACRO(_FPHSA_FAILURE_MESSAGE _msg)
# internal helper macro to generate the failure message when used in CONFIG_MODE:
MACRO(_FPHSA_HANDLE_FAILURE_CONFIG_MODE)
# <name>_CONFIG is set, but FOUND is false, this means that some other of the REQUIRED_VARS was not found:
IF(${_NAME}_CONFIG)
_FPHSA_FAILURE_MESSAGE("${FPHSA_FAIL_MESSAGE}: missing: ${MISSING_VARS} (found ${${_NAME}_CONFIG} ${VERSION_MSG})")
ELSE(${_NAME}_CONFIG)
# If _CONSIDERED_CONFIGS is set, the config-file has been found, but no suitable version.
# List them all in the error message:
IF(${_NAME}_CONSIDERED_CONFIGS)
SET(configsText "")
LIST(LENGTH ${_NAME}_CONSIDERED_CONFIGS configsCount)
MATH(EXPR configsCount "${configsCount} - 1")
FOREACH(currentConfigIndex RANGE ${configsCount})
LIST(GET ${_NAME}_CONSIDERED_CONFIGS ${currentConfigIndex} filename)
LIST(GET ${_NAME}_CONSIDERED_VERSIONS ${currentConfigIndex} version)
SET(configsText "${configsText} ${filename} (version ${version})\n")
ENDFOREACH(currentConfigIndex)
_FPHSA_FAILURE_MESSAGE("${FPHSA_FAIL_MESSAGE} ${VERSION_MSG}, checked the following files:\n${configsText}")
ELSE(${_NAME}_CONSIDERED_CONFIGS)
# Simple case: No Config-file was found at all:
_FPHSA_FAILURE_MESSAGE("${FPHSA_FAIL_MESSAGE}: found neither ${_NAME}Config.cmake nor ${_NAME_LOWER}-config.cmake ${VERSION_MSG}")
ENDIF(${_NAME}_CONSIDERED_CONFIGS)
ENDIF(${_NAME}_CONFIG)
ENDMACRO(_FPHSA_HANDLE_FAILURE_CONFIG_MODE)
FUNCTION(FIND_PACKAGE_HANDLE_STANDARD_ARGS _NAME _FIRST_ARG)
# set up the arguments for CMAKE_PARSE_ARGUMENTS and check whether we are in
# new extended or in the "old" mode:
SET(options CONFIG_MODE)
SET(oneValueArgs FAIL_MESSAGE VERSION_VAR)
SET(multiValueArgs REQUIRED_VARS)
SET(_KEYWORDS_FOR_EXTENDED_MODE ${options} ${oneValueArgs} ${multiValueArgs} )
LIST(FIND _KEYWORDS_FOR_EXTENDED_MODE "${_FIRST_ARG}" INDEX)
IF(${INDEX} EQUAL -1)
SET(FPHSA_FAIL_MESSAGE ${_FIRST_ARG})
SET(FPHSA_REQUIRED_VARS ${ARGN})
SET(FPHSA_VERSION_VAR)
ELSE(${INDEX} EQUAL -1)
CMAKE_PARSE_ARGUMENTS(FPHSA "${options}" "${oneValueArgs}" "${multiValueArgs}" ${_FIRST_ARG} ${ARGN})
IF(FPHSA_UNPARSED_ARGUMENTS)
MESSAGE(FATAL_ERROR "Unknown keywords given to FIND_PACKAGE_HANDLE_STANDARD_ARGS(): \"${FPHSA_UNPARSED_ARGUMENTS}\"")
ENDIF(FPHSA_UNPARSED_ARGUMENTS)
IF(NOT FPHSA_FAIL_MESSAGE)
SET(FPHSA_FAIL_MESSAGE "DEFAULT_MSG")
ENDIF(NOT FPHSA_FAIL_MESSAGE)
ENDIF(${INDEX} EQUAL -1)
# now that we collected all arguments, process them
IF("${FPHSA_FAIL_MESSAGE}" STREQUAL "DEFAULT_MSG")
SET(FPHSA_FAIL_MESSAGE "Could NOT find ${_NAME}")
ENDIF("${FPHSA_FAIL_MESSAGE}" STREQUAL "DEFAULT_MSG")
# In config-mode, we rely on the variable <package>_CONFIG, which is set by find_package()
# when it successfully found the config-file, including version checking:
IF(FPHSA_CONFIG_MODE)
LIST(INSERT FPHSA_REQUIRED_VARS 0 ${_NAME}_CONFIG)
LIST(REMOVE_DUPLICATES FPHSA_REQUIRED_VARS)
SET(FPHSA_VERSION_VAR ${_NAME}_VERSION)
ENDIF(FPHSA_CONFIG_MODE)
IF(NOT FPHSA_REQUIRED_VARS)
MESSAGE(FATAL_ERROR "No REQUIRED_VARS specified for FIND_PACKAGE_HANDLE_STANDARD_ARGS()")
ENDIF(NOT FPHSA_REQUIRED_VARS)
LIST(GET FPHSA_REQUIRED_VARS 0 _FIRST_REQUIRED_VAR)
STRING(TOUPPER ${_NAME} _NAME_UPPER)
STRING(TOLOWER ${_NAME} _NAME_LOWER)
# collect all variables which were not found, so they can be printed, so the
# user knows better what went wrong (#6375)
SET(MISSING_VARS "")
SET(DETAILS "")
SET(${_NAME_UPPER}_FOUND TRUE)
# check if all passed variables are valid
FOREACH(_CURRENT_VAR ${FPHSA_REQUIRED_VARS})
IF(NOT ${_CURRENT_VAR})
SET(${_NAME_UPPER}_FOUND FALSE)
SET(MISSING_VARS "${MISSING_VARS} ${_CURRENT_VAR}")
ELSE(NOT ${_CURRENT_VAR})
SET(DETAILS "${DETAILS}[${${_CURRENT_VAR}}]")
ENDIF(NOT ${_CURRENT_VAR})
ENDFOREACH(_CURRENT_VAR)
# version handling:
SET(VERSION_MSG "")
SET(VERSION_OK TRUE)
SET(VERSION ${${FPHSA_VERSION_VAR}} )
IF (${_NAME}_FIND_VERSION)
IF(VERSION)
IF(${_NAME}_FIND_VERSION_EXACT) # exact version required
IF (NOT "${${_NAME}_FIND_VERSION}" VERSION_EQUAL "${VERSION}")
SET(VERSION_MSG "Found unsuitable version \"${VERSION}\", but required is exact version \"${${_NAME}_FIND_VERSION}\"")
SET(VERSION_OK FALSE)
ELSE (NOT "${${_NAME}_FIND_VERSION}" VERSION_EQUAL "${VERSION}")
SET(VERSION_MSG "(found suitable exact version \"${VERSION}\")")
ENDIF (NOT "${${_NAME}_FIND_VERSION}" VERSION_EQUAL "${VERSION}")
ELSE(${_NAME}_FIND_VERSION_EXACT) # minimum version specified:
IF ("${${_NAME}_FIND_VERSION}" VERSION_GREATER "${VERSION}")
SET(VERSION_MSG "Found unsuitable version \"${VERSION}\", but required is at least \"${${_NAME}_FIND_VERSION}\"")
SET(VERSION_OK FALSE)
ELSE ("${${_NAME}_FIND_VERSION}" VERSION_GREATER "${VERSION}")
SET(VERSION_MSG "(found suitable version \"${VERSION}\", required is \"${${_NAME}_FIND_VERSION}\")")
ENDIF ("${${_NAME}_FIND_VERSION}" VERSION_GREATER "${VERSION}")
ENDIF(${_NAME}_FIND_VERSION_EXACT)
ELSE(VERSION)
# if the package was not found, but a version was given, add that to the output:
IF(${_NAME}_FIND_VERSION_EXACT)
SET(VERSION_MSG "(Required is exact version \"${${_NAME}_FIND_VERSION}\")")
ELSE(${_NAME}_FIND_VERSION_EXACT)
SET(VERSION_MSG "(Required is at least version \"${${_NAME}_FIND_VERSION}\")")
ENDIF(${_NAME}_FIND_VERSION_EXACT)
ENDIF(VERSION)
ELSE (${_NAME}_FIND_VERSION)
IF(VERSION)
SET(VERSION_MSG "(found version \"${VERSION}\")")
ENDIF(VERSION)
ENDIF (${_NAME}_FIND_VERSION)
IF(VERSION_OK)
SET(DETAILS "${DETAILS}[v${VERSION}(${${_NAME}_FIND_VERSION})]")
ELSE(VERSION_OK)
SET(${_NAME_UPPER}_FOUND FALSE)
ENDIF(VERSION_OK)
# print the result:
IF (${_NAME_UPPER}_FOUND)
FIND_PACKAGE_MESSAGE(${_NAME} "Found ${_NAME}: ${${_FIRST_REQUIRED_VAR}} ${VERSION_MSG}" "${DETAILS}")
ELSE (${_NAME_UPPER}_FOUND)
IF(FPHSA_CONFIG_MODE)
_FPHSA_HANDLE_FAILURE_CONFIG_MODE()
ELSE(FPHSA_CONFIG_MODE)
IF(NOT VERSION_OK)
_FPHSA_FAILURE_MESSAGE("${FPHSA_FAIL_MESSAGE}: ${VERSION_MSG} (found ${${_FIRST_REQUIRED_VAR}})")
ELSE(NOT VERSION_OK)
_FPHSA_FAILURE_MESSAGE("${FPHSA_FAIL_MESSAGE} (missing: ${MISSING_VARS}) ${VERSION_MSG}")
ENDIF(NOT VERSION_OK)
ENDIF(FPHSA_CONFIG_MODE)
ENDIF (${_NAME_UPPER}_FOUND)
SET(${_NAME_UPPER}_FOUND ${${_NAME_UPPER}_FOUND} PARENT_SCOPE)
ENDFUNCTION(FIND_PACKAGE_HANDLE_STANDARD_ARGS _FIRST_ARG)

View File

@ -0,0 +1,180 @@
# Locate SDL2 library
# This module defines
# SDL2_LIBRARY, the name of the library to link against
# SDL2_FOUND, if false, do not try to link to SDL2
# SDL2_INCLUDE_DIR, where to find SDL.h
#
# This module responds to the the flag:
# SDL2_BUILDING_LIBRARY
# If this is defined, then no SDL2_main will be linked in because
# only applications need main().
# Otherwise, it is assumed you are building an application and this
# module will attempt to locate and set the the proper link flags
# as part of the returned SDL2_LIBRARY variable.
#
# Don't forget to include SDL2main.h and SDL2main.m your project for the
# OS X framework based version. (Other versions link to -lSDL2main which
# this module will try to find on your behalf.) Also for OS X, this
# module will automatically add the -framework Cocoa on your behalf.
#
#
# Additional Note: If you see an empty SDL2_LIBRARY_TEMP in your configuration
# and no SDL2_LIBRARY, it means CMake did not find your SDL2 library
# (SDL2.dll, libsdl2.so, SDL2.framework, etc).
# Set SDL2_LIBRARY_TEMP to point to your SDL2 library, and configure again.
# Similarly, if you see an empty SDL2MAIN_LIBRARY, you should set this value
# as appropriate. These values are used to generate the final SDL2_LIBRARY
# variable, but when these values are unset, SDL2_LIBRARY does not get created.
#
#
# $SDL2DIR is an environment variable that would
# correspond to the ./configure --prefix=$SDL2DIR
# used in building SDL2.
# l.e.galup 9-20-02
#
# Modified by Eric Wing.
# Added code to assist with automated building by using environmental variables
# and providing a more controlled/consistent search behavior.
# Added new modifications to recognize OS X frameworks and
# additional Unix paths (FreeBSD, etc).
# Also corrected the header search path to follow "proper" SDL2 guidelines.
# Added a search for SDL2main which is needed by some platforms.
# Added a search for threads which is needed by some platforms.
# Added needed compile switches for MinGW.
#
# On OSX, this will prefer the Framework version (if found) over others.
# People will have to manually change the cache values of
# SDL2_LIBRARY to override this selection or set the CMake environment
# CMAKE_INCLUDE_PATH to modify the search paths.
#
# Note that the header path has changed from SDL2/SDL.h to just SDL.h
# This needed to change because "proper" SDL2 convention
# is #include "SDL.h", not <SDL2/SDL.h>. This is done for portability
# reasons because not all systems place things in SDL2/ (see FreeBSD).
#
# Ported by Johnny Patterson. This is a literal port for SDL2 of the FindSDL.cmake
# module with the minor edit of changing "SDL" to "SDL2" where necessary. This
# was not created for redistribution, and exists temporarily pending official
# SDL2 CMake modules.
#=============================================================================
# Copyright 2003-2009 Kitware, Inc.
#
# Distributed under the OSI-approved BSD License (the "License");
# see accompanying file Copyright.txt for details.
#
# This software is distributed WITHOUT ANY WARRANTY; without even the
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
# See the License for more information.
#=============================================================================
# (To distribute this file outside of CMake, substitute the full
# License text for the above reference.)
FIND_PATH(SDL2_INCLUDE_DIR SDL.h
HINTS
$ENV{SDL2DIR}
PATH_SUFFIXES include/SDL2 include
PATHS
~/Library/Frameworks
/Library/Frameworks
/usr/local/include/SDL2
/usr/include/SDL2
/sw # Fink
/opt/local # DarwinPorts
/opt/csw # Blastwave
/opt
)
#MESSAGE("SDL2_INCLUDE_DIR is ${SDL2_INCLUDE_DIR}")
FIND_LIBRARY(SDL2_LIBRARY_TEMP
NAMES SDL2
HINTS
$ENV{SDL2DIR}
PATH_SUFFIXES lib64 lib
PATHS
/sw
/opt/local
/opt/csw
/opt
)
#MESSAGE("SDL2_LIBRARY_TEMP is ${SDL2_LIBRARY_TEMP}")
IF(NOT SDL2_BUILDING_LIBRARY)
IF(NOT ${SDL2_INCLUDE_DIR} MATCHES ".framework")
# Non-OS X framework versions expect you to also dynamically link to
# SDL2main. This is mainly for Windows and OS X. Other (Unix) platforms
# seem to provide SDL2main for compatibility even though they don't
# necessarily need it.
FIND_LIBRARY(SDL2MAIN_LIBRARY
NAMES SDL2main
HINTS
$ENV{SDL2DIR}
PATH_SUFFIXES lib64 lib
PATHS
/sw
/opt/local
/opt/csw
/opt
)
ENDIF()
ENDIF()
# SDL2 may require threads on your system.
# The Apple build may not need an explicit flag because one of the
# frameworks may already provide it.
# But for non-OSX systems, I will use the CMake Threads package.
IF(NOT APPLE)
FIND_PACKAGE(Threads)
ENDIF()
# MinGW needs an additional library, mwindows
# It's total link flags should look like -lmingw32 -lSDL2main -lSDL2 -lmwindows
# (Actually on second look, I think it only needs one of the m* libraries.)
IF(MINGW)
SET(MINGW32_LIBRARY mingw32 CACHE STRING "mwindows for MinGW")
ENDIF()
SET(SDL2_FOUND "NO")
IF(SDL2_LIBRARY_TEMP)
# For SDL2main
IF(NOT SDL2_BUILDING_LIBRARY)
IF(SDL2MAIN_LIBRARY)
SET(SDL2_LIBRARY_TEMP ${SDL2MAIN_LIBRARY} ${SDL2_LIBRARY_TEMP})
ENDIF()
ENDIF()
# For OS X, SDL2 uses Cocoa as a backend so it must link to Cocoa.
# CMake doesn't display the -framework Cocoa string in the UI even
# though it actually is there if I modify a pre-used variable.
# I think it has something to do with the CACHE STRING.
# So I use a temporary variable until the end so I can set the
# "real" variable in one-shot.
IF(APPLE)
SET(SDL2_LIBRARY_TEMP ${SDL2_LIBRARY_TEMP} "-framework Cocoa")
ENDIF()
# For threads, as mentioned Apple doesn't need this.
# In fact, there seems to be a problem if I used the Threads package
# and try using this line, so I'm just skipping it entirely for OS X.
IF(NOT APPLE)
SET(SDL2_LIBRARY_TEMP ${SDL2_LIBRARY_TEMP} ${CMAKE_THREAD_LIBS_INIT})
ENDIF()
# For MinGW library
IF(MINGW)
SET(SDL2_LIBRARY_TEMP ${MINGW32_LIBRARY} ${SDL2_LIBRARY_TEMP})
ENDIF()
# Set the final string here so the GUI reflects the final state.
SET(SDL2_LIBRARY ${SDL2_LIBRARY_TEMP} CACHE STRING "Where the SDL2 Library can be found")
# Set the temp variable to INTERNAL so it is not seen in the CMake GUI
SET(SDL2_LIBRARY_TEMP "${SDL2_LIBRARY_TEMP}" CACHE INTERNAL "")
#MESSAGE("SDL2_LIBRARY is ${SDL2_LIBRARY}")
SET(SDL2_FOUND "YES")
ENDIF()
INCLUDE(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(SDL2
REQUIRED_VARS SDL2_LIBRARY SDL2_INCLUDE_DIR)

View File

@ -46,17 +46,12 @@ IF (XERCESC_INCLUDE AND XERCESC_LIBRARY)
#MESSAGE(STATUS "Found cached Xerces-C lib [${XERCESC_LIBRARY}]")
ENDIF (XERCESC_INCLUDE AND XERCESC_LIBRARY)
OPTION(WANT_STATIC_LIBS "builds as many static libs as possible" OFF)
IF(WANT_STATIC_LIBS)
OPTION(XERCESC_STATIC "Set to ON to link your project with static library (instead of DLL)." ON)
ENDIF()
IF (NOT ${XERCESC_WAS_STATIC} STREQUAL ${XERCESC_STATIC})
IF (NOT ${XERCESC_WAS_STATIC} STREQUAL ${STATIC_XercesC})
UNSET(XERCESC_LIBRARY CACHE)
UNSET(XERCESC_LIBRARY_DEBUG CACHE)
ENDIF (NOT ${XERCESC_WAS_STATIC} STREQUAL ${XERCESC_STATIC})
ENDIF (NOT ${XERCESC_WAS_STATIC} STREQUAL ${STATIC_XercesC})
SET(XERCESC_WAS_STATIC ${XERCESC_STATIC} CACHE INTERNAL "" )
SET(XERCESC_WAS_STATIC ${STATIC_XercesC} CACHE INTERNAL "" )
IF (XERCESC_INCLUDE_DIR)
SET(XERCESC_INCLUDE ${XERCESC_INCLUDE_DIR})
@ -74,7 +69,7 @@ ENDIF()
#MESSAGE(STATUS "Current Xerces-C lib [${XERCESC_LIBRARY}] XERCESC_INCLUDE [${XERCESC_INCLUDE}")
IF (XERCESC_STATIC AND NOT XERCESC_LIBRARY)
IF (STATIC_XercesC AND NOT XERCESC_LIBRARY)
MESSAGE(STATUS "Looking for static Xerces-C lib...")
FIND_LIBRARY(XERCESC_LIBRARY NAMES xerces-c_static_3 libxerces-c.a libxerces-c_3.a libxerces-c2_8_0.a libxerces-c_2.a libXerces.a
PATHS

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,80 @@
#
# Required Versions And Static Config
#
# Things related with "Static build" and optional versioning.
#
# By assumption in general all should be done in the way that the default dynamic
# compilation should work even without this file.
#
IF(WANT_STATIC_LIBS)
IF(BUILD_MEGAGLEST_MODEL_VIEWER OR BUILD_MEGAGLEST_MAP_EDITOR OR BUILD_MEGAGLEST)
# shared lib
FOREACH(STATIC_LIB
OpenSSL
CURL
XercesC
LUA
JPEG
PNG
FontConfig
FTGL
GLEW
FriBiDi
Miniupnpc
Ircclient)
LIST(APPEND LIST_OF_STATIC_LIBS_MG "${STATIC_LIB}")
ENDFOREACH()
ENDIF()
IF(BUILD_MEGAGLEST)
# only libs not used by shared lib
FOREACH(STATIC_LIB
OGG)
LIST(APPEND LIST_OF_STATIC_LIBS_MG "${STATIC_LIB}")
ENDFOREACH()
ENDIF()
FOREACH(STATIC_LIB ${LIST_OF_STATIC_LIBS_MG})
IF(DEFINED WANT_USE_${STATIC_LIB} AND NOT WANT_USE_${STATIC_LIB})
IF(DEFINED STATIC_${STATIC_LIB})
UNSET(STATIC_${STATIC_LIB} CACHE)
ENDIF()
ELSE()
OPTION("STATIC_${STATIC_LIB}" "Set to ON to link your project with static library (instead of DLL)." ON)
ENDIF()
ENDFOREACH()
ENDIF()
IF(STATIC_OpenSSL)
SET(OPENSSL_USE_STATIC_LIBS ON)
ENDIF()
IF(STATIC_CURL AND UNIX)
ADD_DEFINITIONS("-DCURL_STATICLIB")
ENDIF()
SET(CURL_MIN_VERSION_MG "7.16.4")
IF(NOT DEFINED FORCE_LUA_VERSION)
SET(FORCE_LUA_VERSION "OFF" CACHE STRING "Try to force some specific lua version (for example older). On the list may be also not existing versions yet for future use." FORCE)
ENDIF()
SET_PROPERTY(CACHE FORCE_LUA_VERSION PROPERTY STRINGS OFF 5.5 5.4 5.3 5.2 5.1 5.0)
SET(ALL_LUA_VERSIONS_IN_ORDER 5.3 5.2 5.1 5.4 5.5 5.0)
IF(STATIC_JPEG)
SET(JPEG_NAMES jpeg.a libjpeg.a ${JPEG_NAMES})
ENDIF()
IF(STATIC_PNG)
list(APPEND PNG_NAMES png.a libpng.a)
set(_PNG_VERSION_SUFFIXES 17 16 15 14 12 18 19 20 21 22)
foreach(v IN LISTS _PNG_VERSION_SUFFIXES)
list(APPEND PNG_NAMES png${v}.a libpng${v}.a)
list(APPEND PNG_NAMES_DEBUG png${v}d.a libpng${v}d.a)
endforeach()
unset(_PNG_VERSION_SUFFIXES)
ENDIF()
IF(STATIC_wxWidgets)
SET(wxWidgets_USE_STATIC ON)
ENDIF()
SET(VLC_MIN_VERSION_MG "1.1.0")

View File

@ -1,85 +0,0 @@
#!/bin/bash
# Run this script from its own folder on a Fedora based system.
# This script will install everything needed and copy the source and data archives
# then build RPM's and copy them to a destination. See the section below and
# change the variables as required (I build from my local system). Commented out
# below for example are wget calls to get source and data from the official
# sourceforge links
# Originally written by Mark Vejvoda <mark_vejvoda@hotmail.com>
# Copyright (c) 2012 Mark Vejvoda under GNU GPL v3.0
#
# Start changes here
#
SOURCE_PACKAGE_VER=3.7.0.1
DATA_PACKAGE_VER=$SOURCE_PACKAGE_VER
SOURCE_PACKAGE_RPM_VER=3.7.0
DATA_PACKAGE_RPM_VER=$SOURCE_PACKAGE_RPM_VER
SOURCE_COPY_CMD="cp /media/dlinknas/games/MegaGlest/megaglest-source-$SOURCE_PACKAGE_VER.tar.xz ./"
DATA_COPY_CMD="cp /media/dlinknas/games/MegaGlest/megaglest-data-$DATA_PACKAGE_VER.tar.xz ./"
#SOURCE_COPY_CMD="wget http://sourceforge.net/projects/megaglest/files/megaglest_$SOURCE_PACKAGE_RPM_VER/megaglest-source-$SOURCE_PACKAGE_VER.tar.xz/download -O megaglest-source-$SOURCE_PACKAGE_VER.tar.xz"
#DATA_COPY_CMD="wget http://sourceforge.net/projects/megaglest/files/megaglest_$DATA_PACKAGE_RPM_VER/megaglest-data-$DATA_PACKAGE_VER.tar.xz/download -O megaglest-data-$DATA_PACKAGE_VER.tar.xz"
SOURCE_PUBLISH_CMD="cp RPMS/x86_64/*.rpm /media/dlinknas/games/MegaGlest/"
DATA_PUBLISH_CMD="cp RPMS/noarch/*.rpm /media/dlinknas/games/MegaGlest/; cp RPMS/x86/*.rpm /media/dlinknas/games/MegaGlest/; cp RPMS/x86_64/*.rpm /media/dlinknas/games/MegaGlest/"
#
# End changes here
#
#remove old archives
[[ -f "megaglest-source-$SOURCE_PACKAGE_VER.tar.xz" ]] && rm "megaglest-source-$SOURCE_PACKAGE_VER.tar.xz"
[[ -f "megaglest-source-$SOURCE_PACKAGE_RPM_VER.tar.bz2" ]] && rm "megaglest-source-$SOURCE_PACKAGE_RPM_VER.tar.bz2"
[[ -f "megaglest-data-$DATA_PACKAGE_VER.tar.xz" ]] && rm "megaglest-data-$DATA_PACKAGE_VER.tar.xz"
[[ -f "megaglest-data-$DATA_PACKAGE_RPM_VER.tar.bz2" ]] && rm "megaglest-data-$DATA_PACKAGE_RPM_VER.tar.bz2"
# Get the source and data archives
echo "copying source archive [$SOURCE_COPY_CMD]"
$SOURCE_COPY_CMD
echo "setting up source archive..."
tar Jxf megaglest-source-$SOURCE_PACKAGE_VER.tar.xz >/dev/null 2>&1
tar -cvjf megaglest-source-$SOURCE_PACKAGE_RPM_VER.tar.bz2 megaglest-$SOURCE_PACKAGE_RPM_VER/ >/dev/null 2>&1
rm -rf megaglest-$SOURCE_PACKAGE_RPM_VER/
rm megaglest-source-$SOURCE_PACKAGE_VER.tar.xz
echo "copying data archive [$DATA_COPY_CMD]"
$DATA_COPY_CMD
echo "setting up data archive..."
tar Jxf megaglest-data-$DATA_PACKAGE_VER.tar.xz >/dev/null 2>&1
cd megaglest-$DATA_PACKAGE_RPM_VER/
tar -cvjf megaglest-data-$DATA_PACKAGE_RPM_VER.tar.bz2 * >/dev/null 2>&1
cd ../
mv megaglest-$DATA_PACKAGE_RPM_VER/megaglest-data-$DATA_PACKAGE_RPM_VER.tar.bz2 ./
rm -rf megaglest-$DATA_PACKAGE_RPM_VER/
rm megaglest-data-$DATA_PACKAGE_VER.tar.xz
# Install fedora dev and package tools
echo "installing fedora build tools..."
sudo yum install @development-tools
sudo yum install fedora-packager
# Install dependencies for Megaglest
echo "installing MegaGlest dependencies..."
sudo yum install cmake libX11-devel SDL-devel openal-soft-devel xerces-c-devel freeglut-devel krb5-devel libdrm-devel libidn-devel libjpeg-devel libpng-devel libssh2-devel openldap-devel libxml2-devel subversion mesa-libGL-devel mesa-libGLU-devel openal-soft-devel SDL-devel libcurl-devel c-ares-devel wxGTK-devel glew-devel libogg-devel libvorbis-devel lua-devel wxGTK-devel openssl-devel wxBase desktop-file-utils recode gcc gcc-c++ ftgl-devel ftgl autogen autogen-libopts
# create an rpm user
echo "creating rpm user (please enter the password: makerpm)"
sudo /usr/sbin/useradd makerpm
echo makerpm | sudo /usr/bin/passwd makerpm --stdin
echo "copying rpm config files..."
sudo cp megaglest-rpm-meta.tar.bz2 /home/makerpm
sudo cp megaglest-source-$SOURCE_PACKAGE_RPM_VER.tar.bz2 /home/makerpm/rpmbuild/SOURCES/
sudo cp megaglest-data-$DATA_PACKAGE_RPM_VER.tar.bz2 /home/makerpm/rpmbuild/SOURCES/
# now build the binary and data rpms
echo "building rpms..."
su - makerpm -c "rpmdev-setuptree; cd rpmbuild/; tar xvf ../megaglest-rpm-meta.tar.bz2; cd SPECS/; rpmbuild -ba megaglest.spec; cd ../; cp RPMS/x86/*.rpm /media/dlinknas/games/MegaGlest/; $SOURCE_PUBLISH_CMD; mv SOURCES/megaglest-data-$SOURCE_PACKAGE_RPM_VER.tar.bz2 ./; rm -f SOURCES/*; mv megaglest-data-$SOURCE_PACKAGE_RPM_VER.tar.bz2 SOURCES/; rm -f SPECS/*; mv megaglest-data.spec SPECS/; cd SPECS/; rpmbuild -ba megaglest-data.spec; cd ../; $DATA_PUBLISH_CMD; rm -f SOURCES/*; rm -f SPECS/*;"
echo "DONE building rpms"

View File

@ -1,34 +0,0 @@
Save/Load game feature
----------------------
F4 - Save game
F3 - Load game
Configuration of MegaGlest
----------------------
For detailed configuration of megaglest please edit
$HOME/.megaglest/glest.ini.
Have a lot of fun!
Warning
-------
Glest is known to work only with OpenGL drivers by ATI
("fglrx") or NVIDIA. If your graphics board is based on
an ATI or NVIDIA chip, please install one of these OpenGL
drivers first. Please be aware that not all ATI chips are
supported by the ATI ("fglrx") driver. Among these are
Mach64, Rage128 and Radeon 7x00 (7000,7200,7500) chips.
ATI ("fglrx") OpenGL driver
---------------------------
http://www.suse.de/~sndirsch/ati-installer-HOWTO.html
NVIDIA OpenGL driver
--------------------
http://www.suse.de/~sndirsch/nvidia-installer-HOWTO.html

View File

@ -1,25 +0,0 @@
/* XPM */
static const char *brush_gradient_0[] = {
/* columns rows colors chars-per-pixel */
"16 16 3 1",
" c #000000",
". c #FF0000",
"X c None",
/* pixels */
"XXXXXXXXXXXXXXXX",
"XXXXXXXXXXX X",
"XXXXXXXXXXX XX X",
"XXXXXXXXXXX XX X",
"XXXXXXXXXXX XX X",
"XXXXXXXXXXX X",
"XXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXX",
" ",
"................",
"................",
"................",
"................",
"................",
"................"
};

View File

@ -1,25 +0,0 @@
/* XPM */
static const char *brush_gradient_n1[] = {
/* columns rows colors chars-per-pixel */
"16 16 3 1",
" c #000000",
". c #FF0000",
"X c None",
/* pixels */
"XXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXX XX",
"XXXXXXXXXXXXX XX",
"XXXXXXXXX X XX",
"XXXXXXXXXXXXX XX",
"XXXXXXXXXXXXX XX",
"XXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXX",
" XXXXXXX ",
"... ......",
"................",
"................",
"................",
"................",
"................"
};

View File

@ -1,25 +0,0 @@
/* XPM */
static const char *brush_gradient_n2[] = {
/* columns rows colors chars-per-pixel */
"16 16 3 1",
" c #000000",
". c #FF0000",
"X c None",
/* pixels */
"XXXXXXXXXXXXXXXX",
"XXXXXXXXXXX X",
"XXXXXXXXXXXXXX X",
"XXXXXXX X X",
"XXXXXXXXXXX XXXX",
"XXXXXXXXXXX X",
"XXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXX",
" XXXXXXXXX ",
".. XXXXXXX .....",
"... ......",
"................",
"................",
"................",
"................"
};

View File

@ -1,25 +0,0 @@
/* XPM */
static const char *brush_gradient_n3[] = {
/* columns rows colors chars-per-pixel */
"16 16 3 1",
" c #000000",
". c #FF0000",
"X c None",
/* pixels */
"XXXXXXXXXXXXXXXX",
"XXXXXXXXXXX X",
"XXXXXXXXXXXXXX X",
"XXXXXXX X X",
"XXXXXXXXXXXXXX X",
"XXXXXXXXXXX X",
"XXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXX",
" XXXXXXXXX ",
".. XXXXXXX .....",
"... XXXXX ......",
".... .......",
"................",
"................",
"................"
};

View File

@ -1,25 +0,0 @@
/* XPM */
static const char *brush_gradient_n4[] = {
/* columns rows colors chars-per-pixel */
"16 16 3 1",
" c #000000",
". c #FF0000",
"X c None",
/* pixels */
"XXXXXXXXXXXXXXXX",
"XXXXXXXXXXX XX X",
"XXXXXXXXXXX XX X",
"XXXXXXX X X",
"XXXXXXXXXXXXXX X",
"XXXXXXXXXXXXXX X",
"XXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXX",
" XXXXXXXXXXX ",
". XXXXXXXXX ....",
".. XXXXXXX .....",
"... XXXXX ......",
".... .......",
"................",
"................"
};

View File

@ -1,25 +0,0 @@
/* XPM */
static const char *brush_gradient_n5[] = {
/* columns rows colors chars-per-pixel */
"16 16 3 1",
" c #000000",
". c #FF0000",
"X c None",
/* pixels */
"XXXXXXXXXXXXXXXX",
"XXXXXXXXXXX X",
"XXXXXXXXXXX XXXX",
"XXXXXXX X X",
"XXXXXXXXXXXXXX X",
"XXXXXXXXXXX X",
"XXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXX",
" XXXXXXXXXXX ",
". XXXXXXXXX ....",
".. XXXXXXX .....",
"... XXXXX ......",
".... XXX .......",
"..... ........",
"................"
};

View File

@ -1,25 +0,0 @@
/* XPM */
static const char *brush_gradient_p1[] = {
/* columns rows colors chars-per-pixel */
"16 16 3 1",
" c #000000",
". c #FF0000",
"X c None",
/* pixels */
"XXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXX XX",
"XXXXXXXXXXXXX XX",
"XXXXXXXXXXXXX XX",
"XXXXXXXXXXXXX XX",
"XXXXXXXXXXXXX XX",
"XXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXX",
"XXX XXXXXX",
" ....... ",
"................",
"................",
"................",
"................",
"................",
"................"
};

View File

@ -1,25 +0,0 @@
/* XPM */
static const char *brush_gradient_p2[] = {
/* columns rows colors chars-per-pixel */
"16 16 3 1",
" c #000000",
". c #FF0000",
"X c None",
/* pixels */
"XXXXXXXXXXXXXXXX",
"XXXXXXXXXXX X",
"XXXXXXXXXXXXXX X",
"XXXXXXXXXXX X",
"XXXXXXXXXXX XXXX",
"XXXXXXXXXXX X",
"XXXXXXXXXXXXXXXX",
"XXX XXXXXX",
"XX ....... XXXXX",
" ......... ",
"................",
"................",
"................",
"................",
"................",
"................"
};

View File

@ -1,25 +0,0 @@
/* XPM */
static const char *brush_gradient_p3[] = {
/* columns rows colors chars-per-pixel */
"16 16 3 1",
" c #000000",
". c #FF0000",
"X c None",
/* pixels */
"XXXXXXXXXXXXXXXX",
"XXXXXXXXXXX X",
"XXXXXXXXXXXXXX X",
"XXXXXXXXXXX X",
"XXXXXXXXXXXXXX X",
"XXXXXXXXXXX X",
"XXXX XXXXXXX",
"XXX ..... XXXXXX",
"XX ....... XXXXX",
" ......... ",
"................",
"................",
"................",
"................",
"................",
"................"
};

View File

@ -1,25 +0,0 @@
/* XPM */
static const char *brush_gradient_p4[] = {
/* columns rows colors chars-per-pixel */
"16 16 3 1",
" c #000000",
". c #FF0000",
"X c None",
/* pixels */
"XXXXXXXXXXXXXXXX",
"XXXXXXXXXXX XX X",
"XXXXXXXXXXX XX X",
"XXXXXXXXXXX X",
"XXXXXXXXXXXXXX X",
"XXXX XXXXX X",
"XXX ..... XXXXXX",
"XX ....... XXXXX",
"X ......... XXXX",
" ........... ",
"................",
"................",
"................",
"................",
"................",
"................"
};

View File

@ -1,25 +0,0 @@
/* XPM */
static const char *brush_gradient_p5[] = {
/* columns rows colors chars-per-pixel */
"16 16 3 1",
" c #000000",
". c #FF0000",
"X c None",
/* pixels */
"XXXXXXXXXXXXXXXX",
"XXXXXXXXXXX X",
"XXXXXXXXXXX XXXX",
"XXXXXXXXXXX X",
"XXXXX XXXXXX X",
"XXXX ... XX X",
"XXX ..... XXXXXX",
"XX ....... XXXXX",
"X ......... XXXX",
" ........... ",
"................",
"................",
"................",
"................",
"................",
"................"
};

View File

@ -1,25 +0,0 @@
/* XPM */
static const char *brush_height_0[] = {
/* columns rows colors chars-per-pixel */
"16 16 3 1",
" c #000000",
". c #0000FF",
"X c None",
/* pixels */
"XXXXXXXXXXXXXXXX",
"XXXXXXXXXXX X",
"XXXXXXXXXXX XX X",
"XXXXXXXXXXX XX X",
"XXXXXXXXXXX XX X",
"XXXXXXXXXXX X",
"XXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXX",
" ",
"................",
"................",
"................",
"................",
"................",
"................"
};

View File

@ -1,25 +0,0 @@
/* XPM */
static const char *brush_height_n1[] = {
/* columns rows colors chars-per-pixel */
"16 16 3 1",
" c #000000",
". c #0000FF",
"X c None",
/* pixels */
"XXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXX XX",
"XXXXXXXXXXXXX XX",
"XXXXXXXXX X XX",
"XXXXXXXXXXXXX XX",
"XXXXXXXXXXXXX XX",
"XXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXX",
" XXXXXXX ",
"... ......",
"................",
"................",
"................",
"................",
"................"
};

View File

@ -1,25 +0,0 @@
/* XPM */
static const char *brush_height_n2[] = {
/* columns rows colors chars-per-pixel */
"16 16 3 1",
" c #000000",
". c #0000FF",
"X c None",
/* pixels */
"XXXXXXXXXXXXXXXX",
"XXXXXXXXXXX X",
"XXXXXXXXXXXXXX X",
"XXXXXXX X X",
"XXXXXXXXXXX XXXX",
"XXXXXXXXXXX X",
"XXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXX",
" XXXXXXX ",
"...XXXXXXX......",
"... ......",
"................",
"................",
"................",
"................"
};

View File

@ -1,25 +0,0 @@
/* XPM */
static const char *brush_height_n3[] = {
/* columns rows colors chars-per-pixel */
"16 16 3 1",
" c #000000",
". c #0000FF",
"X c None",
/* pixels */
"XXXXXXXXXXXXXXXX",
"XXXXXXXXXXX X",
"XXXXXXXXXXXXXX X",
"XXXXXXX X X",
"XXXXXXXXXXXXXX X",
"XXXXXXXXXXX X",
"XXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXX",
" XXXXXXX ",
"...XXXXXXX......",
"...XXXXXXX......",
"... ......",
"................",
"................",
"................"
};

View File

@ -1,25 +0,0 @@
/* XPM */
static const char *brush_height_n4[] = {
/* columns rows colors chars-per-pixel */
"16 16 3 1",
" c #000000",
". c #0000FF",
"X c None",
/* pixels */
"XXXXXXXXXXXXXXXX",
"XXXXXXXXXXX XX X",
"XXXXXXXXXXX XX X",
"XXXXXXX X X",
"XXXXXXXXXXXXXX X",
"XXXXXXXXXXXXXX X",
"XXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXX",
" XXXXXXX ",
"...XXXXXXX......",
"...XXXXXXX......",
"...XXXXXXX......",
"... ......",
"................",
"................"
};

View File

@ -1,25 +0,0 @@
/* XPM */
static const char *brush_height_n5[] = {
/* columns rows colors chars-per-pixel */
"16 16 3 1",
" c #000000",
". c #0000FF",
"X c None",
/* pixels */
"XXXXXXXXXXXXXXXX",
"XXXXXXXXXXX X",
"XXXXXXXXXXX XXXX",
"XXXXXXX X X",
"XXXXXXXXXXXXXX X",
"XXXXXXXXXXX X",
"XXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXX",
" XXXXXXX ",
"...XXXXXXX......",
"...XXXXXXX......",
"...XXXXXXX......",
"...XXXXXXX......",
"... ......",
"................"
};

View File

@ -1,25 +0,0 @@
/* XPM */
static const char *brush_height_p1[] = {
/* columns rows colors chars-per-pixel */
"16 16 3 1",
" c #000000",
". c #0000FF",
"X c None",
/* pixels */
"XXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXX XX",
"XXXXXXXXXXXXX XX",
"XXXXXXXXXXXXX XX",
"XXXXXXXXXXXXX XX",
"XXXXXXXXXXXXX XX",
"XXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXX",
"XXX XXXXXX",
" ....... ",
"................",
"................",
"................",
"................",
"................",
"................"
};

View File

@ -1,25 +0,0 @@
/* XPM */
static const char *brush_height_p2[] = {
/* columns rows colors chars-per-pixel */
"16 16 3 1",
" c #000000",
". c #0000FF",
"X c None",
/* pixels */
"XXXXXXXXXXXXXXXX",
"XXXXXXXXXXX X",
"XXXXXXXXXXXXXX X",
"XXXXXXXXXXX X",
"XXXXXXXXXXX XXXX",
"XXXXXXXXXXX X",
"XXXXXXXXXXXXXXXX",
"XXX XXXXXX",
"XXX.......XXXXXX",
" ....... ",
"................",
"................",
"................",
"................",
"................",
"................"
};

View File

@ -1,25 +0,0 @@
/* XPM */
static const char *brush_height_p3[] = {
/* columns rows colors chars-per-pixel */
"16 16 3 1",
" c #000000",
". c #0000FF",
"X c None",
/* pixels */
"XXXXXXXXXXXXXXXX",
"XXXXXXXXXXX X",
"XXXXXXXXXXXXXX X",
"XXXXXXXXXXX X",
"XXXXXXXXXXXXXX X",
"XXXXXXXXXXX X",
"XXX XXXXXX",
"XXX.......XXXXXX",
"XXX.......XXXXXX",
" ....... ",
"................",
"................",
"................",
"................",
"................",
"................"
};

View File

@ -1,25 +0,0 @@
/* XPM */
static const char *brush_height_p4[] = {
/* columns rows colors chars-per-pixel */
"16 16 3 1",
" c #000000",
". c #0000FF",
"X c None",
/* pixels */
"XXXXXXXXXXXXXXXX",
"XXXXXXXXXXX XX X",
"XXXXXXXXXXX XX X",
"XXXXXXXXXXX X",
"XXXXXXXXXXXXXX X",
"XXX XXXX X",
"XXX.......XXXXXX",
"XXX.......XXXXXX",
"XXX.......XXXXXX",
" ....... ",
"................",
"................",
"................",
"................",
"................",
"................"
};

View File

@ -1,25 +0,0 @@
/* XPM */
static const char *brush_height_p5[] = {
/* columns rows colors chars-per-pixel */
"16 16 3 1",
" c #000000",
". c #0000FF",
"X c None",
/* pixels */
"XXXXXXXXXXXXXXXX",
"XXXXXXXXXXX X",
"XXXXXXXXXXX XXXX",
"XXXXXXXXXXX X",
"XXX XXXX X",
"XXX.......X X",
"XXX.......XXXXXX",
"XXX.......XXXXXX",
"XXX.......XXXXXX",
" ....... ",
"................",
"................",
"................",
"................",
"................",
"................"
};

View File

@ -1,26 +0,0 @@
/* XPM */
static const char *brush_none[] = {
/* columns rows colors chars-per-pixel */
"16 16 4 1",
" c #FF0000",
". c #008000",
"X c #000080",
"o c None",
/* pixels */
"oo oooXXooo oo",
"oo oXXXXo oo",
"ooo XXXX ooo",
"oooo XX oooo",
"ooooo ooooo",
"oooooo oooooo",
"oooooo oooooo",
"ooooo ooooo",
"oooo XX oooo",
"ooo XXXX ooo",
"oo oXXXXo oo",
"oo ooXXXXoo oo",
"ooooo......ooooo",
"................",
"................",
"................"
};

View File

@ -1,27 +0,0 @@
/* XPM */
static const char *brush_object_bush[] = {
"20 20 4 1",
" c None",
". c #0000FF",
"+ c #008000",
"@ c #00FF00",
"....................",
"....................",
".. ..",
".. ..",
".. ..",
".. ..",
".. ..",
".. ..",
".. ..",
".. +@+ + ..",
".. +@+@+@@ ..",
".. @+@+@+@ ..",
".. +@ + + ++ ..",
".. @+@+@++ + ..",
".. +@+ +@@+ ..",
".. + +@++@ ..",
".. ++++++++++++++ ..",
".. ..",
"....................",
"...................."};

View File

@ -1,28 +0,0 @@
/* XPM */
static const char *brush_object_c1_bigtree[] = {
"20 20 5 1",
" c None",
". c #FFCC7F",
"+ c #808000",
"@ c #008000",
"# c #800000",
"....................",
"....................",
".. ++@+ ..",
".. @+++++@+ ..",
".. +++@+@+++@ ..",
".. +@++@++@++ ..",
".. ++++++++++@+ ..",
".. +@@+@++@@@+@ ..",
".. ++++@+++++ ..",
".. ++@+++@@+@ ..",
".. ++++@+++ ..",
".. @+++ ..",
".. #### ..",
".. #### ..",
".. #### ..",
".. #### ..",
".. ###### ..",
".. ######### ..",
"....................",
"...................."};

View File

@ -1,31 +0,0 @@
/* XPM */
static const char *brush_object_c2_hanged[] = {
"20 20 8 1",
" c None",
". c #00FFFF",
"+ c #800000",
"@ c #C0C0C0",
"# c #808080",
"$ c #FFFF00",
"% c #0000FF",
"& c #008000",
"....................",
"....................",
".. + ..",
".. +++++++++ ..",
".. @ + + + @ ..",
".. ## +++ @ ..",
".. @@@ + ### ..",
".. @#@#@ + # @ # ..",
".. @@#@@ + #+@ # ..",
".. $@@@$ + #+@+# ..",
".. %$% + #+@+# ..",
".. %$% + # @+# ..",
".. @@@ + ###+#+ ..",
".. @ @ + + + ..",
".. + ..",
".. + ..",
".. &+# ..",
"..&&&&&&&&&&&&&&&&..",
"....................",
"...................."};

View File

@ -1,29 +0,0 @@
/* XPM */
static const char *brush_object_c3_statue[] = {
"20 20 6 1",
" c None",
". c #B2194C",
"+ c #C0C0C0",
"@ c #808080",
"# c #808000",
"$ c #008000",
"....................",
"....................",
".. ..",
".. + ..",
".. +@@ ..",
".. +@ ..",
".. ###+@ ..",
".. #+#@+@ ..",
".. ###@ ..",
".. @@@ ..",
".. @@@ ..",
".. @ @ ..",
".. @ @ ..",
".. @ @ ..",
".. ++++++ ..",
".. @@@@ ..",
".. @@@@ ..",
"..$$$$$$$$$$$$$$$$..",
"....................",
"...................."};

View File

@ -1,28 +0,0 @@
/* XPM */
static const char *brush_object_c4_bigrock[] = {
"20 20 5 1",
" c None",
". c #7fff19",
"+ c #808080",
"@ c #C0C0C0",
"# c #008000",
"....................",
"....................",
".. ..",
".. ..",
".. ..",
".. +@ ..",
".. @+++ +@ ..",
".. +++@###++ ..",
".. +@+@###++ ..",
".. @++++@###+ ..",
".. ++@+@+###+@ ..",
".. ++##+++##++ ..",
".. +@##++++@++ ..",
".. @++##+@++@+@ ..",
".. ++++#++###++ ..",
".. +@++++++#### ..",
".. +++++###++++ ..",
"..################..",
"....................",
"...................."};

View File

@ -1,27 +0,0 @@
/* XPM */
static const char *brush_object_c5_blocking[] = {
"20 20 4 1",
" c None",
". c #FF33CC",
"+ c #C0C0C0",
"@ c #008000",
"....................",
"....................",
".. ..",
".. ++++++++++++ ..",
".. + + ..",
".. + + ..",
".. + + ..",
".. + + ..",
".. + + ..",
".. + + ..",
".. + + ..",
".. + + ..",
".. + + ..",
".. + + ..",
".. + + ..",
".. + + ..",
".. + + ..",
"..@@@@@@@@@@@@@@@@..",
"....................",
"...................."};

View File

@ -1,26 +0,0 @@
/* XPM */
static const char *brush_object_dead_tree[] = {
"20 20 3 1",
" c None",
". c #FFFFFF",
"+ c #800000",
"....................",
"....................",
".. ..",
".. + + ..",
".. + + + + ..",
".. + ++ ..",
".. ++++ + + + ..",
".. +++ ++ ..",
".. + ++ +++ ..",
".. + ++++ + ..",
".. +++ +++ ..",
".. +++++ ++ ..",
".. ++++++ ..",
".. ++++ ..",
".. ++++ ..",
".. ++++ ..",
".. ++++++ ..",
".. +++++++++ ..",
"....................",
"...................."};

View File

@ -1,28 +0,0 @@
/* XPM */
static const char *brush_object_stone[] = {
"20 20 5 1",
" c None",
". c #7F7FFF",
"+ c #808080",
"@ c #C0C0C0",
"# c #008000",
"....................",
"....................",
".. ..",
".. ..",
".. ..",
".. ..",
".. ..",
".. ..",
".. ..",
".. +@ ..",
".. +++@++ ..",
".. @++++@+@ ..",
".. +++++++++@ ..",
".. +++@+++++@@ ..",
".. ++++++@++@@ ..",
".. +@++++++++@ ..",
".. ############## ..",
".. ..",
"....................",
"...................."};

View File

@ -1,28 +0,0 @@
/* XPM */
static const char * brush_object_tree[] = {
"20 20 5 1",
" c None",
". c #FF0000",
"+ c #008000",
"@ c #00FF00",
"# c #800000",
"....................",
"....................",
".. ++ ..",
".. ++++++ ..",
".. ++++@+++ ..",
".. ++++++++ ..",
".. +@++@@++@+ ..",
".. ++++++@+++ ..",
".. +++@++++ ..",
".. ++++++++ ..",
".. ++++++ ..",
".. #++# ..",
".. #### ..",
".. #### ..",
".. #### ..",
".. #### ..",
".. ###### ..",
".. ######### ..",
"....................",
"...................."};

View File

@ -1,28 +0,0 @@
/* XPM */
static const char *brush_object_water_object[] = {
"20 20 5 1",
" c None",
". c #7F7F7F",
"+ c #008000",
"@ c #00FFFF",
"# c #0000FF",
"....................",
"....................",
".. ..",
".. ..",
".. ..",
".. ..",
".. ..",
".. ..",
".. + ..",
".. + + ..",
".. + + + + ..",
".. + ++ + ..",
".. + + + ..",
".. + ++ ..",
"..@@@@@@@++@@@@@@@..",
"..@#@@@#@@@#@@@#@@..",
"..#@#@#@#@#@#@#@#@..",
"..################..",
"....................",
"...................."};

View File

@ -1,26 +0,0 @@
/* XPM */
static const char *brush_players_blue[] = {
/* columns rows colors chars-per-pixel */
"16 16 4 1",
" c #000000",
". c #000080",
"X c #0000FF",
"o c None",
/* pixels */
"oo oo",
"oo .......... oo",
"oo XXXXXXXXXX oo",
"oo XX.XXXX.XX oo",
"oo X...XX...X oo",
"oo XX.XXXX.XX oo",
"oo XXXXXXXXXX oo",
"oo XXXXXXXXXX oo",
"oo X........X oo",
"oo XXXXXXXXXX oo",
"oo XXXXXXXXXX oo",
"oo XXXX..XXXX oo",
"ooo XX....XX ooo",
"ooo X......X ooo",
"oooo .... oooo",
"oooooo oooooo"
};

View File

@ -1,26 +0,0 @@
/* XPM */
static const char *brush_players_cyan[] = {
/* columns rows colors chars-per-pixel */
"16 16 4 1",
" c #000000",
". c #008080",
"X c #00FFFF",
"o c None",
/* pixels */
"oo oo",
"oo .......... oo",
"oo ....XX.... oo",
"oo ...XXXX... oo",
"oo ...XXXX... oo",
"oo ....XX.... oo",
"oo .......... oo",
"oo .XX....XX. oo",
"oo ..XXXXXX.. oo",
"oo ...XXXX... oo",
"oo .......... oo",
"oo .......... oo",
"ooo ........ ooo",
"ooo ........ ooo",
"oooo .... oooo",
"oooooo oooooo"
};

View File

@ -1,26 +0,0 @@
/* XPM */
static const char *brush_players_green[] = {
/* columns rows colors chars-per-pixel */
"16 16 4 1",
" c #000000",
". c #008000",
"X c #00FF00",
"o c None",
/* pixels */
"oo oo",
"oo .X.X..X.X. oo",
"oo .X.X..X.X. oo",
"oo .X.X..X.X. oo",
"oo .X.X..X.X. oo",
"oo .X.X..X.X. oo",
"oo .X.X..X.X. oo",
"oo .X.X..X.X. oo",
"oo .X.X..X.X. oo",
"oo .......... oo",
"oo .XXX..XXX. oo",
"oo ...X..X... oo",
"ooo ..XXXX.. ooo",
"ooo ........ ooo",
"oooo .... oooo",
"oooooo oooooo"
};

View File

@ -1,26 +0,0 @@
/* XPM */
static const char *brush_players_orange[] = {
/* columns rows colors chars-per-pixel */
"16 16 4 1",
" c #000000",
". c #804000",
"X c #FF8000",
"o c None",
/* pixels */
"oo oo",
"oo XXXX.X.XXX oo",
"oo XXX.X.XXXX oo",
"oo XX.X.XXXXX oo",
"oo X.X.XXXXXX oo",
"oo .X.XXXXXXX oo",
"oo X.XXXXX..X oo",
"oo .XXXXX...X oo",
"oo XXXXX...XX oo",
"oo XXX....XXX oo",
"oo XXXX..XXXX oo",
"oo XXX.X.XXXX oo",
"ooo XXXXXXXX ooo",
"ooo XXXXXXXX ooo",
"oooo XXXX oooo",
"oooooo oooooo"
};

View File

@ -1,26 +0,0 @@
/* XPM */
static const char *brush_players_pink[] = {
/* columns rows colors chars-per-pixel */
"16 16 4 1",
" c #000000",
". c #800080",
"X c #FF00FF",
"o c None",
/* pixels */
"oo oo",
"oo ..X....X.. oo",
"oo X...XX...X oo",
"oo XX.XXXX.XX oo",
"oo X...XX...X oo",
"oo ..X....X.. oo",
"oo X...XX...X oo",
"oo XX.XXXX.XX oo",
"oo X...XX...X oo",
"oo ..X....X.. oo",
"oo X...XX...X oo",
"oo XX.XXXX.XX oo",
"ooo ...XX... ooo",
"ooo .X....X. ooo",
"oooo .XX. oooo",
"oooooo oooooo"
};

View File

@ -1,25 +0,0 @@
/* XPM */
static const char *brush_players_player[] = {
/* columns rows colors chars-per-pixel */
"16 16 3 1",
" c #FFFF00",
". c #008080",
"X c None",
/* pixels */
"XXXXX......XXXXX",
"XXX..........XXX",
"XX............XX",
"X..............X",
"X.... ....X",
"...... .. ....",
"...... .. ....",
"...... .. ....",
"...... .....",
"...... ........",
"...... ........",
"X..... .......X",
"X.... ......X",
"XX............XX",
"XXX..........XXX",
"XXXXX......XXXXX"
};

View File

@ -1,26 +0,0 @@
/* XPM */
static const char *brush_players_red[] = {
/* columns rows colors chars-per-pixel */
"16 16 4 1",
" c #000000",
". c #800000",
"X c #FF0000",
"o c None",
/* pixels */
"oo oo",
"oo .......... oo",
"oo .......... oo",
"oo .......... oo",
"oo XXXXXXXXXX oo",
"oo .......... oo",
"oo .......... oo",
"oo XXXXXXXXXX oo",
"oo XXXXXXXXXX oo",
"oo .......... oo",
"oo .......... oo",
"oo XXXXXXXXXX oo",
"ooo ........ ooo",
"ooo ........ ooo",
"oooo .... oooo",
"oooooo oooooo"
};

View File

@ -1,26 +0,0 @@
/* XPM */
static const char *brush_players_white[] = {
/* columns rows colors chars-per-pixel */
"16 16 4 1",
" c #000000",
". c #808080",
"X c #C0C0C0",
"o c None",
/* pixels */
"oo oo",
"oo XXXXXXXXXX oo",
"oo ....XX.... oo",
"oo X.X.XX.X.X oo",
"oo ....XX.... oo",
"oo XXXXXXXXXX oo",
"oo XX..XX..XX oo",
"oo XXXXXXXXXX oo",
"oo .......... oo",
"oo XXXXXXXXXX oo",
"oo .......... oo",
"oo XXXXXXXXXX oo",
"ooo XXXXXXXX ooo",
"ooo XXXXXXXX ooo",
"oooo XXXX oooo",
"oooooo oooooo"
};

View File

@ -1,26 +0,0 @@
/* XPM */
static const char *brush_players_yellow[] = {
/* columns rows colors chars-per-pixel */
"16 16 4 1",
" c #000000",
". c #808000",
"X c #FFFF00",
"o c None",
/* pixels */
"oo oo",
"oo .........X oo",
"oo .XXX....X. oo",
"oo .XXX...X.. oo",
"oo .XXX..X..X oo",
"oo .....X..X. oo",
"oo ....X..X.. oo",
"oo ...X..X..X oo",
"oo ..X..X..X. oo",
"oo .X..X..X.. oo",
"oo X..X..X... oo",
"oo ..X..X.... oo",
"ooo X..X.... ooo",
"ooo ..X..... ooo",
"oooo .... oooo",
"oooooo oooooo"
};

View File

@ -1,24 +0,0 @@
/* XPM */
static const char *brush_resource_1_gold[] = {
/* columns rows colors chars-per-pixel */
"16 16 2 1",
" c #dddd00",
". c None",
/* pixels */
"................",
". .......... .",
". ........ .",
".. ...... ..",
"... .... ...",
".... .. ....",
"..... .....",
"...... ......",
"...... ......",
"..... .....",
".... .. ....",
"... .... ...",
".. ...... ..",
". ........ .",
". .......... .",
"................"
};

View File

@ -1,24 +0,0 @@
/* XPM */
static const char *brush_resource_2_stone[] = {
/* columns rows colors chars-per-pixel */
"16 16 2 1",
" c #808080",
". c None",
/* pixels */
"................",
". .......... .",
". ........ .",
".. ...... ..",
"... .... ...",
".... .. ....",
"..... .....",
"...... ......",
"...... ......",
"..... .....",
".... .. ....",
"... .... ...",
".. ...... ..",
". ........ .",
". .......... .",
"................"
};

View File

@ -1,24 +0,0 @@
/* XPM */
static const char *brush_resource_3[] = {
/* columns rows colors chars-per-pixel */
"16 16 2 1",
" c #FF0000",
". c None",
/* pixels */
"................",
". .......... .",
". ........ .",
".. ...... ..",
"... .... ...",
".... .. ....",
"..... .....",
"...... ......",
"...... ......",
"..... .....",
".... .. ....",
"... .... ...",
".. ...... ..",
". ........ .",
". .......... .",
"................"
};

View File

@ -1,24 +0,0 @@
/* XPM */
static const char *brush_resource_4[] = {
/* columns rows colors chars-per-pixel */
"16 16 2 1",
" c #0000FF",
". c None",
/* pixels */
"................",
". .......... .",
". ........ .",
".. ...... ..",
"... .... ...",
".... .. ....",
"..... .....",
"...... ......",
"...... ......",
"..... .....",
".... .. ....",
"... .... ...",
".. ...... ..",
". ........ .",
". .......... .",
"................"
};

View File

@ -1,24 +0,0 @@
/* XPM */
static const char *brush_resource_5[] = {
/* columns rows colors chars-per-pixel */
"16 16 2 1",
" c #008080",
". c None",
/* pixels */
"................",
". .......... .",
". ........ .",
".. ...... ..",
"... .... ...",
".... .. ....",
"..... .....",
"...... ......",
"...... ......",
"..... .....",
".... .. ....",
"... .... ...",
".. ...... ..",
". ........ .",
". .......... .",
"................"
};

View File

@ -1,25 +0,0 @@
/* XPM */
static const char *brush_surface_custom[] = {
/* columns rows colors chars-per-pixel */
"16 16 3 1",
" c #000000",
". c #7c4645",
"X c None",
/* pixels */
"XXXXXXXXXXXXXXXX",
" ",
" .............. ",
" .............. ",
" .............. ",
" .............. ",
" .............. ",
" .............. ",
" .............. ",
" .............. ",
" .............. ",
" .............. ",
" .............. ",
" .............. ",
" ",
"XXXXXXXXXXXXXXXX"
};

View File

@ -1,25 +0,0 @@
/* XPM */
static const char *brush_surface_grass1[] = {
/* columns rows colors chars-per-pixel */
"16 16 3 1",
" c #000000",
". c #00a000",
"X c None",
/* pixels */
"XXXXXXXXXXXXXXXX",
" ",
" .............. ",
" .............. ",
" .............. ",
" .............. ",
" .............. ",
" .............. ",
" .............. ",
" .............. ",
" .............. ",
" .............. ",
" .............. ",
" .............. ",
" ",
"XXXXXXXXXXXXXXXX"
};

View File

@ -1,25 +0,0 @@
/* XPM */
static const char *brush_surface_grass2[] = {
/* columns rows colors chars-per-pixel */
"16 16 3 1",
" c #000000",
". c #536e0b",
"X c None",
/* pixels */
"XXXXXXXXXXXXXXXX",
" ",
" .............. ",
" .............. ",
" .............. ",
" .............. ",
" .............. ",
" .............. ",
" .............. ",
" .............. ",
" .............. ",
" .............. ",
" .............. ",
" .............. ",
" ",
"XXXXXXXXXXXXXXXX"
};

View File

@ -1,25 +0,0 @@
/* XPM */
static const char *brush_surface_road[] = {
/* columns rows colors chars-per-pixel */
"16 16 3 1",
" c #000000",
". c #800000",
"X c None",
/* pixels */
"XXXXXXXXXXXXXXXX",
" ",
" .............. ",
" .............. ",
" .............. ",
" .............. ",
" .............. ",
" .............. ",
" .............. ",
" .............. ",
" .............. ",
" .............. ",
" .............. ",
" .............. ",
" ",
"XXXXXXXXXXXXXXXX"
};

View File

@ -1,25 +0,0 @@
/* XPM */
static const char *brush_surface_stone[] = {
/* columns rows colors chars-per-pixel */
"16 16 3 1",
" c #000000",
". c #808080",
"X c None",
/* pixels */
"XXXXXXXXXXXXXXXX",
" ",
" .............. ",
" .............. ",
" .............. ",
" .............. ",
" .............. ",
" .............. ",
" .............. ",
" .............. ",
" .............. ",
" .............. ",
" .............. ",
" .............. ",
" ",
"XXXXXXXXXXXXXXXX"
};

View File

@ -1,24 +0,0 @@
/* XPM */
static const char *edit_randomize_heights[] = {
/* columns rows colors chars-per-pixel */
"16 16 2 1",
" c #008000",
". c None",
/* pixels */
"................",
"................",
"................",
"................",
"................",
"................",
"................",
"................",
"...... ..... .",
"... . .",
" ",
" ",
" ",
" ",
" ",
" "
};

View File

@ -1,25 +0,0 @@
/* XPM */
static const char *edit_randomize[] = {
/* columns rows colors chars-per-pixel */
"16 16 3 1",
" c #008000",
". c #00FF00",
"X c #00FFFF",
/* pixels */
" ",
" XX XX ",
" XX XX . ",
" XXXX ",
" XX ",
" XXXX .",
" XX XX .",
" XX XX ..",
" . ",
" .",
" . ",
" ... . ",
" . ",
" .",
" . .... ",
" ...... "
};

View File

@ -1,24 +0,0 @@
/* XPM */
static const char *edit_redo[] = {
/* columns rows colors chars-per-pixel */
"16 16 2 1",
" c #000000",
". c None",
/* pixels */
"................",
"........ .....",
"......... ....",
".......... ...",
"........... ..",
".... .",
"... .",
".. ...... ..",
". ...... ...",
". ...... ....",
". ..... .....",
". .............",
". .............",
".. .............",
"................",
"................"
};

View File

@ -1,24 +0,0 @@
/* XPM */
static const char *edit_switch_surfaces[] = {
/* columns rows colors chars-per-pixel */
"16 16 2 1",
" c #008000",
". c #00FF00",
/* pixels */
"........ ",
"........ ",
"........ ",
"........ ",
"........ ",
"..... .. . ",
".... .. .. ",
"... ..... ",
"... ..... ",
".... .. .. ",
"..... .. . ",
"........ ",
"........ ",
"........ ",
"........ ",
"........ "
};

View File

@ -1,24 +0,0 @@
/* XPM */
static const char *edit_undo[] = {
/* columns rows colors chars-per-pixel */
"16 16 2 1",
" c #000000",
". c None",
/* pixels */
"................",
"..... ........",
".... .........",
"... ..........",
".. ...........",
". ....",
". ...",
".. ...... ..",
"... ...... .",
".... ...... .",
"..... ..... .",
"............. .",
"............. .",
"............. ..",
"................",
"................"
};

View File

@ -1,25 +0,0 @@
/* XPM */
static const char *radius_1[] = {
/* columns rows colors chars-per-pixel */
"16 16 3 1",
" c #000000",
". c #C0C0C0",
"X c None",
/* pixels */
"XXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXX",
"XXXXXXX..XXXXXXX",
"XXXXXX. .XXXXXX",
"XXXXXX. .XXXXXX",
"XXXXXXX..XXXXXXX",
"XXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXX"
};

View File

@ -1,26 +0,0 @@
/* XPM */
static const char *radius_2[] = {
/* columns rows colors chars-per-pixel */
"16 16 4 1",
" c #000000",
". c #808080",
"X c #C0C0C0",
"o c None",
/* pixels */
"oooooooooooooooo",
"oooooooooooooooo",
"oooooooooooooooo",
"oooooooooooooooo",
"oooooooooooooooo",
"oooooooXXooooooo",
"oooooo. .oooooo",
"oooooX Xooooo",
"oooooX Xooooo",
"oooooo. .oooooo",
"oooooooXXooooooo",
"oooooooooooooooo",
"oooooooooooooooo",
"oooooooooooooooo",
"oooooooooooooooo",
"oooooooooooooooo"
};

View File

@ -1,25 +0,0 @@
/* XPM */
static const char *radius_3[] = {
/* columns rows colors chars-per-pixel */
"16 16 3 1",
" c #000000",
". c #808080",
"X c None",
/* pixels */
"XXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXX",
"XXXXXX. .XXXXXX",
"XXXXX. .XXXXX",
"XXXXX XXXXX",
"XXXXX XXXXX",
"XXXXX. .XXXXX",
"XXXXXX. .XXXXXX",
"XXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXX"
};

View File

@ -1,26 +0,0 @@
/* XPM */
static const char *radius_4[] = {
/* columns rows colors chars-per-pixel */
"16 16 4 1",
" c #000000",
". c #808080",
"X c #C0C0C0",
"o c None",
/* pixels */
"oooooooooooooooo",
"oooooooooooooooo",
"oooooooooooooooo",
"oooooooooooooooo",
"ooooooX..Xoooooo",
"ooooo. .ooooo",
"ooooX Xoooo",
"oooo. .oooo",
"oooo. .oooo",
"ooooX Xoooo",
"ooooo. .ooooo",
"ooooooX..Xoooooo",
"oooooooooooooooo",
"oooooooooooooooo",
"oooooooooooooooo",
"oooooooooooooooo"
};

View File

@ -1,26 +0,0 @@
/* XPM */
static const char *radius_5[] = {
/* columns rows colors chars-per-pixel */
"16 16 4 1",
" c #000000",
". c #808080",
"X c #C0C0C0",
"o c None",
/* pixels */
"oooooooooooooooo",
"oooooooooooooooo",
"oooooooooooooooo",
"oooooooXXooooooo",
"oooooX. .Xooooo",
"ooooX Xoooo",
"oooo. .oooo",
"oooX Xooo",
"oooX Xooo",
"oooo. .oooo",
"ooooX Xoooo",
"oooooX. .Xooooo",
"oooooooXXooooooo",
"oooooooooooooooo",
"oooooooooooooooo",
"oooooooooooooooo"
};

View File

@ -1,26 +0,0 @@
/* XPM */
static const char *radius_6[] = {
/* columns rows colors chars-per-pixel */
"16 16 4 1",
" c #000000",
". c #808080",
"X c #C0C0C0",
"o c None",
/* pixels */
"oooooooooooooooo",
"oooooooooooooooo",
"oooooooooooooooo",
"ooooooX..Xoooooo",
"ooooo. .ooooo",
"oooo. .oooo",
"oooX Xooo",
"ooo. .ooo",
"ooo. .ooo",
"oooX Xooo",
"oooo. .oooo",
"ooooo. .ooooo",
"ooooooX..Xoooooo",
"oooooooooooooooo",
"oooooooooooooooo",
"oooooooooooooooo"
};

View File

@ -1,26 +0,0 @@
/* XPM */
static const char *radius_7[] = {
/* columns rows colors chars-per-pixel */
"16 16 4 1",
" c #000000",
". c #808080",
"X c #C0C0C0",
"o c None",
/* pixels */
"oooooooooooooooo",
"oooooooooooooooo",
"oooooooXXooooooo",
"ooooo. .ooooo",
"oooo oooo",
"ooo. .ooo",
"ooo ooo",
"ooX Xoo",
"ooX Xoo",
"ooo ooo",
"ooo. .ooo",
"oooo oooo",
"ooooo. .ooooo",
"oooooooXXooooooo",
"oooooooooooooooo",
"oooooooooooooooo"
};

View File

@ -1,26 +0,0 @@
/* XPM */
static const char *radius_8[] = {
/* columns rows colors chars-per-pixel */
"16 16 4 1",
" c #000000",
". c #808080",
"X c #C0C0C0",
"o c None",
/* pixels */
"oooooooooooooooo",
"oooooooooooooooo",
"oooooo. .oooooo",
"ooooX Xoooo",
"oooX Xooo",
"ooo ooo",
"oo. .oo",
"oo oo",
"oo oo",
"oo. .oo",
"ooo ooo",
"oooX Xooo",
"ooooX Xoooo",
"oooooo. .oooooo",
"oooooooooooooooo",
"oooooooooooooooo"
};

Some files were not shown because too many files have changed in this diff Show More