git » fp-git.git » commit 0f4c953

fullscreen setup in makefile

author ecalot
2005-02-24 00:13:12 UTC
committer ecalot
2005-02-24 00:13:12 UTC
parent f8a8d4e521502d571f29ba9448d37d3468bfb821

fullscreen setup in makefile

FP/doc/CHANGELOG +1 -0
FP/doc/INSTALL +16 -15
FP/src/Makefile +2 -1
FP/src/out/output.c +0 -3

diff --git a/FP/doc/CHANGELOG b/FP/doc/CHANGELOG
index 0c5b44a..811e86b 100644
--- a/FP/doc/CHANGELOG
+++ b/FP/doc/CHANGELOG
@@ -18,3 +18,4 @@ Versions
  - Rebuilt tile handling library
  - Tested BSD port
  - Titles and presentations sent to a configuration file
+ - Coded lives
diff --git a/FP/doc/INSTALL b/FP/doc/INSTALL
index afc043d..f2bf4a8 100644
--- a/FP/doc/INSTALL
+++ b/FP/doc/INSTALL
@@ -40,21 +40,22 @@ If you are using debian you can install the packages just typing:
 apt-get install wget gcc make libsdl1.2-dev bzip2 tar
 
 Make options:
-- make            compiles only the latest modified sources
-- make build      compiles all the sources
-- make install    downloads dat files and compiles the game
-- make checks     checks for the programs needed to perform a right compilation
-- make clean      deletes all the files that are generated by make
-                  except the ones that have been downloaded.
-                  Note that this is not dangerous at all because make build
-                  will regenerate them.
-- make download   downloads the dat files, generate index
-- make headers    parses the configuration files and builds the headers.
-                  This uses all the awk stuff and is very useful to make a
-                  package for other machines without awk installed (e.g.
-                  machines running Windows systems).
-- make it         does all the necesary stuff to run the game and runs it
-- make run        runs a compiled game
+- make             compiles only the latest modified sources
+- make build       compiles all the sources
+- make install     downloads dat files and compiles the game
+- make checks      checks for the programs needed to perform a right compilation
+- make clean       deletes all the files that are generated by make
+                   except the ones that have been downloaded.
+                   Note that this is not dangerous at all because make build
+                   will regenerate them.
+- make download    downloads the dat files, generate index
+- make headers     parses the configuration files and builds the headers.
+                   This uses all the awk stuff and is very useful to make a
+                   package for other machines without awk installed (e.g.
+                   machines running Windows systems).
+- make it          does all the necesary stuff to run the game and runs it
+- make run         runs a compiled game
+- make build FS='' rebuilds the game in a non-fullscreen mode
 
 CVS nightly tarballs:
 ~~~~~~~~~~~~~~~~~~~~
diff --git a/FP/src/Makefile b/FP/src/Makefile
index 7e927cd..c1b9b43 100644
--- a/FP/src/Makefile
+++ b/FP/src/Makefile
@@ -35,7 +35,8 @@ LIBS          = $(shell sdl-config --libs --cflags)
 #LIBS         = -L/usr/local/lib -lSDL-1.1 -pthread 
 
 #Defines
-DEFINES       = -DOS=\"$(OS)\" $(LINUX) 
+FS            = -DOUTPUT_FULLSCREEN
+DEFINES       = -DOS=\"$(OS)\" $(LINUX) $(FS)
 
 #Release type
 TYPE          = Debug
diff --git a/FP/src/out/output.c b/FP/src/out/output.c
index a8db982..dde8754 100644
--- a/FP/src/out/output.c
+++ b/FP/src/out/output.c
@@ -49,9 +49,6 @@ output.c: Free Prince : Output Devices Handler
 #define DEF_SCREEN_WIDTH  320
 #define DEF_SCREEN_HEIGHT 200
 
-#define OUTPUT_FULLSCREEN
-
-
 #ifdef OUTPUT_FULLSCREEN
 #define fullscreen SDL_FULLSCREEN
 #else