Commit Graph

253 Commits (8bbb02a1bd83be7eb5a3e88bd99828011fad4542)

Author SHA1 Message Date
Marc Zinnschlag 2b2eb34f8f Merge remote branch 'corristo/master' into next 13 years ago
Nikolay Kasyanov 362e6cb9ed Removed predefined SDK path. Found that it's generally not good idea to force it. Also -Wno-unused-but-set-parameter only set for gcc 4.6 or newer 13 years ago
Chris Robinson 2bc81a778b Merge remote branch 'zini/next' into sound-rewrite 13 years ago
Nikolay Kasyanov 8e76451cda Fix launcher style installation on OS X again 13 years ago
Alexander "Ace" Olofsson dcdc759719 Adding readme to windows builds 13 years ago
scrawl 250fcab7c2 moved the mygui resources to a more suitable location 13 years ago
Chris Robinson 9a48002025 Fix compilation of the FFmpeg decoder 13 years ago
scrawl 66baf9ec81 Merge branch 'master' into mygui 13 years ago
Chris Robinson 74e79bb4af Merge remote branch 'zini/master' into sound-rewrite
Conflicts:
	apps/openmw/mwsound/soundmanager.cpp
	apps/openmw/mwsound/soundmanager.hpp
13 years ago
Marc Zinnschlag 50b79de10b Merge remote branch 'psi29a/master' 13 years ago
Brother Brick b6b972b73b Removed libbullet and libogre dependencies and added nvidia-toolkit.
We are releasing OpenMW based on static libraries, so the first two
are no longer necessary
13 years ago
Brother Brick 42584b013f Updated dependency to match our PPA 13 years ago
Lukasz Gromanowski fc95917253 Fix for not visible pthreads function with glibc 2.15
Linking error will appear:

Linking CXX executable ../../openmw
/usr/bin/ld: CMakeFiles/openmw.dir/__/__/components/bsa/bsa_archive.cpp.o: undefined reference to symbol 'pthread_mutexattr_settype@@GLIBC_2.2.5'
/usr/bin/ld: note: 'pthread_mutexattr_settype@@GLIBC_2.2.5' is defined in DSO /lib/libpthread.so.0 so try adding it to the linker command line
/lib/libpthread.so.0: could not read symbols: Invalid operation
collect2: ld returned 1 exit status

if we don't add explicitly pthreads library to linker flags
after update glibc to version 2.15 on (Arch) Linux.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
13 years ago
gugus 7ca0503205 Merge branch 'master' of https://github.com/zinnschlag/openmw.git into DialogueSystem 13 years ago
Marc Zinnschlag cab869824a bumping version number 13 years ago
scrawl 3a00fbb950 removed mygui from source tree and use system install instead 13 years ago
Marc Zinnschlag 655f9fe920 Merge remote branch 'k1ll/staticogre' 13 years ago
k1ll b83b7d0650 Added OGRE_STATIC as cmake option and removed the code for the BSPSceneManager plugin. 13 years ago
Chris Robinson 246b0266fb Remove references to Audiere. It's not supported for now. 13 years ago
Chris Robinson 45b612ab3b Add a skeleton output classs using OpenAL 13 years ago
Chris Robinson 42b445383f Remove Mangle- and OpenEngine-related sound code
Start of the sound code refactoring. Currently there is no sound, but it will
be added back.
13 years ago
gugus 5b08baf5bf a little fix for CMake to be able not to build the launcher 13 years ago
Marc Zinnschlag 5b378e820d warning level adjustments and some related fixes 13 years ago
k1ll b7eb7ff8e3 Added support for linking static Ogre libraries and plugins into the launcher and openmw. 13 years ago
Marc Zinnschlag 311c0b04e2 Merge remote branch 'ace/win-warning' 13 years ago
Alexander "Ace" Olofsson 04494893c8 Added some release mode warnings 13 years ago
Marc Zinnschlag ff866269ec Merge remote branch 'corristo/pgrd'
Removed a warning

Conflicts:
	CMakeLists.txt
13 years ago
Alexander "Ace" Olofsson 477525ee48 Minor modification and spelling correction 13 years ago
Alexander "Ace" Olofsson ac0ba0c273 A little bit more commenting and sorting out the "normally not enabled" warnings 13 years ago
Alexander "Ace" Olofsson e7c3ddfe40 Final warning changes 13 years ago
Alexander "Ace" Olofsson 2f11bfc984 I think I've added all the warnings now 13 years ago
Alexander "Ace" Olofsson cecc823cd0 Commented list of disabled warnings to start with 13 years ago
Nikolay Kasyanov 6325697bfe Change in CMakeLists.txt for OS X due to changed ogre plugin path variable name 13 years ago
Alexander "Ace" Olofsson 5beee8598d Giving the windows installer a more personal look. 13 years ago
Pieter van der Kloet 2429f3960f Merge remote-tracking branch 'upstream/master' into launcher
Conflicts:
	apps/launcher/CMakeLists.txt
	apps/launcher/datafilespage.cpp
13 years ago
Nikolay Kasyanov 40e07bbd2a Feature #161 (In Progress) Load REC_PGRD records
Struct sizes seems correct, but floats is broken
13 years ago
Marc Zinnschlag be70d197e5 Merge branch 'next'
Conflicts:
	.gitignore
	cmake/FindOGRE.cmake
13 years ago
Marc Zinnschlag a86d2877fc Merge remote branch 'ace/win64-fixes' 13 years ago
Nikolay Kasyanov b283ad86fb revert to old launcher stylesheet location on OS X 13 years ago
Alexander "Ace" Olofsson 2c4ef5c670 64-bit install path on windows was easier to fix than expected. 13 years ago
Pieter van der Kloet 11ec5cf2e2 Stylesheet location changed in CMakeLists and some minor fixes to the launcher 13 years ago
Pieter van der Kloet 5b54a658d8 Launcher improvements: ask for data dir and write it to cfg if none is found
and prevent removal of the default profile
13 years ago
Marc Zinnschlag 7505c96fbb Merge remote branch 'lgro/master' 13 years ago
Lukasz Gromanowski cb5534c608 Updated website URL in CMakeLists file.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
13 years ago
Nikolay Kasyanov 822f47fbac Slightly changed OIS include dir var used specially for OS X. Should not change anything on other platforms 13 years ago
Pieter van der Kloet 280babc719 Fixed stylesheet and configuration problems with the launcher and code cleanup 13 years ago
Marc Zinnschlag b2b09320fc Merge branch 'config' 13 years ago
scrawl 694a537b57 - removed caelum sources, resources, build scripts 13 years ago
scrawl f7462f980f added Plugin_CgProgramManager (used for sky shaders) to apple's USED_OGRE_PLUGINS 13 years ago
Marc Zinnschlag db205cf8aa Merge remote branch 'scrawl/next' into test
Conflicts:
	libs/openengine
13 years ago