1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-21 08:53:52 +00:00
Commit graph

120 commits

Author SHA1 Message Date
slothlife
20dabaead9 Fix CMake scripts to link static dependencies
Added FindDirectX scripts from Ogre so that FindOgre.cmake doesn't
fail silently to find the libraries correctly.

Modified top-level CMakelists.txt:
- Correctly set include dirs, preprocessor definitions, and add
  libraries for static Ogre plugins.
- Correctly set preprocessor definitions for static MyGUI.

Modified launcher, openmw, and opencs to link the static Ogre plugins.

Fixed FindSDL2.cmake to set a variable that contains only the SDL2
library, so that the launcher doesn't incorrectly link against
SDL2main.

Fixed FindMyGUI.cmake to correctly look for static variants.

Fixed FindOgre.cmake to set variables for DirectX plugins correctly.
2014-06-02 02:51:04 -05:00
pvdk
5af12d193a Cleaned up old wizard stuff from launcher 2014-05-29 17:57:41 +02:00
pvdk
bf6103a3a4 Merge branch 'wizardtab' into wizard
Conflicts:
	files/ui/mainwindow.ui
2014-03-30 23:16:48 +02:00
pvdk
c54217d008 Merge remote-tracking branch 'upstream/master' into HEAD
Conflicts:
	CMakeLists.txt
	components/CMakeLists.txt
	components/config/gamesettings.cpp
2014-02-19 19:26:07 +01:00
pvdk
802448b217 Added a settings page to the launcher 2014-01-27 20:14:02 +01:00
Scott Howard
2f082ef796 remove unneeded libraries 2013-12-29 16:25:49 -05:00
pvdk
095ff4e17a Moved launcher settings stuff into components, so they can be reused in the wizard 2013-12-25 00:50:25 +01:00
graffy76
f9591ddda6 Reimplemented constentselector view class 2013-10-22 21:52:35 -05:00
graffy76
217a4d75b4 Implemented profile function in launcher datafiles page
Implemented dependency sorting to ensure dependent files appear latest
in the list.
2013-10-06 21:13:47 -05:00
Alexander "Ace" Olofsson
5e42c73356 Better fix for unshield, comments on changes, no more commented out code. 2013-09-05 10:39:17 +02:00
Tom Mason
06ff40eda7 only use unshield on not windows 2013-08-19 20:20:08 +01:00
Tom Mason
865a7c63df cmake for system libunshield 2013-08-19 20:20:00 +01:00
Tom Mason
454b64974d filenames 2013-08-19 20:19:35 +01:00
Tom Mason
ceb3317807 Integrate unshield with launcher 2013-08-19 20:19:01 +01:00
Sebastian Wick
a1fea97c3b use SDL for resolution -> multimonitor support 2013-06-23 03:49:30 +02:00
Bret Curtis
c1ec16986b add cmake fix for compiling with binutils >= 2.23 which requires explicit linking for dl<friends> and Xt 2013-04-17 12:04:05 +02:00
pvdk
31ba332647 Moved Windows icon to files/launcher 2013-03-12 04:05:14 +01:00
Pieter van der Kloet
7504ae675b Implemented a file dialog for the editor using launcher .ui 2013-03-07 03:00:59 +01:00
Pieter van der Kloet
4c9d0563fe WIP: Implementing the .ui for the DataFilesPage 2013-03-05 03:13:39 +01:00
Pieter van der Kloet
f2193bb1ba Made the mainwindow use a .ui file and removed the stylesheet 2013-03-03 00:48:09 +01:00
Pieter van der Kloet
2b6bb9657b Added Qt Designer .ui files 2013-03-02 23:49:31 +01:00
Pieter van der Kloet
2172fb4229 Added checkable message box class 2013-02-19 16:41:33 +01:00
Pieter van der Kloet
35b68a3c40 Fixed accidental profile deletion and added sorting by date 2013-02-19 15:58:01 +01:00
Pieter van der Kloet
ee27e3bb58 Merge remote-tracking branch 'upstream/next' into settingsnext
Conflicts:
	apps/launcher/CMakeLists.txt
	apps/launcher/datafilespage.cpp
	apps/launcher/datafilespage.hpp
	apps/launcher/graphicspage.cpp
	components/fileorderlist/utils/filedialog.cpp
	components/fileorderlist/utils/filedialog.hpp
