attract: respect cflags
This commit is contained in:
parent
1cbd04a8d9
commit
e2608cc90b
2 changed files with 18 additions and 9 deletions
|
@ -1,16 +1,16 @@
|
||||||
diff --git a/Makefile.orig b/Makefile
|
diff --git a/Makefile b/Makefile
|
||||||
index 4f4793a9a69..b1f7cf469f4 100644
|
index 4f4793a..82387e0 100644
|
||||||
--- a/Makefile.orig
|
--- a/Makefile
|
||||||
+++ b/Makefile
|
+++ b/Makefile
|
||||||
@@ -69,15 +69,10 @@
|
@@ -69,15 +69,7 @@
|
||||||
|
|
||||||
FE_VERSION=v2.7.0
|
FE_VERSION=v2.7.0
|
||||||
|
|
||||||
-CC=gcc
|
-CC=gcc
|
||||||
-CXX=g++
|
-CXX=g++
|
||||||
CFLAGS=
|
-CFLAGS=
|
||||||
CXXFLAGS=-std=c++11 $(EXTRA_CXXFLAGS)
|
-CXXFLAGS=-std=c++11 $(EXTRA_CXXFLAGS)
|
||||||
CPPFLAGS=
|
-CPPFLAGS=
|
||||||
-STRIP=strip
|
-STRIP=strip
|
||||||
-OBJCOPY=objcopy
|
-OBJCOPY=objcopy
|
||||||
PKG_CONFIG=pkg-config
|
PKG_CONFIG=pkg-config
|
||||||
|
@ -18,7 +18,16 @@ index 4f4793a9a69..b1f7cf469f4 100644
|
||||||
ARFLAGS=rc
|
ARFLAGS=rc
|
||||||
RM=rm -f
|
RM=rm -f
|
||||||
MD=mkdir -p
|
MD=mkdir -p
|
||||||
@@ -512,7 +507,7 @@ $(OBJ_DIR)/%.o: $(SRC_DIR)/%.mm $(DEP) | $(OBJ_DIR)
|
@@ -308,7 +300,7 @@ ifeq ($(FE_DEBUG),1)
|
||||||
|
FE_FLAGS += -DFE_DEBUG
|
||||||
|
ENABLE_DEBUG_SYMBOLS=1
|
||||||
|
else
|
||||||
|
- CPPFLAGS += -O$(OPTIMIZE) -DNDEBUG
|
||||||
|
+ CPPFLAGS += -DNDEBUG
|
||||||
|
endif
|
||||||
|
|
||||||
|
ifeq ($(USE_GLES),1)
|
||||||
|
@@ -512,7 +504,7 @@ $(OBJ_DIR)/%.o: $(SRC_DIR)/%.mm $(DEP) | $(OBJ_DIR)
|
||||||
|
|
||||||
$(EXE): $(OBJ) $(EXPAT) $(SQUIRREL) $(AUDIO)
|
$(EXE): $(OBJ) $(EXPAT) $(SQUIRREL) $(AUDIO)
|
||||||
$(EXE_MSG)
|
$(EXE_MSG)
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
# Template file for 'attract'
|
# Template file for 'attract'
|
||||||
pkgname=attract
|
pkgname=attract
|
||||||
version=2.7.0
|
version=2.7.0
|
||||||
revision=1
|
revision=2
|
||||||
build_style=gnu-makefile
|
build_style=gnu-makefile
|
||||||
make_build_args="VERBOSE=1"
|
make_build_args="VERBOSE=1"
|
||||||
make_use_env=yes
|
make_use_env=yes
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue