Page MenuHomePhabricator (Chris)
Files F118850

No OneTemporary
Actions

Authored By
Unknown
Size
14 KB
Referenced Files
None
Subscribers
None

View Options

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f9fcced..d36a6c8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,140 +1,135 @@
-PROJECT(meandmyshadow)
-CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
+Project (meandmyshadow)
+CMake_Minimum_Required (VERSION 2.6)
+Set (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
#Option if the game should be compiled with hardware acceleration.
-option (HARDWARE_ACCELERATION "Use openGL as rendering backend" ON)
-option (DEBUG_MODE "Compile the game with debug mode enabled" OFF)
-
-#Find the required libraries.
-Find_Package(SDL REQUIRED)
-Find_Package(SDL_ttf REQUIRED)
-Find_Package(SDL_image REQUIRED)
-Find_Package(SDL_mixer REQUIRED)
-Find_Package(SDL_gfx REQUIRED)
-Find_Package(CURL REQUIRED)
-Find_Package(LibArchive REQUIRED)
-Find_Package(OpenSSL REQUIRED)
-Find_Package(Lua51 REQUIRED)
+Option (HARDWARE_ACCELERATION "Use openGL as rendering backend" ON)
+Option (DEBUG_MODE "Compile the game with debug mode enabled" OFF)
#Use openGL only when compiling with HARDWARE_ACCELERATION.
#Otherwise we try to find XLib.
-if(HARDWARE_ACCELERATION)
- Find_Package(OpenGL REQUIRED)
-else(HARDWARE_ACCELERATION)
- INCLUDE(FindX11)
-endif(HARDWARE_ACCELERATION)
-
-#Add the include dirs of the libraries.
-INCLUDE_DIRECTORIES(${SDL_INCLUDE_DIR})
-INCLUDE_DIRECTORIES(${SDLIMAGE_INCLUDE_DIR})
-INCLUDE_DIRECTORIES(${SDLMIXER_INCLUDE_DIR})
-INCLUDE_DIRECTORIES(${SDLTTF_INCLUDE_DIR})
-INCLUDE_DIRECTORIES(${SDLGFX_INCLUDE_DIR})
-INCLUDE_DIRECTORIES(${CURL_INCLUDE_DIR})
-INCLUDE_DIRECTORIES(${LibArchive_INCLUDE_DIR})
-INCLUDE_DIRECTORIES(${OPENSSL_INCLUDE_DIR})
-INCLUDE_DIRECTORIES(${LUA51_INCLUDE_DIR})
-#Use openGL only when compiling with HARDWARE_ACCELERATION.
-if(HARDWARE_ACCELERATION)
- INCLUDE_DIRECTORIES(${OPENGL_INCLUDE_DIR})
-endif(HARDWARE_ACCELERATION)
-
-if ( NOT SDL_FOUND )
- message(FATAL_ERROR "SDL not found !")
-endif ( NOT SDL_FOUND )
-
-if ( NOT SDLTTF_FOUND )
- message(FATAL_ERROR "SDL_ttf not found !")
-endif ( NOT SDLTTF_FOUND )
-
-if ( NOT SDLMIXER_FOUND )
- message(FATAL_ERROR "SDL_mixer not found !")
-endif ( NOT SDLMIXER_FOUND )
-
-if ( NOT SDLGFX_FOUND )
- message(FATAL_ERROR "SDL_gfx not found !")
-endif ( NOT SDLGFX_FOUND )
-
-if ( NOT CURL_FOUND )
- message(FATAL_ERROR "CURL not found !")
-endif ( NOT CURL_FOUND )
+if (HARDWARE_ACCELERATION)
+ Find_Package (OpenGL REQUIRED)
+else (HARDWARE_ACCELERATION)
+ INCLUDE (FindX11)
+endif (HARDWARE_ACCELERATION)
-if ( NOT LibArchive_FOUND )
- message(FATAL_ERROR "LIBARCHIVE not found !")
-endif ( NOT LibArchive_FOUND )
-
-if ( NOT OPENSSL_FOUND )
- message(FATAL_ERROR "OpenSSL not found !")
-endif ( NOT OPENSSL_FOUND )
-
-if ( NOT LUA51_FOUND )
- message(FATAL_ERROR "Lua not found !")
-endif ( NOT LUA51_FOUND )
-
-if ( HARDWARE_ACCELERATION AND NOT OPENGL_FOUND )
- message(FATAL_ERROR "OpenGL not found !")
-endif ( HARDWARE_ACCELERATION AND NOT OPENGL_FOUND )
+#Find the required libraries.
+Find_Package (SDL REQUIRED)
+Find_Package (SDL_gfx REQUIRED)
+Find_Package (SDL_image REQUIRED)
+Find_Package (SDL_ttf REQUIRED)
+Find_Package (SDL_mixer REQUIRED)
+Find_Package (OpenSSL REQUIRED)
+Find_Package (CURL REQUIRED)
+Find_Package (LibArchive REQUIRED)
+Find_Package (Lua51 REQUIRED)
+
+if (HARDWARE_ACCELERATION AND NOT OPENGL_FOUND)
+ message (FATAL_ERROR "OpenGL not found !")
+elseif (NOT HARDWARE_ACCELERATION AND NOT X11_FOUND)
+ message (FATAL_ERROR "X11 not found !")
+endif (HARDWARE_ACCELERATION AND NOT OPENGL_FOUND)
+
+if (NOT SDL_FOUND)
+ message (FATAL_ERROR "SDL not found !")
+endif (NOT SDL_FOUND)
+
+if (NOT SDLGFX_FOUND)
+ message (FATAL_ERROR "SDL_gfx not found !")
+endif (NOT SDLGFX_FOUND)
+
+if (NOT SDLIMAGE_FOUND)
+ message (FATAL_ERROR "SDL_gfx not found !")
+endif (NOT SDLIMAGE_FOUND)
+
+if (NOT SDLTTF_FOUND)
+ message (FATAL_ERROR "SDL_ttf not found !")
+endif (NOT SDLTTF_FOUND)
+
+if (NOT SDLMIXER_FOUND)
+ message (FATAL_ERROR "SDL_mixer not found !")
+endif (NOT SDLMIXER_FOUND)
+
+if (NOT OPENSSL_FOUND)
+ message (FATAL_ERROR "OpenSSL not found !")
+endif (NOT OPENSSL_FOUND)
+
+if (NOT CURL_FOUND)
+ message(FATAL_ERROR "CURL not found !")
+endif (NOT CURL_FOUND)
+
+if (NOT LibArchive_FOUND)
+ message (FATAL_ERROR "LIBARCHIVE not found !")
+endif (NOT LibArchive_FOUND)
+
+if (NOT LUA51_FOUND)
+ message (FATAL_ERROR "Lua not found !")
+endif (NOT LUA51_FOUND)
-#Set the output path and the source path.
-set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR})
-set(SRC_DIR ${PROJECT_SOURCE_DIR}/src)
+#Parse the configure file.
+Configure_File (
+ "${PROJECT_SOURCE_DIR}/src/config.h.in"
+ "${PROJECT_BINARY_DIR}/config.h"
+)
#Add the include directories of the (found) libraries.
-include_directories(
+Include_Directories(
${PROJECT_BINARY_DIR}
+ ${X11_X11_INCLUDE_PATH}
+ ${OPENGL_gl_INCLUDE_DIR}
${SDL_INCLUDE_DIR}
+ ${SDLGFX_INCLUDE_DIR}
+ ${SDLIMAGE_INCLUDE_DIR}
${SDLTTF_INCLUDE_DIR}
${SDLMIXER_INCLUDE_DIR}
- ${SDLIMAGE_INCLUDE_DIR}
- ${SDLGFX_INCLUDE_DIR}
- ${OPENSSL_INCLUDE_DIR}
+ ${OPENSSL_CRYPTO_INCLUDE_DIR}
+ ${CURL_INCLUDE_DIR}
+ ${LibArchive_INCLUDE_DIR}
${LUA_INCLUDE_DIR}
- ${OPENGL_INCLUDE_DIR}
)
+#Set the output path and the source path.
+Set (EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR})
+Set (SRC_DIR ${PROJECT_SOURCE_DIR}/src)
+
#List the source files.
-file(GLOB tinygettext ${SRC_DIR}/libs/tinygettext/*.cpp)
-file(GLOB findlocale ${SRC_DIR}/libs/findlocale/*.c)
-file(GLOB Sources ${SRC_DIR}/*.cpp)
-add_executable(meandmyshadow ${Sources} ${tinygettext} ${findlocale})
-
-target_link_libraries(
- meandmyshadow
- ${SDL_LIBRARY}
- ${SDLTTF_LIBRARY}
+File (GLOB SOURCES ${SRC_DIR}/*.cpp)
+File (GLOB TINYGETTEXT ${SRC_DIR}/libs/tinygettext/*.cpp)
+File (GLOB FINDLOCALE ${SRC_DIR}/libs/findlocale/*.c)
+
+Add_Executable (meandmyshadow ${SOURCES} ${TINYGETTEXT} ${FINDLOCALE})
+
+Target_Link_Libraries (
+ meandmyshadow
+ ${OPENGL_gl_LIBRARY}
+ ${X11_X11_LIB}
+ ${SDL_LIBRARY}
+ ${SDLGFX_LIBRARY}
${SDLIMAGE_LIBRARY}
+ ${SDLTTF_LIBRARY}
${SDLMIXER_LIBRARY}
- ${SDLGFX_LIBRARY}
- ${CURL_LIBRARY}
- ${LibArchive_LIBRARY}
- ${OPENSSL_LIBRARIES}
- ${LUA_LIBRARIES}
- ${CRYPTO_LIBRARY}
- ${OPENGL_LIBRARY}
- ${X11_LIBRARIES}
+ ${OPENSSL_CRYPTO_LIBRARY}
+ ${CURL_LIBRARY}
+ ${LibArchive_LIBRARY}
+ ${LUA_LIBRARIES}
)
#Path options
-set(BINDIR "bin" CACHE STRING "Where to install binaries")
-set(DATAROOTDIR "${CMAKE_INSTALL_PREFIX}/share" CACHE STRING "Sets the root of data directories to a non-default location")
-set(ICONDIR "${DATAROOTDIR}/icons" CACHE STRING "Sets the icon directory for desktop entry to a non-default location.")
-set(DESKTOPDIR "${DATAROOTDIR}/applications" CACHE STRING "Sets the desktop file directory for desktop entry to a non-default location.")
-
-#Parse the configure file.
-configure_file (
- "${PROJECT_SOURCE_DIR}/src/config.h.in"
- "${PROJECT_BINARY_DIR}/config.h"
- )
-
-#install locations
-install(DIRECTORY ${PROJECT_SOURCE_DIR}/data DESTINATION ${DATAROOTDIR}/meandmyshadow/)
-install(FILES AUTHORS DESTINATION ${DATAROOTDIR}/meandmyshadow/)
-install(TARGETS meandmyshadow RUNTIME DESTINATION ${BINDIR})
-if("${CMAKE_SYSTEM_NAME}" MATCHES "Linux")
- install(FILES meandmyshadow.desktop DESTINATION ${DESKTOPDIR})
- install(FILES icons/16x16/meandmyshadow.png DESTINATION ${ICONDIR}/hicolor/16x16/apps/)
- install(FILES icons/32x32/meandmyshadow.png DESTINATION ${ICONDIR}/hicolor/32x32/apps/)
- install(FILES icons/48x48/meandmyshadow.png DESTINATION ${ICONDIR}/hicolor/48x48/apps/)
- install(FILES icons/64x64/meandmyshadow.png DESTINATION ${ICONDIR}/hicolor/64x64/apps/)
-endif("${CMAKE_SYSTEM_NAME}" MATCHES "Linux")
+Set (BINDIR "bin" CACHE STRING "Where to install binaries")
+Set (DATAROOTDIR "${CMAKE_INSTALL_PREFIX}/share" CACHE STRING "Sets the root of data directories to a non-default location")
+Set (ICONDIR "${DATAROOTDIR}/icons" CACHE STRING "Sets the icon directory for desktop entry to a non-default location.")
+Set (DESKTOPDIR "${DATAROOTDIR}/applications" CACHE STRING "Sets the desktop file directory for desktop entry to a non-default location.")
+
+#Install locations
+Install (DIRECTORY ${PROJECT_SOURCE_DIR}/data DESTINATION ${DATAROOTDIR}/meandmyshadow/)
+Install (FILES AUTHORS DESTINATION ${DATAROOTDIR}/meandmyshadow/)
+Install (TARGETS meandmyshadow RUNTIME DESTINATION ${BINDIR})
+
+if ("${CMAKE_SYSTEM_NAME}" MATCHES "Linux")
+ Install (FILES meandmyshadow.desktop DESTINATION ${DESKTOPDIR})
+ Install (FILES icons/16x16/meandmyshadow.png DESTINATION ${ICONDIR}/hicolor/16x16/apps/)
+ Install (FILES icons/32x32/meandmyshadow.png DESTINATION ${ICONDIR}/hicolor/32x32/apps/)
+ Install (FILES icons/48x48/meandmyshadow.png DESTINATION ${ICONDIR}/hicolor/48x48/apps/)
+ Install (FILES icons/64x64/meandmyshadow.png DESTINATION ${ICONDIR}/hicolor/64x64/apps/)
+endif ("${CMAKE_SYSTEM_NAME}" MATCHES "Linux")
diff --git a/data/Credits.txt b/data/Credits.txt
index 676cb45..5b44d4b 100644
--- a/data/Credits.txt
+++ b/data/Credits.txt
@@ -1,142 +1,142 @@
The following list contains the data files in Me and My Shadow.
It should contain all files with their correct attribution and license information.
If something is missing please contact the developers.
font/
- Blokletters-Viltstift.ttf
Name: Blokletters Viltstift
- License: CC BY-SA 2.5 <http://creativecommons.org/licenses/by-sa/2.5/>
+ License: CC BY-SA 3.0 <http://creativecommons.org/licenses/by-sa/3.0/>
Attribution: http://lefly.vepar.nl/
- knewave.ttf
License: Open Font License <http://scripts.sil.org/OFL>
Attribution: Tyler Finck (http://www.sursly.com)
- DroidSansFallback.ttf
License: Apache License <http://www.apache.org/licenses/LICENSE-2.0>
Source: http://www.droidfonts.com
gfx/menu/
- background.png
License: CC BY-SA 3.0 <http://creativecommons.org/licenses/by-sa/3.0/>
Attribution: Tedium
Note: Part of the Cloudscape theme
- moving.png
License: CC0 <http://creativecommons.org/publicdomain/zero/1.0/>
- selection.png
License: CC0 <http://creativecommons.org/publicdomain/zero/1.0/>
- title.png
License: CC0 <http://creativecommons.org/publicdomain/zero/1.0/>
- credits.png
License: CC0 <http://creativecommons.org/publicdomain/zero/1.0/>
- toolbar.png
License: CC BY-SA 3.0 <http://creativecommons.org/licenses/by-sa/3.0/>
Attribution: odamite, Tedium
- statistics.png
License: CC BY 3.0 <http://creativecommons.org/licenses/by/3.0/>
Attribution: odamite
- questionmark.png
License: GNU LGPL <http://www.gnu.org/licenses/lgpl>
Source: Wine <http://www.winehq.org/>
Note: Modified by acme_pjz
- emotions.png
License: CC BY-SA 3.0 <http://creativecommons.org/licenses/by-sa/3.0/>
Attribution: Tedium, acme_pjz
Note: Another programmer art
gfx/
- actions.png
License: CC0 <http://creativecommons.org/publicdomain/zero/1.0/>
- dropshadow.png
License: CC BY-SA 3.0 <http://creativecommons.org/licenses/by-sa/3.0/>
Attribution: Me and My Shadow <http://meandmyshadow.sf.net>
- gui.png
License: CC BY-SA 3.0 <http://creativecommons.org/licenses/by-sa/3.0/>
Attribution: Me and My Shadow <http://meandmyshadow.sf.net>
- level.png
License: CC BY-SA 3.0 <http://creativecommons.org/licenses/by-sa/3.0/>
Attribution: Tedium
Note: Part of the Cloudscape theme
- levellocked.png
License: CC BY-SA 3.0 <http://creativecommons.org/licenses/by-sa/3.0/>
Attribution: Tedium
Note: Part of the Cloudscape theme
- medals.png
License: CC BY-SA 3.0 <http://creativecommons.org/licenses/by-sa/3.0/>
Attribution: Tedium
- playbutton.png
License: CC BY-SA 3.0 <http://creativecommons.org/licenses/by-sa/3.0/>
Attribution: Tedium
- recordings.png
License: CC BY-SA 3.0 <http://creativecommons.org/licenses/by-sa/3.0/>
Attribution: Tedium
- time.png
License: CC BY-SA 3.0 <http://creativecommons.org/licenses/by-sa/3.0/>
Attribution: Tedium
levelpacks/
Note that the translations inside the levelpacks are all licensed under the GNU GPLv3.
For the copyright notice(s) of the individual translations see the relevant .po file's header.
- classic/
License: CC0 <http://creativecommons.org/publicdomain/zero/1.0/>
- default/
License: CC0 <http://creativecommons.org/publicdomain/zero/1.0/>
- tutorial/
License: GPLv3 <http://www.gnu.org/licenses/gpl>
Copyright: 2011 Luka Horvat
Copyright: 2011-2012 Me and My Shadow
Note: Levels originally made by Luka Horvat and extended and updated by Me and My Shadow.
levels/
License: CC0 <http://creativecommons.org/publicdomain/zero/1.0/>
Note: All single levels distributed with Me and My Shadow are public domain.
locale/
For the copyright notice(s) of the translations see the header of the relevant .po file.
- messages.pot
License: GPLv3 <http://www.gnu.org/licenses/gpl>
Copyright: 2012 Me and My Shadow <http://meandmyshadow.sf.net>
music/
See the header of the .music files for the license and attribution of the music files.
sfx/
- checkpoint.wav
License: GNU GPL <http://www.gnu.org/licenses/gpl>
Copyright: XMoto <http://xmoto.tuxfamily.org>
- swap.wav
Name: Ambient Pulse Noise
License: CC BY-SA 3.0 <http://creativecommons.org/licenses/by-sa/3.0/>
Attribution: Gobusto
Source: http://opengameart.org/content/ambient-pulse-noise
- toggle.wav
License: CC0 <http://creativecommons.org/publicdomain/zero/1.0/>
Source: http://www.opengameart.org/content/hit-sounds
- error.wav
License: CC0 <http://creativecommons.org/publicdomain/zero/1.0/>
Source: http://opengameart.org/content/skweaks
Note: converted to .wav
- collect.wav
License: CC BY 3.0 <http://creativecommons.org/licenses/by/3.0/>
Attribution: odamite
- hit.wav
License: CC0 <http://creativecommons.org/publicdomain/zero/1.0/>
Note: Made with sfxr <http://www.drpetter.se/project_sfxr.html>
- jump.wav
License: CC0 <http://creativecommons.org/publicdomain/zero/1.0/>
Note: Made with sfxr <http://www.drpetter.se/project_sfxr.html>
- achievement.ogg
Name: UI Sound effects pack
License: CC BY 3.0 <http://creativecommons.org/licenses/by/3.0/>
Attribution: David McKee (ViRiX) soundcloud.com/virix
Source: http://opengameart.org/content/ui-sound-effects-pack
themes/
See the individual themes for their license(s).

File Metadata

Mime Type
text/x-diff
Expires
Sat, May 16, 8:17 PM (1 d, 13 h)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
63866
Default Alt Text
(14 KB)

Event Timeline