Commit Graph

493 Commits (ae5f783a1650b8d65a2b65eeae149ab5729ef473)

Author SHA1 Message Date
pvdk 8fe837ae6e Merge remote-tracking branch 'upstream/master' into wizard 11 years ago
Bret Curtis ab224f93c9 remove our stdint.h version that uses boost and force usage of system stdint.h 11 years ago
Marc Zinnschlag 6101916b7d bumped version number 11 years ago
pvdk c54217d008 Merge remote-tracking branch 'upstream/master' into HEAD
Conflicts:
	CMakeLists.txt
	components/CMakeLists.txt
	components/config/gamesettings.cpp
11 years ago
pvdk 56d537e23d Added some sanity checking: compare git version with manual version 11 years ago
pvdk b43325119a Some changes to the version retrieval: ignore shallow clones 11 years ago
pvdk 85b7240948 Made the git version retrieval more reliable 11 years ago
Nikolay Kasyanov 4a61868521 OS X: fixed Ogre plugin packaging 11 years ago
Nikolay Kasyanov e4017b8bfe It seems that OctreeSceneManager is not required anymore 11 years ago
Nikolay Kasyanov 3c281c6a62 OS X: specify path to framework binary, not to framework directory 11 years ago
Nikolay Kasyanov c2fe0d480a Merge remote-tracking branch 'upstream/master' into osx-ogre-19
Conflicts:
	CMakeLists.txt
11 years ago
Marc Zinnschlag 053b3dc371 Merge branch 'openmw-28'
Conflicts:
	CMakeLists.txt
11 years ago
Nikolay Kasyanov 58add97676 Merge branch 'master' into osx-ogre-19
Conflicts:
	CMakeLists.txt
11 years ago
scrawl 4e6507248b Fix travis build 11 years ago
pvdk 19bef4fce8 Distinguish between release and development builds 11 years ago
pvdk 43bc223e68 Added version info retrieval from git tags 11 years ago
scrawl 37a59a37c6 Remove cpack (no longer used, according to BrotherBrick) 11 years ago
scrawl 659d790048 uuid is not used 11 years ago
scrawl d4aeb177f9 Remove unused btKinematicCharacterController 11 years ago
Marc Zinnschlag 7c8f735004 Merge remote-tracking branch 'corristo/osx-fixes' into openmw-28 11 years ago
Dmitriy 'Endorph' Shkurskiy 116f125f05 Windows-specific definition to deny SDL from providing it's own WinMain() 11 years ago
Marc Zinnschlag 0d3e67dafc Merge branch 'master' into openmw-28 11 years ago
scrawl 5b0a4c9424 Get rid of unused file and some other cruft. 11 years ago
Marc Zinnschlag fe34c9cf1f increased version number 11 years ago
Scott Howard 2f082ef796 remove unneeded libraries 11 years ago
Nikolay Kasyanov 892ff93489 OS X: attempt to fix #1045 11 years ago
Nikolay Kasyanov 73c6aba4d0 OS X: Ogre plugins are now installed in OpenCS bundle too. Generalized
plugin install routine.
11 years ago
Nikolay Kasyanov 874ecee079 OS X: do not enforce static boost, this can be set externally
anyway
11 years ago
Nikolay Kasyanov 89c60b065c OS X: looks like OGRE_Plugin_CgProgramManager_FOUND is not reliable 11 years ago
Nikolay Kasyanov 87853f4066 OS X: consider Ogre CG plugin as used only if it’s found 11 years ago
Nikolay Kasyanov 99cfb8cda2 OS X: this CMake parameters can be set in CMake invocation, no need to hardcode them in CMakeLists.txt 11 years ago
pvdk d8f20d2e66 Added the infrastructure to start working on the installation wizard 11 years ago
Marc Zinnschlag 04b1657d98 Merge branch 'openmw-27'
Conflicts:
	apps/opencs/CMakeLists.txt
	apps/opencs/main.cpp
11 years ago
eroen d4b8ac5b49 don't dpkg on windows and macos
No need to clutter windows and macos configuration with dpkg options, as it is
unlikely to ever be useful.
11 years ago
eroen 67284e2f9d Introduce -DBUILD_WITH_DPKG to toggle dpkg based install
The current system automagically chooses between the dpkg-based install method
(for debian-derived distributions) and a "traditional" install and sets
install paths based on whether cmake can find a 'dpkg' executable.

This is not ideal, since dpkg is occasionally installed on linux distributions
unrelated to debian for purposes other than package management. In particular,
Arch and Gentoo carry it in their repositories.
11 years ago
Nikolay Kasyanov fa13818360 OS X: OpenCS packaging 11 years ago
Marc Zinnschlag ef401a774b Merge remote-tracking branch 'eroen/install-fix' 11 years ago
Marc Zinnschlag 224aa5d38c Merge remote-tracking branch 'eroen/install-fix-17' into openmw-27 11 years ago
Bret Curtis 5a071b0f81 necessary dpkg rules to get opencs building and packaged on dpkg systems 11 years ago
eroen e885c502a1 Stop installing "Daedric Font License.txt"
It was removed in 3a827d9c12
11 years ago
eroen 6b931f566d Stop installing "Daedric Font License.txt"
It was removed in 3a827d9c12
11 years ago
Bret Curtis 36efe9605f necessary dpkg rules to get opencs building and packaged on dpkg systems 11 years ago
Marc Zinnschlag 418ccf705d Merge branch 'openmw-27'
Conflicts:
	apps/launcher/graphicspage.hpp
	components/CMakeLists.txt
11 years ago
Marc Zinnschlag f4e6f31658 Merge remote-tracking branch 'scrawl/openmw-27' 11 years ago
Marc Zinnschlag dec1483fa4 Merge branch 'saving' into openmw-27 11 years ago
scrawl 636d399c7f Refactored Ogre initialisation into a component 11 years ago
Marc Zinnschlag b20943b123 Merge remote-tracking branch 'ace/win-package' into openmw-27 11 years ago
Alexander "Ace" Olofsson 632a53ead4 Support packing the OpenCS into windows builds 11 years ago
Marc Zinnschlag 29fce6d11f increased version number 11 years ago
Marek Kochanowicz b138533bf3 renamed defaultfilter.omwaddon.project to defaultfilters. 11 years ago