Pārlūkot izejas kodu

Some cleaning out

Eiyeron Fulmincendii 9 gadi atpakaļ
vecāks
revīzija
176461d42d
3 mainītis faili ar 4 papildinājumiem un 3 dzēšanām
  1. 2 1
      Makefile
  2. 1 1
      platform/sfml/rules.mk
  3. 1 1
      rules.mk

+ 2 - 1
Makefile

@@ -14,7 +14,8 @@ CFLAGS = $(CFLAGS_COMMON) -std=gnu11
 
 CPPFLAGS = $(CFLAGS_COMMON) -std=gnu++11
 
-LDFLAGS = $(CFLAGS_COMMON) -fuse-ld=gold -lz
+LIBS = -lz
+LDFLAGS = $(CFLAGS_COMMON) -fuse-ld=gold
 
 SRCS_C :=
 SRCS_CPP :=

+ 1 - 1
platform/sfml/rules.mk

@@ -4,7 +4,7 @@ SRCS_C += $(wildcard $(sfml_LOCAL_PATH)/platform/*.c)
 SRCS_CPP += $(wildcard $(sfml_LOCAL_PATH)/*.cpp)
 INCLUDE += $(sfml_LOCAL_PATH)/public
 
-LDFLAGS += -lstdc++ -lsfml-window -lsfml-graphics -lsfml-system
+LIBS += -lstdc++ -lsfml-window -lsfml-graphics -lsfml-system
 
 CFLAGS_COMMON += -DTARGET_SFML=1
 

+ 1 - 1
rules.mk

@@ -33,7 +33,7 @@ $(OUT)/%.o: %.cpp | $(BUILT_SRCS)
 $(ELF): $(OBJS)
 	@mkdir -p $(dir $@)
 	@echo "CCLD: $@"
-	@+$(CC) $(LDFLAGS) $^ -o $(ELF)
+	@+$(CC) $(LDFLAGS) $(LIBS) $^ -o $(ELF)
 
 clean:
 	@echo "RM: $(OUT)"