diff --git a/Makefile b/Makefile index 9e9e7a9..7013b6a 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ CXXFLAGS ?= -O2 -Wall -g -CXXFLAGS += `pkg-config --cflags sdl2 SDL2_image SDL2_mixer` -DLINUX +CXXFLAGS += `pkg-config --cflags sdl2 SDL2_image SDL2_mixer` LIBS = `pkg-config --libs sdl2 SDL2_image SDL2_mixer` OBJS = alien.o audio.o bullets.o cargo.o collectable.o comms.o debris.o events.o explosions.o game.o globals.o graphics.o init.o intermission.o loadSave.o messages.o misc.o missions.o player.o resources.o script.o shop.o Starfighter.o title.o weapons.o diff --git a/src/init.cpp b/src/init.cpp index f40bea4..e42a048 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -19,12 +19,10 @@ along with this program. If not, see . #include "Starfighter.h" -#if LINUX #include #include #include #include -#endif /* Initalises a whole load of variables @@ -109,7 +107,6 @@ This bit is just for Linux users. It attempts to get the user's home directory, then creates the .parallelrealities and .parallelrealities/starfighter directories so that saves and temporary data files can be written there. Good, eh? :) */ -#if LINUX static void setupUserHomeDirectory() { char *userHome; @@ -144,7 +141,6 @@ static void setupUserHomeDirectory() sprintf(engine.userHomeDirectory, "%s/.parallelrealities/starfighter/", userHome); } -#endif /* Chugg chugg chugg.... brrr... chugg chugg chugg...brrrrrr... chugg ch.. @@ -154,9 +150,7 @@ void initSystem() { strcpy(engine.userHomeDirectory, ""); - #if LINUX - setupUserHomeDirectory(); - #endif + setupUserHomeDirectory(); /* Initialize the SDL library */ if (SDL_Init(SDL_INIT_VIDEO|SDL_INIT_AUDIO|SDL_INIT_JOYSTICK) < 0) diff --git a/src/structs.h b/src/structs.h index bf5604c..33d6ab2 100644 --- a/src/structs.h +++ b/src/structs.h @@ -290,7 +290,6 @@ struct globalEngineVariables { bool useMusic; bool fullScreen; - // This really only applies to Linux users. char userHomeDirectory[1024]; char keyState[KEY_LAST];