|
Lines 1-6
Link Here
|
| 1 |
--- config.lib.orig 2016-04-01 18:33:55 UTC |
1 |
--- config.lib.orig 2020-04-01 08:25:41 UTC |
| 2 |
+++ config.lib |
2 |
+++ config.lib |
| 3 |
@@ -816,15 +816,15 @@ check_params() { |
3 |
@@ -810,15 +810,15 @@ check_params() { |
| 4 |
pre_detect_with_lzma=$with_lzma |
4 |
pre_detect_with_lzma=$with_lzma |
| 5 |
detect_lzma |
5 |
detect_lzma |
| 6 |
|
6 |
|
|
Lines 18-24
Link Here
|
| 18 |
log 1 " If you want to compile without lzma use --without-lzma as parameter" |
18 |
log 1 " If you want to compile without lzma use --without-lzma as parameter" |
| 19 |
exit |
19 |
exit |
| 20 |
fi |
20 |
fi |
| 21 |
@@ -1468,7 +1468,6 @@ make_cflags_and_ldflags() { |
21 |
@@ -1491,7 +1491,6 @@ make_cflags_and_ldflags() { |
| 22 |
# -fomit-frame-pointer and -pg do not go well together (gcc errors they are incompatible) |
22 |
# -fomit-frame-pointer and -pg do not go well together (gcc errors they are incompatible) |
| 23 |
CFLAGS="-fomit-frame-pointer $CFLAGS" |
23 |
CFLAGS="-fomit-frame-pointer $CFLAGS" |
| 24 |
fi |
24 |
fi |
|
Lines 26-37
Link Here
|
| 26 |
else |
26 |
else |
| 27 |
OBJS_SUBDIR="debug" |
27 |
OBJS_SUBDIR="debug" |
| 28 |
|
28 |
|
| 29 |
@@ -1675,16 +1674,14 @@ make_cflags_and_ldflags() { |
29 |
@@ -1678,16 +1677,14 @@ make_cflags_and_ldflags() { |
| 30 |
fi |
30 |
fi |
| 31 |
fi |
31 |
fi |
| 32 |
|
32 |
|
| 33 |
- if [ -n "$lzma_config" ]; then |
33 |
- if [ -n "$lzma_config" ]; then |
| 34 |
- CFLAGS="$CFLAGS -DWITH_LZMA" |
34 |
- CFLAGS="$CFLAGS -DWITH_LIBLZMA" |
| 35 |
- CFLAGS="$CFLAGS `$lzma_config --cflags | tr '\n\r' ' '`" |
35 |
- CFLAGS="$CFLAGS `$lzma_config --cflags | tr '\n\r' ' '`" |
| 36 |
- |
36 |
- |
| 37 |
- if [ "$enable_static" != "0" ]; then |
37 |
- if [ "$enable_static" != "0" ]; then |
|
Lines 44-54
Link Here
|
| 44 |
- LIBS="$LIBS `$lzma_config --libs | tr '\n\r' ' '`" |
44 |
- LIBS="$LIBS `$lzma_config --libs | tr '\n\r' ' '`" |
| 45 |
+ LIBS="$LIBS -llzma" |
45 |
+ LIBS="$LIBS -llzma" |
| 46 |
fi |
46 |
fi |
| 47 |
+ CFLAGS="$CFLAGS -DWITH_LZMA" |
47 |
+ CFLAGS="$CFLAGS -DWITH_LIBLZMA" |
| 48 |
fi |
48 |
fi |
| 49 |
|
49 |
|
| 50 |
if [ "$with_lzo2" != "0" ]; then |
50 |
if [ "$with_lzo2" != "0" ]; then |
| 51 |
@@ -2692,6 +2689,10 @@ detect_lzo2() { |
51 |
@@ -2728,6 +2725,10 @@ detect_lzo2() { |
| 52 |
detect_library "$with_lzo2" "lzo2" "liblzo2.a" "lzo/" "lzo1x.h" |
52 |
detect_library "$with_lzo2" "lzo2" "liblzo2.a" "lzo/" "lzo1x.h" |
| 53 |
} |
53 |
} |
| 54 |
|
54 |
|
|
Lines 56-65
Link Here
|
| 56 |
+ detect_library "$with_lzma" "lzma" "liblzma.a" "" "lzma.h" |
56 |
+ detect_library "$with_lzma" "lzma" "liblzma.a" "" "lzma.h" |
| 57 |
+} |
57 |
+} |
| 58 |
+ |
58 |
+ |
| 59 |
detect_libtimidity() { |
59 |
detect_fluidsynth() { |
| 60 |
detect_pkg_config "$with_libtimidity" "libtimidity" "libtimidity_config" "0.1" "1" |
60 |
detect_library "$with_fluidsynth" "fluidsynth" "" "" "fluidsynth.h" |
| 61 |
} |
61 |
} |
| 62 |
@@ -2756,10 +2757,6 @@ detect_pkg_config() { |
62 |
@@ -2792,10 +2793,6 @@ detect_pkg_config() { |
| 63 |
log 1 "checking $2... found" |
63 |
log 1 "checking $2... found" |
| 64 |
} |
64 |
} |
| 65 |
|
65 |
|
|
Lines 70-77
Link Here
|
| 70 |
detect_xdg_basedir() { |
70 |
detect_xdg_basedir() { |
| 71 |
detect_pkg_config "$with_xdg_basedir" "libxdg-basedir" "xdg_basedir_config" "1.2" |
71 |
detect_pkg_config "$with_xdg_basedir" "libxdg-basedir" "xdg_basedir_config" "1.2" |
| 72 |
} |
72 |
} |
| 73 |
@@ -3523,8 +3520,7 @@ showhelp() { |
73 |
@@ -3528,8 +3525,7 @@ showhelp() { |
| 74 |
echo " --with-sdl[=\"pkg-config sdl\"] enables SDL video driver support" |
74 |
echo " --with-sdl[=\"sdl1|sdl2\"] enables SDL video driver support" |
| 75 |
echo " --with-zlib[=\"pkg-config zlib\"]" |
75 |
echo " --with-zlib[=\"pkg-config zlib\"]" |
| 76 |
echo " enables zlib support" |
76 |
echo " enables zlib support" |
| 77 |
- echo " --with-liblzma[=\"pkg-config liblzma\"]" |
77 |
- echo " --with-liblzma[=\"pkg-config liblzma\"]" |