From dcbaabb1f8b0b1085612e5aa4f0241846496b6fa Mon Sep 17 00:00:00 2001 From: Kris Lamoureux Date: Tue, 1 Jan 2013 20:32:56 -0800 Subject: [PATCH] Minor housekeeping --- LICENSE | 2 +- README.md | 8 +++++--- References.txt | 14 ++++++++++++++ core.cpp | 8 ++++---- main.h | 2 +- makefile | 2 +- 6 files changed, 26 insertions(+), 10 deletions(-) create mode 100644 References.txt diff --git a/LICENSE b/LICENSE index 8d5de07..e56998d 100644 --- a/LICENSE +++ b/LICENSE @@ -1,7 +1,7 @@ GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007 - Copyright (C) 2012 Kris Lamoureux + Copyright (C) 2012-2013 Kris Lamoureux Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. diff --git a/README.md b/README.md index 58fdfcc..5829bcf 100644 --- a/README.md +++ b/README.md @@ -7,8 +7,10 @@ Trololo is written in C++ with SDL 1.2.15 (32 bit) with the SDL extension librar ## License This software is released under the GNU General Public License Version 3. Please read the LICENSE file to know your rights before continuing. -## Support -* Windows 7 Home Premium 64 bit (Service Pack 1) (g++ 4.7.0) +## System Support +* Windows 7 Home Premium x86_64 (Service Pack 1) (g++ 4.7.0) +* Linux 3.2 Debian 6.0 x86_64 (g++ 4.4.5) ## Current State -This software doesn't do much yet. Nothing is guaranteed to compile but most of the time it should. Binary links will be added in future stable updates on the [latest readme on github](https://github.com/Kris619/Trololo/). \ No newline at end of file +This software doesn't do much yet. Nothing is guaranteed to compile but most of the time it should. Binary links will be added in future stable +updates on the [latest readme on github](https://github.com/Kris619/Trololo/). \ No newline at end of file diff --git a/References.txt b/References.txt new file mode 100644 index 0000000..e8d9596 --- /dev/null +++ b/References.txt @@ -0,0 +1,14 @@ + Bibliography + +Kratochvil, Petr. Pool Tiles Underwater. Digital image. Free Stock Photo - Public + Domain Pictures. N.p., n.d. Web. 28 Oct. 2012. + . + +OCAL. Illustration Of A Blue Codfish. Digital image. Free Stock Photos. N.p., n.d. + Web. 28 Oct. 2012. . + +Trollface. Digital image. Wikipedia. N.p., n.d. Web. 28 Oct. 2012. + . + diff --git a/core.cpp b/core.cpp index b0d7268..bf9e771 100644 --- a/core.cpp +++ b/core.cpp @@ -93,7 +93,7 @@ namespace scrns } // Set window title - SDL_WM_SetCaption(WINDOW_TITLE, 0); + SDL_WM_SetCaption(WINDOW_TITLE " " VERSION, 0); // Initialize SDL_ttf and check @@ -119,8 +119,8 @@ namespace scrns // Image filenames - const char *background_image = "stage1.bmp"; - const char *characters_image = "characters.bmp"; + const char *background_image = "bin/stage1.bmp"; + const char *characters_image = "bin/characters.bmp"; // Char SDL_Rect clip[2]; @@ -164,7 +164,7 @@ namespace scrns // Setup welcome text SDL_Color whitecolor = { 255, 255, 255 }; - TTF_Font *font = TTF_OpenFont("CaviarDreams.ttf", 80); + TTF_Font *font = TTF_OpenFont("bin/CaviarDreams.ttf", 80); const char* text = "Welcome to Trololo"; diff --git a/main.h b/main.h index fa8731b..aa1b219 100644 --- a/main.h +++ b/main.h @@ -22,7 +22,7 @@ namespace scrnfunk bool RemoveColor(SDL_Surface* image, Uint8 R, Uint8 G, Uint8); } -#define VERSION 0.1-alpha +#define VERSION "0.1-alpha" #define WINDOW_TITLE "Trololo" #endif diff --git a/makefile b/makefile index b6994d6..4f74a82 100644 --- a/makefile +++ b/makefile @@ -1,4 +1,4 @@ SDL_LIBS=`pkg-config --libs sdl` -lSDL -lSDL_image -lSDL_ttf INCLUDES=-I/opt/local/include all: - g++ -Wall -g main.cpp core.cpp main.h -o Trololo ${INCLUDES} ${SDL_LIBS} + g++ -Wall main.cpp core.cpp main.h -o Trololo ${INCLUDES} ${SDL_LIBS}