Page MenuHomePhabricator (Chris)
Files F133792

No OneTemporary
Actions

Authored By
Unknown
Size
10 KB
Referenced Files
None
Subscribers
None

View Options

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5df94b2..a4fc610 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,93 +1,62 @@
#Change this if you need to target a specific CMake version
cmake_minimum_required(VERSION 3.1)
set (CMAKE_CXX_STANDARD 11)
# Here must be also current version - opposite to debian files which has latest release version
set(DEERPORTAL_MAJOR_VERSION 0)
set(DEERPORTAL_MINOR_VERSION 7)
set(DEERPORTAL_PATCH_VERSION 2)
set(DEERPORTAL_VERSION
${DEERPORTAL_MAJOR_VERSION}.${DEERPORTAL_MINOR_VERSION}.${DEERPORTAL_PATCH_VERSION})
# Enable debug symbols by default
# must be done before project() statement
if(NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE Debug CACHE STRING "Choose the type of build (Debug or Release)" FORCE)
endif()
# (you can also set it on the command line: -D CMAKE_BUILD_TYPE=Release)
project(myproject)
#target_compile_definitions(DeerPortal PRIVATE FOO=1 BAR=1)
add_definitions(-DDEERPORTAL_VERSION="${DEERPORTAL_VERSION}.${CMAKE_BUILD_TYPE}")
# Set version information in a config.h file
# configure_file(
# "${PROJECT_SOURCE_DIR}/config.h.in"
# "${PROJECT_BINARY_DIR}/config.h"
# )
include_directories("${PROJECT_BINARY_DIR}")
include_directories(${YOUR_DIRECTORY})
# Define sources and executable
set(EXECUTABLE_NAME "DeerPortal")
-add_executable(${EXECUTABLE_NAME}
- main.cpp
- animatedsprite.cpp
- animation.cpp
- banner.cpp
- boarddiamond.cpp
- boarddiamondseq.cpp
- boardelem.cpp
- boardelems.cpp
- bubble.cpp
- calendar.cpp
- card.cpp
- cardsdeck.cpp
- cardslist.cpp
- character.cpp
- command.cpp
- credits.cpp
- data.cpp
- elem.cpp
- game.cpp
- grouphud.cpp
- guirounddice.cpp
- guiwindow.cpp
- hover.cpp
- particlesystem.cpp
- pile.cpp
- playerhud.cpp
- rotateelem.cpp
- rounddice.cpp
- selector.cpp
- soundfx.cpp
- textureholder.cpp
- tilemap.cpp)
+file( GLOB SRCS src/*.cpp src/*.h )
+add_executable(${EXECUTABLE_NAME} ${SRCS})
# Detect and add SFML
set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake_modules" ${CMAKE_MODULE_PATH})
#Find any version 2.X of SFML
#See the FindSFML.cmake file for additional details and instructions
find_package(SFML 2 REQUIRED network audio graphics window system)
if(SFML_FOUND)
include_directories(${SFML_INCLUDE_DIR})
target_link_libraries(${EXECUTABLE_NAME} ${SFML_LIBRARIES} ${SFML_DEPENDENCIES})
endif()
# Install target
install(TARGETS ${EXECUTABLE_NAME} DESTINATION bin)
# CPack packaging
include(InstallRequiredSystemLibraries)
# set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/COPYING")
set(CPACK_PACKAGE_VERSION_MAJOR "${DEERPORTAL_MAJOR_VERSION}")
set(CPACK_PACKAGE_VERSION_MINOR "${DEERPORTAL_MINOR_VERSION}.${DEERPORTAL_PATCH_VERSION}")
include(CPack)
diff --git a/animatedsprite.cpp b/src/animatedsprite.cpp
similarity index 100%
rename from animatedsprite.cpp
rename to src/animatedsprite.cpp
diff --git a/animatedsprite.h b/src/animatedsprite.h
similarity index 100%
rename from animatedsprite.h
rename to src/animatedsprite.h
diff --git a/animation.cpp b/src/animation.cpp
similarity index 100%
rename from animation.cpp
rename to src/animation.cpp
diff --git a/animation.h b/src/animation.h
similarity index 100%
rename from animation.h
rename to src/animation.h
diff --git a/banner.cpp b/src/banner.cpp
similarity index 100%
rename from banner.cpp
rename to src/banner.cpp
diff --git a/banner.h b/src/banner.h
similarity index 100%
rename from banner.h
rename to src/banner.h
diff --git a/boarddiamond.cpp b/src/boarddiamond.cpp
similarity index 100%
rename from boarddiamond.cpp
rename to src/boarddiamond.cpp
diff --git a/boarddiamond.h b/src/boarddiamond.h
similarity index 100%
rename from boarddiamond.h
rename to src/boarddiamond.h
diff --git a/boarddiamondseq.cpp b/src/boarddiamondseq.cpp
similarity index 100%
rename from boarddiamondseq.cpp
rename to src/boarddiamondseq.cpp
diff --git a/boarddiamondseq.h b/src/boarddiamondseq.h
similarity index 100%
rename from boarddiamondseq.h
rename to src/boarddiamondseq.h
diff --git a/boardelem.cpp b/src/boardelem.cpp
similarity index 100%
rename from boardelem.cpp
rename to src/boardelem.cpp
diff --git a/boardelem.h b/src/boardelem.h
similarity index 100%
rename from boardelem.h
rename to src/boardelem.h
diff --git a/boardelems.cpp b/src/boardelems.cpp
similarity index 100%
rename from boardelems.cpp
rename to src/boardelems.cpp
diff --git a/boardelems.h b/src/boardelems.h
similarity index 100%
rename from boardelems.h
rename to src/boardelems.h
diff --git a/bubble.cpp b/src/bubble.cpp
similarity index 100%
rename from bubble.cpp
rename to src/bubble.cpp
diff --git a/bubble.h b/src/bubble.h
similarity index 100%
rename from bubble.h
rename to src/bubble.h
diff --git a/calendar.cpp b/src/calendar.cpp
similarity index 100%
rename from calendar.cpp
rename to src/calendar.cpp
diff --git a/calendar.h b/src/calendar.h
similarity index 100%
rename from calendar.h
rename to src/calendar.h
diff --git a/card.cpp b/src/card.cpp
similarity index 100%
rename from card.cpp
rename to src/card.cpp
diff --git a/card.h b/src/card.h
similarity index 100%
rename from card.h
rename to src/card.h
diff --git a/cardsdeck.cpp b/src/cardsdeck.cpp
similarity index 100%
rename from cardsdeck.cpp
rename to src/cardsdeck.cpp
diff --git a/cardsdeck.h b/src/cardsdeck.h
similarity index 100%
rename from cardsdeck.h
rename to src/cardsdeck.h
diff --git a/cardslist.cpp b/src/cardslist.cpp
similarity index 100%
rename from cardslist.cpp
rename to src/cardslist.cpp
diff --git a/cardslist.h b/src/cardslist.h
similarity index 100%
rename from cardslist.h
rename to src/cardslist.h
diff --git a/character.cpp b/src/character.cpp
similarity index 100%
rename from character.cpp
rename to src/character.cpp
diff --git a/character.h b/src/character.h
similarity index 100%
rename from character.h
rename to src/character.h
diff --git a/command.cpp b/src/command.cpp
similarity index 100%
rename from command.cpp
rename to src/command.cpp
diff --git a/command.h b/src/command.h
similarity index 100%
rename from command.h
rename to src/command.h
diff --git a/credits.cpp b/src/credits.cpp
similarity index 100%
rename from credits.cpp
rename to src/credits.cpp
diff --git a/credits.h b/src/credits.h
similarity index 100%
rename from credits.h
rename to src/credits.h
diff --git a/data.cpp b/src/data.cpp
similarity index 100%
rename from data.cpp
rename to src/data.cpp
diff --git a/data.h b/src/data.h
similarity index 100%
rename from data.h
rename to src/data.h
diff --git a/elem.cpp b/src/elem.cpp
similarity index 100%
rename from elem.cpp
rename to src/elem.cpp
diff --git a/elem.h b/src/elem.h
similarity index 100%
rename from elem.h
rename to src/elem.h
diff --git a/elemsdescription.h b/src/elemsdescription.h
similarity index 100%
rename from elemsdescription.h
rename to src/elemsdescription.h
diff --git a/game.cpp b/src/game.cpp
similarity index 100%
rename from game.cpp
rename to src/game.cpp
diff --git a/game.h b/src/game.h
similarity index 100%
rename from game.h
rename to src/game.h
diff --git a/grouphud.cpp b/src/grouphud.cpp
similarity index 100%
rename from grouphud.cpp
rename to src/grouphud.cpp
diff --git a/grouphud.h b/src/grouphud.h
similarity index 100%
rename from grouphud.h
rename to src/grouphud.h
diff --git a/guirounddice.cpp b/src/guirounddice.cpp
similarity index 100%
rename from guirounddice.cpp
rename to src/guirounddice.cpp
diff --git a/guirounddice.h b/src/guirounddice.h
similarity index 100%
rename from guirounddice.h
rename to src/guirounddice.h
diff --git a/guiwindow.cpp b/src/guiwindow.cpp
similarity index 100%
rename from guiwindow.cpp
rename to src/guiwindow.cpp
diff --git a/guiwindow.h b/src/guiwindow.h
similarity index 100%
rename from guiwindow.h
rename to src/guiwindow.h
diff --git a/hover.cpp b/src/hover.cpp
similarity index 100%
rename from hover.cpp
rename to src/hover.cpp
diff --git a/hover.h b/src/hover.h
similarity index 100%
rename from hover.h
rename to src/hover.h
diff --git a/main.cpp b/src/main.cpp
similarity index 100%
rename from main.cpp
rename to src/main.cpp
diff --git a/particle.h b/src/particle.h
similarity index 100%
rename from particle.h
rename to src/particle.h
diff --git a/particlesystem.cpp b/src/particlesystem.cpp
similarity index 100%
rename from particlesystem.cpp
rename to src/particlesystem.cpp
diff --git a/pile.cpp b/src/pile.cpp
similarity index 100%
rename from pile.cpp
rename to src/pile.cpp
diff --git a/pile.h b/src/pile.h
similarity index 100%
rename from pile.h
rename to src/pile.h
diff --git a/playerhud.cpp b/src/playerhud.cpp
similarity index 100%
rename from playerhud.cpp
rename to src/playerhud.cpp
diff --git a/playerhud.h b/src/playerhud.h
similarity index 100%
rename from playerhud.h
rename to src/playerhud.h
diff --git a/rotateelem.cpp b/src/rotateelem.cpp
similarity index 100%
rename from rotateelem.cpp
rename to src/rotateelem.cpp
diff --git a/rotateelem.h b/src/rotateelem.h
similarity index 100%
rename from rotateelem.h
rename to src/rotateelem.h
diff --git a/rounddice.cpp b/src/rounddice.cpp
similarity index 100%
rename from rounddice.cpp
rename to src/rounddice.cpp
diff --git a/rounddice.h b/src/rounddice.h
similarity index 100%
rename from rounddice.h
rename to src/rounddice.h
diff --git a/selector.cpp b/src/selector.cpp
similarity index 100%
rename from selector.cpp
rename to src/selector.cpp
diff --git a/selector.h b/src/selector.h
similarity index 100%
rename from selector.h
rename to src/selector.h
diff --git a/soundfx.cpp b/src/soundfx.cpp
similarity index 100%
rename from soundfx.cpp
rename to src/soundfx.cpp
diff --git a/soundfx.h b/src/soundfx.h
similarity index 100%
rename from soundfx.h
rename to src/soundfx.h
diff --git a/textureholder.cpp b/src/textureholder.cpp
similarity index 100%
rename from textureholder.cpp
rename to src/textureholder.cpp
diff --git a/textureholder.h b/src/textureholder.h
similarity index 100%
rename from textureholder.h
rename to src/textureholder.h
diff --git a/tilemap.cpp b/src/tilemap.cpp
similarity index 100%
rename from tilemap.cpp
rename to src/tilemap.cpp
diff --git a/tilemap.h b/src/tilemap.h
similarity index 100%
rename from tilemap.h
rename to src/tilemap.h

File Metadata

Mime Type
text/x-diff
Expires
Wed, Jun 17, 9:05 PM (1 w, 5 d ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
70904
Default Alt Text
(10 KB)

Event Timeline