2013-02-15 15:21:14 +01:00
Pieter van der Kloet
aa25471517 WIP: working on improving the config file handling 2013-02-11 15:01:00 +01:00
Michal Sciubidlo
66ec4ca7d9 Split launcher specific code from DataFilesList back to DataFilesPage. 2013-02-04 22:14:14 +01:00
Michal Sciubidlo
f029a9011a Move datafilespage to shared space. 2013-01-30 20:21:03 +01:00
Pieter van der Kloet
25edba0887 Rewriting the config code of the pages to use the new settings classes 2013-01-27 16:39:51 +01:00
Pieter van der Kloet
6faf6f57e1 Added settings file reader/writers for openmw.cfg and settings.cfg 2013-01-25 05:19:06 +01:00
Marc Zinnschlag
648b53ef93 removed unused launcher.cfg file 2012-10-31 10:09:27 +01:00
Pieter van der Kloet
fe9120bcb3 Added support for the profiles and made creation/editing them more user friendly 2012-10-23 01:47:07 +02:00
pvdk
85aaacb41a Some cleaning of the launcher source dir 2012-10-12 02:25:14 +02:00
Pieter van der Kloet
4174d3c235 Added new plugin model for the Data Files tab in the launcher 2012-10-10 21:31:40 +02:00
Lukasz Gromanowski
34513cf16b Added support for code coverage checking and unittests.
Added support for code coverage checking with gcov and
unittests with Google C++ unittest and GMock frameworks.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2012-08-19 22:23:46 +03:00
Pieter van der Kloet
f81e127701 Created custom directory dialog which only accepts Data Files dirs 2012-06-17 06:48:32 +02:00
Pieter van der Kloet
4488be33ce Added missing slash to launcher CMakeLists.txt 2012-03-29 00:12:34 +02: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
Pieter van der Kloet
96c0b8760e Got rid of the console showing up on Windows and removed libpng stuff 2012-03-12 02:37:40 +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
b283ad86fb revert to old launcher stylesheet location on OS X 2012-03-01 17:16:44 +04: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
Nikolay Kasyanov
d58b408ae1 Deploying Qt image format plugins on OS X considered useless 2012-02-27 19:00:06 +04: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
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
Nikolay Kasyanov
472d88e2c5 Feature #162 - Need to create app bundle using CMake, not by hand WIP 2012-02-01 20:48:13 +04:00
Marc Zinnschlag
9794c4b928 Merge branch 'cmake' 2011-11-06 14:42:18 +01:00
Marc Zinnschlag
cb1373a4c7 rewrote cmake scripts for components 2011-11-06 09:30:15 +01:00
Pieter van der Kloet
9e34f30500 Merge remote-tracking branch 'upstream/master' 2011-10-04 00:40:41 +02:00
Marc Zinnschlag
22514cbd4c Merge branch 'debfix' 2011-09-30 09:36:21 +02:00
Marc Zinnschlag
9872c89539 packaging fixes for .deb packages 2011-09-30 09:36:06 +02:00
Pieter van der Kloet
6bfaf221e8 Created working icon for Windows and removed QMake file (not parsed by CMake) 2011-09-28 02:57:57 +02:00
Lukasz Gromanowski
ea7eb7a62d fixes #128 Configuration cleanup.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2011-08-19 21:06:09 +02:00
Nikolay Kasyanov
24947d800a Fixed launcher config and style location. Launcher will be started when opening bundle 2011-06-26 21:04:17 +04:00
Pieter van der Kloet
1278ce2514 Fixed problem with png images 2011-06-26 15:37:06 +02:00
Pieter van der Kloet
db20186e50 Added newline to the end of some files, GitHub was complaining about it 2011-06-24 21:46:20 +02:00
Pieter van der Kloet
118765a274 Renamed the launcher executable and icons, added .desktop file and default config, modified/updated some other files 2011-06-24 21:42:18 +02:00
Pieter van der Kloet
15df25f947 Cleaned up the CMakeList file 2011-06-24 17:37:12 +02:00
Pieter van der Kloet
410229e521 Dropped plugins now retain their selection so you can see where they went 2011-06-08 16:55:53 +02:00
Pieter van der Kloet
9d2bf8af62 Added support for the load order of plugins specified in the profiles 2011-06-07 01:42:53 +02:00
Pieter van der Kloet
314bac7862 Preliminary support for new profiles and some other modifications and cleanups 2011-05-02 22:21:42 +02:00
Pieter van der Kloet
557e659e15 CMake modifications, stylesheet gets copied to destination dir now 2011-05-02 20:07:37 +02:00
Pieter van der Kloet
7747c78584 Fixed the use of path.hpp, which is in a CMake component now
Also fixed some leftover lines from a wrongly modified conflict
2011-04-28 22:23:42 +02:00
Pieter van der Kloet
0fc4767846 Some renaming and ugly support for getPath 2011-04-28 21:55:09 +02:00
Pieter van der Kloet
4ee748552b More messing around with the launcher config file 2011-04-28 21:55:09 +02:00
Pieter van der Kloet
c911f62e8b Added ability to get the previous profile when a new one is selected 2011-04-28 21:55:07 +02:00
Pieter van der Kloet
d1a75253d7 Huge rewrite, implementing all the new ideas for the launcher 2011-04-28 21:54:41 +02:00
Pieter van der Kloet
fbdc10f0b0 Removed some leftover files and more testing 2011-04-27 12:34:52 +02:00
Pieter van der Kloet
74eef82902 Messing around with a new datafilesdialog 2011-04-27 12:34:44 +02:00
Pieter van der Kloet
7a03266729 Initial commit of the launcher 2011-03-29 01:36:26 +02:00