blob: 5c412e3e649b3b3934a5bc517a83f46b40dbc4c0 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
|
--- src/acinclude.m4
+++ src/acinclude.m4
@@ -107,7 +107,7 @@ int main (int argc, char *argv[])
with_zlib=yes,
with_zlib=no,
[AC_MSG_RESULT(cross-compiling)
- with_zlib=""
+ with_zlib="cross"
AC_MSG_WARN(Assuming zlib is available)])
if test x$with_zlib != x; then
@@ -116,7 +116,7 @@ fi
if test x$with_zlib = xyes; then
ZLIB_VERSION=$(<conf.zlibtest)
ifelse([$2], , :, [$2])
-else
+elif test x$with_zlib != xcross; then
ZLIB_CFLAGS=""
ZLIB_LIBS=""
ZLIB_VERSION=""
--- src/Makefile.in
+++ src/Makefile.in
@@ -103,8 +103,10 @@ main: makefile.dep $(Z_OBJS)
@ZC@ -o @ZSNESEXE@ $(Z_OBJS) @ZCFLAGS@ @LDFLAGS@
rm -f version.o
+BUILD_CXX ?= g++
+BUILD_CXXFLAGS ?= -O2 -pipe
$(PSR): parsegen.cpp
- @CXX@ @CXXFLAGS@ -o $@ $< -lz
+ $(BUILD_CXX) $(BUILD_CXXFLAGS) -o $@ $< -lz
TOOLSEXE=$(TOOL_D)/archopt $(TOOL_D)/cutrtype $(TOOL_D)/extraext\
$(TOOL_D)/macroll $(TOOL_D)/minwhite $(TOOL_D)/nreplace\
|
GitWeb
