scrawl
66baf9ec81
Merge branch 'master' into mygui
2012-03-20 20:02:30 +01:00
Marc Zinnschlag
50b79de10b
Merge remote branch 'psi29a/master'
2012-03-20 10:26:08 +01:00
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
2012-03-20 09:53:39 +01:00
Brother Brick
42584b013f
Updated dependency to match our PPA
2012-03-20 09:43:48 +01:00
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>
2012-03-19 20:54:30 +01:00
gugus
7ca0503205
Merge branch 'master' of https://github.com/zinnschlag/openmw.git into DialogueSystem
2012-03-19 00:20:43 +01:00
Marc Zinnschlag
cab869824a
bumping version number
2012-03-18 22:18:09 +01:00
scrawl
3a00fbb950
removed mygui from source tree and use system install instead
2012-03-18 15:11:37 +01:00
Marc Zinnschlag
655f9fe920
Merge remote branch 'k1ll/staticogre'
2012-03-18 11:16:34 +01:00
k1ll
b83b7d0650
Added OGRE_STATIC as cmake option and removed the code for the BSPSceneManager plugin.
2012-03-17 20:03:37 +01:00
gugus
5b08baf5bf
a little fix for CMake to be able not to build the launcher
2012-03-16 18:20:02 +01:00
Marc Zinnschlag
5b378e820d
warning level adjustments and some related fixes
2012-03-15 16:01:41 +01:00
k1ll
b7eb7ff8e3
Added support for linking static Ogre libraries and plugins into the launcher and openmw.
2012-03-15 15:51:39 +01:00
Marc Zinnschlag
311c0b04e2
Merge remote branch 'ace/win-warning'
2012-03-15 15:07:31 +01:00
Alexander "Ace" Olofsson
04494893c8
Added some release mode warnings
2012-03-15 14:10:12 +01:00
Marc Zinnschlag
ff866269ec
Merge remote branch 'corristo/pgrd'
...
Removed a warning
Conflicts:
CMakeLists.txt
2012-03-14 16:45:53 +01:00
Alexander "Ace" Olofsson
477525ee48
Minor modification and spelling correction
2012-03-14 11:36:13 +01:00
Alexander "Ace" Olofsson
ac0ba0c273
A little bit more commenting and sorting out the "normally not enabled" warnings
2012-03-13 23:51:48 +01:00
Alexander "Ace" Olofsson
e7c3ddfe40
Final warning changes
2012-03-13 23:04:33 +01:00
Alexander "Ace" Olofsson
2f11bfc984
I think I've added all the warnings now
2012-03-13 22:47:39 +01:00
Alexander "Ace" Olofsson
cecc823cd0
Commented list of disabled warnings to start with
2012-03-13 22:01:18 +01:00
Nikolay Kasyanov
6325697bfe
Change in CMakeLists.txt for OS X due to changed ogre plugin path variable name
2012-03-12 20:47:47 +04:00
Alexander "Ace" Olofsson
5beee8598d
Giving the windows installer a more personal look.
2012-03-09 15:34:47 +01:00
Pieter van der Kloet
2429f3960f
Merge remote-tracking branch 'upstream/master' into launcher
...
Conflicts:
apps/launcher/CMakeLists.txt
apps/launcher/datafilespage.cpp
2012-03-05 23:43:59 +01:00
Nikolay Kasyanov
40e07bbd2a
Feature #161 (In Progress) Load REC_PGRD records
...
Struct sizes seems correct, but floats is broken
2012-03-03 18:27:38 +04:00
Marc Zinnschlag
be70d197e5
Merge branch 'next'
...
Conflicts:
.gitignore
cmake/FindOGRE.cmake
2012-03-02 12:11:44 +01:00
Marc Zinnschlag
a86d2877fc
Merge remote branch 'ace/win64-fixes'
2012-03-02 11:00:41 +01:00
Nikolay Kasyanov
b283ad86fb
revert to old launcher stylesheet location on OS X
2012-03-01 17:16:44 +04:00
Alexander "Ace" Olofsson
2c4ef5c670
64-bit install path on windows was easier to fix than expected.
2012-03-01 08:13:40 +01:00
Pieter van der Kloet
11ec5cf2e2
Stylesheet location changed in CMakeLists and some minor fixes to the launcher
2012-02-28 22:45:03 +01:00
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
2012-02-28 17:19:44 +01:00
Marc Zinnschlag
7505c96fbb
Merge remote branch 'lgro/master'
2012-02-26 12:59:11 +01:00
Lukasz Gromanowski
cb5534c608
Updated website URL in CMakeLists file.
...
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2012-02-26 12:12:00 +01:00
Nikolay Kasyanov
822f47fbac
Slightly changed OIS include dir var used specially for OS X. Should not change anything on other platforms
2012-02-25 18:05:29 +04:00
Pieter van der Kloet
280babc719
Fixed stylesheet and configuration problems with the launcher and code cleanup
2012-02-22 08:34:47 +01:00
Marc Zinnschlag
b2b09320fc
Merge branch 'config'
2012-02-21 13:55:58 +01:00
scrawl
694a537b57
- removed caelum sources, resources, build scripts
2012-02-21 00:14:20 +01:00
scrawl
f7462f980f
added Plugin_CgProgramManager (used for sky shaders) to apple's USED_OGRE_PLUGINS
2012-02-20 18:39:12 +01:00
Marc Zinnschlag
db205cf8aa
Merge remote branch 'scrawl/next' into test
...
Conflicts:
libs/openengine
2012-02-20 14:54:08 +01:00
scrawl
f81b615976
implemented script functions FadeIn, FadeOut, FadeTo
2012-02-18 18:25:28 +01:00
Alexander "Ace" Olofsson
6a71cf21b0
Added OpenAL redistributable to OpenMW installer
2012-02-16 08:52:26 +01:00
Marc Zinnschlag
d9c1ed3d5e
Merge remote branch 'corristo/osx-packaging' into config
2012-02-15 10:32:16 +01:00
Nikolay Kasyanov
57a4b19880
Feature #162 - Need to create app bundle using CMake, not by hand. Almost complete
2012-02-15 11:27:51 +04:00
Marc Zinnschlag
8277df04b1
bumping version number
2012-02-14 09:26:06 +01:00
Marc Zinnschlag
10d4771550
Merge remote branch 'corristo/osx-packaging'
2012-02-13 16:35:13 +01:00
Nikolay Kasyanov
5a42c6c6f5
Feature #162 - Need to create app bundle using CMake, not by hand WIP. Removed libpng dependency from launcher
2012-02-13 10:31:43 +04:00
Marc Zinnschlag
facc36fa34
Merge remote branch 'corristo/osx-packaging' into packaging
2012-02-12 13:35:54 +01:00
Nikolay Kasyanov
472d88e2c5
Feature #162 - Need to create app bundle using CMake, not by hand WIP
2012-02-01 20:48:13 +04:00
Alexander "Ace" Olofsson
72c4f75212
Only install redist if it exists
2012-01-29 23:12:40 +01:00
Alexander "Ace" Olofsson
4fe31fbd61
Simple windows packaging with CPack (NSIS)
2012-01-29 23:08:02 +01:00
