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
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
|
--- a/gtk/configure.ac
+++ b/gtk/configure.ac
@@ -33,7 +33,7 @@
AM_GLIB_GNU_GETTEXT
-snes9xlocaledir='${prefix}/${DATADIRNAME}/locale'
+snes9xlocaledir='$(localedir)'
AC_SUBST(snes9xlocaledir)
AC_ARG_WITH(debug,
--- a/unix/configure.ac
+++ b/unix/configure.ac
@@ -56,49 +56,6 @@
# *** Execution begins here ***
# *****************************
-# Remove -g and -O2 flags manually.
-
-if test "x$CFLAGS" != "x"; then
- CFLAGS="`echo \"$CFLAGS\" | sed -e 's/-g//'`"
- CFLAGS="`echo \"$CFLAGS\" | sed -e 's/-O2//'`"
-fi
-
-if test "x$CXXFLAGS" != "x"; then
- CXXFLAGS="`echo \"$CXXFLAGS\" | sed -e 's/-g//'`"
- CXXFLAGS="`echo \"$CXXFLAGS\" | sed -e 's/-O2//'`"
-fi
-
-# Test what compiler flags we should use.
-
-AC_ARG_ENABLE([debug],
- [AS_HELP_STRING([--enable-debug],
- [leave debug information in the final binary (default: no)])],
- [], [enable_debug="no"])
-
-if test "x$enable_debug" = "xyes"; then
- AC_S9X_COMPILER_FLAG([-g], [g])
- AC_S9X_COMPILER_FLAG([-O0], [o0])
-else
- AC_S9X_COMPILER_FLAG([-O3], [o3], [
- AC_S9X_COMPILER_FLAG([-O2], [o2], [
- AC_S9X_COMPILER_FLAG([-O1], [o1])])])
- AC_S9X_COMPILER_FLAG([-fomit-frame-pointer], [omit_frame_pointer])
-fi
-
-AC_ARG_ENABLE([mtune],
- [AS_HELP_STRING([--enable-mtune],
- [use the specified value for the -mtune/-mcpu flag (default: no)])],
- [], [enable_mtune="no"])
-
-if test "x$enable_mtune" != "xno"; then
- AC_S9X_COMPILER_FLAG([-mtune="$enable_mtune"], [mtune],
- [
- AC_MSG_WARN([-mtune failed, trying -mcpu...])
- AC_S9X_COMPILER_FLAG([-mcpu="$enable_mtune"], [mcpu],
- [AC_MSG_ERROR([Please specify a working value for --enable-mtune.])])
- ])
-fi
-
AC_S9X_COMPILER_FLAG([-fno-exceptions], [no_exceptions])
AC_S9X_COMPILER_FLAG([-fno-rtti], [no_rtti])
AC_S9X_COMPILER_FLAG([-pedantic], [pedantic])
|
GitWeb
