mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-21 11:39:44 +00:00
Code Issues Releases Wiki Activity

Moved the generated version header stuff into components

Browse source
This commit is contained in:
pvdk 2014-01-22 17:33:55 +01:00
parent 43bc223e68
commit c95b8bcb39
4 changed files with 11 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
apps/openmw/CMakeLists.txt
View file

@ -1,7 +1,3 @@
# config file
configure_file ("${CMAKE_CURRENT_SOURCE_DIR}/config.hpp.cmake" "${CMAKE_CURRENT_SOURCE_DIR}/config.hpp")
# local files # local files
set(GAME set(GAME
main.cpp main.cpp
@ -12,7 +8,6 @@ if(NOT WIN32)
endif() endif()
set(GAME_HEADER set(GAME_HEADER
engine.hpp engine.hpp
config.hpp
) )
source_group(game FILES ${GAME} ${GAME_HEADER}) source_group(game FILES ${GAME} ${GAME_HEADER})

9
apps/openmw/config.hpp.cmake
View file

@ -1,9 +0,0 @@
#ifndef CONFIG_H
#define CONFIG_H
#define OPENMW_VERSION_MAJOR @OPENMW_VERSION_MAJOR@
#define OPENMW_VERSION_MINOR @OPENMW_VERSION_MINOR@
#define OPENMW_VERSION_RELEASE @OPENMW_VERSION_RELEASE@
#define OPENMW_VERSION "@OPENMW_VERSION@"
#endif

3
apps/openmw/main.cpp
View file

@ -1,6 +1,7 @@
#include <iostream> #include <iostream>
#include <cstdio> #include <cstdio>
#include <components/version/version.hpp>
#include <components/files/configurationmanager.hpp> #include <components/files/configurationmanager.hpp>
#include <SDL.h> #include <SDL.h>
@ -30,8 +31,6 @@ extern int is_debugger_attached(void);
#include <OSX/macUtils.h> #include <OSX/macUtils.h>
#endif #endif
#include "config.hpp"
#include <boost/version.hpp> #include <boost/version.hpp>
/** /**
* Workaround for problems with whitespaces in paths in older versions of Boost library * Workaround for problems with whitespaces in paths in older versions of Boost library

12
components/CMakeLists.txt
View file

@ -1,5 +1,9 @@
project (Components) project (Components)
set (CMAKE_BUILD_TYPE DEBUG) set (CMAKE_BUILD_TYPE DEBUG)
# Version file
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/version/version.hpp.cmake" "${CMAKE_CURRENT_SOURCE_DIR}/version/version.hpp")
# source files # source files
add_component_dir (settings add_component_dir (settings
@ -75,8 +79,12 @@ add_component_dir (loadinglistener
) )
add_component_dir (ogreinit add_component_dir (ogreinit
ogreinit ogreplugin ogreinit ogreplugin
) )
add_component_dir (version
version
)
set (ESM_UI ${CMAKE_SOURCE_DIR}/files/ui/contentselector.ui set (ESM_UI ${CMAKE_SOURCE_DIR}/files/ui/contentselector.ui
) )