walkero
/
starfighter
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

changed OS X style SDL includes back to Linux style

This commit is contained in:
Richard Smith 2016-08-04 20:58:38 +01:00
parent 0affc31f1e
commit 65c773cafb
8 changed files with 19 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mac/starfighter.xcodeproj/project.pbxproj
View File

@ -436,6 +436,11 @@
"$(PROJECT_DIR)", "$(PROJECT_DIR)",
); );
GCC_PREPROCESSOR_DEFINITIONS = "VERSION=\\\"1.5.1\\\""; GCC_PREPROCESSOR_DEFINITIONS = "VERSION=\\\"1.5.1\\\"";
HEADER_SEARCH_PATHS = (
SDL2.framework/Headers,
SDL2_mixer.framework/Headers,
SDL2_image.framework/Headers,
);
INFOPLIST_FILE = starfighter/Info.plist; INFOPLIST_FILE = starfighter/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = uk.me.fantastic.starfighter; PRODUCT_BUNDLE_IDENTIFIER = uk.me.fantastic.starfighter;
@ -453,6 +458,11 @@
"$(PROJECT_DIR)", "$(PROJECT_DIR)",
); );
GCC_PREPROCESSOR_DEFINITIONS = "VERSION=\\\"1.5.1\\\""; GCC_PREPROCESSOR_DEFINITIONS = "VERSION=\\\"1.5.1\\\"";
HEADER_SEARCH_PATHS = (
SDL2.framework/Headers,
SDL2_mixer.framework/Headers,
SDL2_image.framework/Headers,
);
INFOPLIST_FILE = starfighter/Info.plist; INFOPLIST_FILE = starfighter/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = uk.me.fantastic.starfighter; PRODUCT_BUNDLE_IDENTIFIER = uk.me.fantastic.starfighter;

4
src/Starfighter.cpp
View File

@ -20,6 +20,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "Starfighter.h" #include "Starfighter.h"
#ifdef __APPLE__
#include "CoreFoundation/CoreFoundation.h"
#endif
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
bool cheatAttempt; bool cheatAttempt;

7
src/Starfighter.h
View File

@ -28,16 +28,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <sys/stat.h> #include <sys/stat.h>
#include <unistd.h> #include <unistd.h>
#ifdef __APPLE__
#include <SDL2/SDL.h>
#include <SDL2_image/SDL_image.h>
#include <SDL2_mixer/SDL_mixer.h>
#include "CoreFoundation/CoreFoundation.h"
#else
#include "SDL.h" #include "SDL.h"
#include "SDL_image.h" #include "SDL_image.h"
#include "SDL_mixer.h" #include "SDL_mixer.h"
#endif
#include "defs.h" #include "defs.h"
#include "structs.h" #include "structs.h"

2
src/colors.cpp
View File

@ -17,6 +17,8 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include <SDL.h>
#include "Starfighter.h" #include "Starfighter.h"
Uint32 red; Uint32 red;

5
src/engine.h
View File

@ -20,12 +20,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#ifndef GLOBALS_H #ifndef GLOBALS_H
#define GLOBALS_H #define GLOBALS_H
#ifdef __APPLE__
#include <SDL2/SDL.h>
#else
#include "SDL.h" #include "SDL.h"
#endif
#include "defs.h" #include "defs.h"
#include "structs.h" #include "structs.h"

5
src/renderer.cpp
View File

@ -17,12 +17,7 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifdef __APPLE__
#include <SDL2/SDL.h>
#else
#include "SDL.h" #include "SDL.h"
#endif
#include "screen.h" #include "screen.h"

2
src/screen.cpp
View File

@ -19,6 +19,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <stdlib.h> #include <stdlib.h>
#include "SDL.h"
#include "engine.h" #include "engine.h"
#include "gfx.h" #include "gfx.h"
#include "structs.h" #include "structs.h"

6
src/window.cpp
View File

@ -17,11 +17,7 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifdef __APPLE__
#include <SDL2/SDL.h>
#else
#include "SDL.h"
#endif
#include "SDL.h"
SDL_Window *window; SDL_Window *window;