Merge branch 'master' into releases

[rocksndiamonds.git] / src / Makefile

diff --git a/src/Makefile b/src/Makefile
index 18efb9d99ddb5aca2cc28450dfceba27afba9d21..eee3bac4f2203a9c2bd7bbff2d5691440608fdee 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -42,7 +42,7 @@ PLATFORM = unix
 endif
 
 ifeq ($(PLATFORM),unix)
-PROFILING = -pg
+PROFILING_FLAGS = -pg
 endif
 
 ifeq ($(PLATFORM),cross-msdos)
@@ -90,12 +90,13 @@ CONFIG_GAME_DIR = $(CONFIG_RO_GAME_DIR) $(CONFIG_RW_GAME_DIR)
 
 CONFIG = $(CONFIG_GAME_DIR) $(CONFIG_SCORE_ENTRIES) $(JOYSTICK)
 DEBUG = -DDEBUG -g
+# PROFILING = $(PROFILING_FLAGS)
 
-OPTIONS = $(DEBUG) -Wall                       # only for debugging purposes
+# OPTIONS = $(DEBUG) -Wall                     # only for debugging purposes
 # OPTIONS = $(DEBUG) -O3 -Wall                 # only for debugging purposes
 # OPTIONS = $(DEBUG) -Wall -ansi -pedantic     # only for debugging purposes
 # OPTIONS = -O3 -Wall -ansi -pedantic
-# OPTIONS = -O3 -Wall
+OPTIONS = -O3 -Wall
 # OPTIONS = -O3
 # OPTIONS = -DSYSV -Ae                         # may be needed for HP-UX