Skip to content

Commit 6c35249

Browse files
committed
attract: rebuild for SFML 3.1.0
1 parent 257be97 commit 6c35249

4 files changed

Lines changed: 3524 additions & 21 deletions

File tree

Lines changed: 29 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
diff --git a/Makefile b/Makefile
2-
index 4f4793a..82387e0 100644
2+
index 4f4793a..cee0362 100644
33
--- a/Makefile
44
+++ b/Makefile
5-
@@ -69,15 +69,7 @@
5+
@@ -69,15 +69,8 @@
66

77
FE_VERSION=v2.7.0
88

@@ -13,26 +13,47 @@ index 4f4793a..82387e0 100644
1313
-CPPFLAGS=
1414
-STRIP=strip
1515
-OBJCOPY=objcopy
16+
+CXXFLAGS=-std=c++17 -ggdb
1617
PKG_CONFIG=pkg-config
1718
-AR=ar
1819
ARFLAGS=rc
1920
RM=rm -f
2021
MD=mkdir -p
21-
@@ -308,7 +300,7 @@ ifeq ($(FE_DEBUG),1)
22+
@@ -303,13 +296,13 @@ endif
23+
#
24+
# Now process the various settings...
25+
#
26+
-ifeq ($(FE_DEBUG),1)
27+
+# ifeq ($(FE_DEBUG),1)
28+
CPPFLAGS += -Wall
2229
FE_FLAGS += -DFE_DEBUG
2330
ENABLE_DEBUG_SYMBOLS=1
24-
else
31+
-else
2532
- CPPFLAGS += -O$(OPTIMIZE) -DNDEBUG
26-
+ CPPFLAGS += -DNDEBUG
27-
endif
33+
-endif
34+
+# else
35+
+# CPPFLAGS += -DNDEBUG
36+
+# endif
2837

2938
ifeq ($(USE_GLES),1)
30-
@@ -512,7 +504,7 @@ $(OBJ_DIR)/%.o: $(SRC_DIR)/%.mm $(DEP) | $(OBJ_DIR)
39+
FE_FLAGS += -DUSE_GLES
40+
@@ -512,14 +505,14 @@ $(OBJ_DIR)/%.o: $(SRC_DIR)/%.mm $(DEP) | $(OBJ_DIR)
3141

3242
$(EXE): $(OBJ) $(EXPAT) $(SQUIRREL) $(AUDIO)
3343
$(EXE_MSG)
3444
- $(CXX) -o $@ $^ $(CXXFLAGS) $(CPPFLAGS) $(FE_FLAGS) $(LIBS)
3545
+ $(CXX) -o $@ $^ $(LDFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(FE_FLAGS) $(LIBS)
3646
ifeq ($(ENABLE_DEBUG_SYMBOLS),1)
3747
$(DEBUG_MSG)
38-
$(SILENT)$(OBJCOPY) --only-keep-debug $@ $@.debug
48+
- $(SILENT)$(OBJCOPY) --only-keep-debug $@ $@.debug
49+
- $(SILENT)$(STRIP) --strip-debug --strip-unneeded $@
50+
- $(SILENT)$(OBJCOPY) --add-gnu-debuglink=$@.debug $@
51+
+ # $(SILENT)$(OBJCOPY) --only-keep-debug $@ $@.debug
52+
+ # $(SILENT)$(STRIP) --strip-debug --strip-unneeded $@
53+
+ # $(SILENT)$(OBJCOPY) --add-gnu-debuglink=$@.debug $@
54+
else
55+
- $(SILENT)$(STRIP) $@
56+
+ # $(SILENT)$(STRIP) $@
57+
endif
58+
59+
.PHONY: clean

0 commit comments

Comments
 (0)