pvdk
85b7240948
Made the git version retrieval more reliable
2014-02-19 13:43:14 +01:00
Nikolay Kasyanov
4a61868521
OS X: fixed Ogre plugin packaging
2014-02-16 19:01:28 +04:00
Nikolay Kasyanov
e4017b8bfe
It seems that OctreeSceneManager is not required anymore
2014-02-16 14:16:45 +04:00
Nikolay Kasyanov
3c281c6a62
OS X: specify path to framework binary, not to framework directory
2014-02-16 14:12:45 +04:00
Nikolay Kasyanov
c2fe0d480a
Merge remote-tracking branch 'upstream/master' into osx-ogre-19
...
Conflicts:
CMakeLists.txt
2014-02-14 00:04:16 +04:00
Marc Zinnschlag
053b3dc371
Merge branch 'openmw-28'
...
Conflicts:
CMakeLists.txt
2014-02-13 20:57:28 +01:00
Nikolay Kasyanov
58add97676
Merge branch 'master' into osx-ogre-19
...
Conflicts:
CMakeLists.txt
2014-02-13 20:34:06 +04:00
scrawl
4e6507248b
Fix travis build
2014-02-13 12:19:21 +01:00
pvdk
19bef4fce8
Distinguish between release and development builds
2014-01-23 13:18:05 +01:00
pvdk
43bc223e68
Added version info retrieval from git tags
2014-01-22 17:04:49 +01:00
scrawl
37a59a37c6
Remove cpack (no longer used, according to BrotherBrick)
2014-01-17 15:20:28 +01:00
scrawl
659d790048
uuid is not used
2014-01-17 15:20:28 +01:00
scrawl
d4aeb177f9
Remove unused btKinematicCharacterController
2014-01-15 14:53:29 +01:00
Marc Zinnschlag
7c8f735004
Merge remote-tracking branch 'corristo/osx-fixes' into openmw-28
2014-01-08 20:16:39 +01:00
Dmitriy 'Endorph' Shkurskiy
116f125f05
Windows-specific definition to deny SDL from providing it's own WinMain()
2014-01-04 07:46:30 +02:00
Marc Zinnschlag
0d3e67dafc
Merge branch 'master' into openmw-28
2014-01-02 13:39:36 +01:00
scrawl
5b0a4c9424
Get rid of unused file and some other cruft.
2014-01-02 01:44:09 +01:00
Marc Zinnschlag
fe34c9cf1f
increased version number
2014-01-01 15:06:31 +01:00
Scott Howard
2f082ef796
remove unneeded libraries
2013-12-29 16:25:49 -05:00
Nikolay Kasyanov
892ff93489
OS X: attempt to fix #1045
2013-12-25 00:25:58 +04:00
Nikolay Kasyanov
73c6aba4d0
OS X: Ogre plugins are now installed in OpenCS bundle too. Generalized
...
plugin install routine.
2013-12-12 15:20:04 +04:00
Nikolay Kasyanov
874ecee079
OS X: do not enforce static boost, this can be set externally
...
anyway
2013-12-12 14:20:13 +04:00
Nikolay Kasyanov
89c60b065c
OS X: looks like OGRE_Plugin_CgProgramManager_FOUND is not reliable
2013-12-12 14:19:48 +04:00
Nikolay Kasyanov
87853f4066
OS X: consider Ogre CG plugin as used only if it’s found
2013-12-12 13:53:35 +04:00
Nikolay Kasyanov
99cfb8cda2
OS X: this CMake parameters can be set in CMake invocation, no need to hardcode them in CMakeLists.txt
2013-12-12 13:53:35 +04:00
Marc Zinnschlag
04b1657d98
Merge branch 'openmw-27'
...
Conflicts:
apps/opencs/CMakeLists.txt
apps/opencs/main.cpp
2013-11-30 09:45:41 +01:00
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.
2013-11-15 16:53:05 +01:00
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.
2013-11-15 15:59:38 +01:00
Nikolay Kasyanov
fa13818360
OS X: OpenCS packaging
2013-11-10 22:04:13 +04:00
Marc Zinnschlag
ef401a774b
Merge remote-tracking branch 'eroen/install-fix'
2013-11-08 09:10:44 +01:00
Marc Zinnschlag
224aa5d38c
Merge remote-tracking branch 'eroen/install-fix-17' into openmw-27
2013-11-08 09:10:26 +01:00
Bret Curtis
5a071b0f81
necessary dpkg rules to get opencs building and packaged on dpkg systems
2013-11-08 09:08:56 +01:00
eroen
e885c502a1
Stop installing "Daedric Font License.txt"
...
It was removed in 3a827d9c12
2013-11-08 04:37:55 +01:00
eroen
6b931f566d
Stop installing "Daedric Font License.txt"
...
It was removed in 3a827d9c12
2013-11-08 04:30:15 +01:00
Bret Curtis
36efe9605f
necessary dpkg rules to get opencs building and packaged on dpkg systems
2013-11-07 23:05:45 +01:00
Marc Zinnschlag
418ccf705d
Merge branch 'openmw-27'
...
Conflicts:
apps/launcher/graphicspage.hpp
components/CMakeLists.txt
2013-11-06 10:21:25 +01:00
Marc Zinnschlag
f4e6f31658
Merge remote-tracking branch 'scrawl/openmw-27'
2013-11-05 08:19:29 +01:00
Marc Zinnschlag
dec1483fa4
Merge branch 'saving' into openmw-27
2013-11-04 08:57:32 +01:00
scrawl
636d399c7f
Refactored Ogre initialisation into a component
2013-10-30 14:04:33 +01:00
Marc Zinnschlag
b20943b123
Merge remote-tracking branch 'ace/win-package' into openmw-27
2013-10-29 14:18:13 +01:00
Alexander "Ace" Olofsson
632a53ead4
Support packing the OpenCS into windows builds
2013-10-29 13:28:43 +01:00
Marc Zinnschlag
29fce6d11f
increased version number
2013-10-28 08:45:56 +01:00
Marek Kochanowicz
b138533bf3
renamed defaultfilter.omwaddon.project to defaultfilters.
2013-10-20 17:21:09 +02:00
Marek Kochanowicz
96b6787255
Getting rid of extension. Correcting tiny mistake in filters file.
2013-10-20 10:56:27 +02:00
Marek Kochanowicz
6b293961b4
This appears to work.
2013-10-20 10:02:33 +02:00
Marek Kochanowicz
155662860c
Added configrue file in cmake. Hopefully it will copy defaultfilters file.
2013-10-20 09:50:16 +02:00
Nikolay Kasyanov
3993c34739
Merge remote-tracking branch 'upstream/master' into osx-ogre-19
2013-10-14 20:37:55 +04:00
Nikolay Kasyanov
a18e3c9cc1
Fixed packaging when building against Ogre 1.9
2013-09-15 23:10:21 +04:00
Nikolay Kasyanov
36fb89c6cd
Cleanup
2013-09-15 23:03:07 +04:00
Marc Zinnschlag
9637e1641b
fix for building with system tinyxml
2013-09-14 13:33:49 +02:00