fix CFLAGS problems

[supertux.git] / mk / jam / variant.jam

diff --git a/mk/jam/variant.jam b/mk/jam/variant.jam
index 2697579..12632e3 100644 (file)
--- a/mk/jam/variant.jam
+++ b/mk/jam/variant.jam
@@ -3,27 +3,10 @@
 #============================================================================
 
 VARIANT ?= optimize ;
-if $(VARIANT) != "debug" && $(VARIANT) != "optimize" && $(VARIANT) != "profile"
-{
-  exit "Invalid modus set, please set VARIANT to debug, profile or optimize" ;
-}
-
-switch $(VARIANT)
-{
-case optimize :
-    SHORTVARIANT = opt ;
-case debug :
-    SHORTVARIANT = dbg ;
-case profile :
-    SHORTVARIANT = prof ;
-}
 
 # Set modus related flags
-CCFLAGS += $(COMPILER_CFLAGS) $(COMPILER_CFLAGS_$(VARIANT)) ;
-C++FLAGS += $(COMPILER_CFLAGS) $(COMPILER_C++FLAGS)
-           $(COMPILER_CFLAGS_$(VARIANT)) $(COMPILER_C++FLAGS_$(VARIANT)) ;
-LINKLIBS += $(LDFLAGS) $(COMPILER_LFLAGS) $(COMPILER_LFLAGS_$(VARIANT)) ;
-LOCATE_OBJECTS = $(LOCATE_OBJECTS)/$(SHORTVARIANT) ;
+LIBS += $(LDFLAGS) ;
+LOCATE_OBJECTS = $(LOCATE_OBJECTS)/$(VARIANT) ;
 
 ##  SubVariant variantname
 ##    Specify subvarianet which are placed in separate compilation directories.