mirror of
				https://github.com/OpenMW/openmw.git
				synced 2025-10-31 20:26:43 +00:00 
			
		
		
		
	Merge remote-tracking branch 'corristo/master'
This commit is contained in:
		
						commit
						e03de11fa8
					
				
					 2 changed files with 9 additions and 0 deletions
				
			
		|  | @ -3,6 +3,11 @@ | |||
| #include <QDesktopWidget> | ||||
| #include <QMessageBox> | ||||
| #include <QDir> | ||||
| 
 | ||||
| #ifdef __APPLE__ | ||||
| // We need to do this because of Qt: https://bugreports.qt-project.org/browse/QTBUG-22154
 | ||||
| #define MAC_OS_X_VERSION_MIN_REQUIRED __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ | ||||
| #endif | ||||
| #include <SDL.h> | ||||
| 
 | ||||
| #include <cstdlib> | ||||
|  |  | |||
|  | @ -3,6 +3,10 @@ | |||
| #include <QDir> | ||||
| #include <QDebug> | ||||
| 
 | ||||
| #ifdef __APPLE__ | ||||
| // We need to do this because of Qt: https://bugreports.qt-project.org/browse/QTBUG-22154
 | ||||
| #define MAC_OS_X_VERSION_MIN_REQUIRED __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ | ||||
| #endif | ||||
| #include <SDL.h> | ||||
| 
 | ||||
| #include "maindialog.hpp" | ||||
|  |  | |||
		Loading…
	
		Reference in a new issue