Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplify SDL includes (especially for the mac build).

master
dak180 2011-12-15 12:47:41 -05:00
parent 7cfc7b7fc7
commit 8e1c6578a1
8 changed files with 75 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
3rdparty/SDL/mac/include/SDL.h vendored Normal file
View File

@ -0,0 +1,23 @@
/*
This file is part of Warzone 2100.
Copyright (C) 2011 Warzone 2100 Project
Warzone 2100 is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
Warzone 2100 is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with Warzone 2100; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
/** @file
* @brief Platform independent SDL inclusion.
*/
#include <SDL/SDL.h>

23
3rdparty/SDL/mac/include/SDL_events.h vendored Normal file
View File

@ -0,0 +1,23 @@
/*
This file is part of Warzone 2100.
Copyright (C) 2011 Warzone 2100 Project
Warzone 2100 is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
Warzone 2100 is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with Warzone 2100; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
/** @file
* @brief Platform independent SDL inclusion.
*/
#include <SDL/SDL_events.h>

23
3rdparty/SDL/mac/include/SDL_syswm.h vendored Normal file
View File

@ -0,0 +1,23 @@
/*
This file is part of Warzone 2100.
Copyright (C) 2011 Warzone 2100 Project
Warzone 2100 is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
Warzone 2100 is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with Warzone 2100; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
/** @file
* @brief Platform independent SDL inclusion.
*/
#include <SDL/SDL_syswm.h>

2
lib/framework/input.h
View File

@ -156,7 +156,7 @@ enum MOUSE_KEY_CODE
MOUSE_BAD
};
#else // BACKEND_QT
#include <SDL/SDL.h>
#include <SDL.h>
enum KEY_CODE
{
KEY_ESC =SDLK_ESCAPE,

4
lib/sdl/main_sdl.cpp
View File

@ -6,9 +6,7 @@
#include "lib/ivis_opengl/pieclip.h"
#include "lib/gamelib/gtime.h"
#include "src/warzoneconfig.h"
#include <SDL/SDL.h>
#include <SDL/SDL_thread.h>
#include <SDL/SDL_timer.h>
#include <SDL.h>
#include <QtCore/QSize>
#include <QtCore/QString>
#include "scrap.h"

4
lib/sdl/scrap.cpp
View File

@ -23,8 +23,8 @@
#include "lib/framework/frame.h"
#include <SDL/SDL.h>
#include <SDL/SDL_syswm.h>
#include <SDL.h>
#include <SDL_syswm.h>
#include "scrap.h"

1
macosx/configs/Project-All.xcconfig
View File

@ -28,3 +28,4 @@ LIBRARY_SEARCH_PATHS_QUOTED_2 = "$(SRCROOT)/build/$(CONFIGURATION)"
LIBRARY_SEARCH_PATHS_QUOTED_3 = "$(SRCROOT)/external/QT"
HEADER_SEARCH_PATHS_QUOTED_1 = "$(SRCROOT)/external/glew/include/**"
HEADER_SEARCH_PATHS_QUOTED_2 = "$(SRCROOT)/../3rdparty/SDL/mac/include"

2
macosx/configs/Warzone-All.xcconfig
View File

@ -14,7 +14,7 @@ WRAPPER_EXTENSION = app
FRAMEWORK_SEARCH_PATHS = $(inherited) $(FRAMEWORK_SEARCH_PATHS_QUOTED_1) $(FRAMEWORK_SEARCH_PATHS_QUOTED_2) $(FRAMEWORK_SEARCH_PATHS_QUOTED_3) $(FRAMEWORK_SEARCH_PATHS_QUOTED_4)
HEADER_SEARCH_PATHS = $(inherited) $(HEADER_SEARCH_PATHS_QUOTED_1)
HEADER_SEARCH_PATHS = $(inherited) $(HEADER_SEARCH_PATHS_QUOTED_1) $(HEADER_SEARCH_PATHS_QUOTED_2)
LIBRARY_SEARCH_PATHS = $(inherited) $(LIBRARY_SEARCH_PATHS_QUOTED_1) $(LIBRARY_SEARCH_PATHS_QUOTED_3)