2673
|
1 This file is part of MXE. |
|
2 See index.html for further information. |
|
3 |
|
4 Contains ad hoc patches for cross building. |
|
5 |
|
6 From 8ca212a3a9fa7a034b1fa3680422e9a7cad21d4a Mon Sep 17 00:00:00 2001 |
|
7 From: MXE |
|
8 Date: Sun, 17 Jun 2012 09:05:56 +0200 |
|
9 Subject: [PATCH] deactivates dll build which is not supported by mxe, and |
|
10 introduce option --disable-shared to handle it. |
|
11 |
|
12 taken from |
|
13 https://github.com/GNOME/gtkglarea/pull/1 |
|
14 |
|
15 diff --git a/configure.ac b/configure.ac |
|
16 index 07be73f..2728c10 100644 |
|
17 --- a/configure.ac |
|
18 +++ b/configure.ac |
|
19 @@ -53,6 +53,16 @@ if test "$native_win32" = "yes"; then |
|
20 fi |
|
21 AM_CONDITIONAL(MS_LIB_AVAILABLE, test x$ms_librarian = xyes) |
|
22 |
|
23 + |
|
24 +dnl |
|
25 +dnl Check if shared libs are enabled |
|
26 +dnl |
|
27 +AC_ARG_ENABLE(shared, |
|
28 + [AS_HELP_STRING([--disable-shared],[disable support for shared libraries])], |
|
29 + [], |
|
30 + []) |
|
31 +AM_CONDITIONAL(USE_SHARED, test x$enable_shared != xno) |
|
32 + |
|
33 dnl |
|
34 dnl Check for GTK libraries |
|
35 dnl |
|
36 @@ -172,7 +182,7 @@ AC_C_CONST |
|
37 |
|
38 dnl Checks for library functions. |
|
39 |
|
40 -AC_OUTPUT( |
|
41 +AC_CONFIG_FILES([ |
|
42 Makefile |
|
43 gtkgl-2.0.pc |
|
44 gtkgl/Makefile |
|
45 @@ -180,8 +190,8 @@ AC_OUTPUT( |
|
46 docs/Makefile |
|
47 examples/Makefile |
|
48 examples/makefile.mingw |
|
49 -) |
|
50 - |
|
51 +]) |
|
52 +AC_OUTPUT |
|
53 |
|
54 echo "---" |
|
55 echo "Configuration summary" |
|
56 diff --git a/gtkgl/Makefile.am b/gtkgl/Makefile.am |
|
57 index c7e65cd..23d4fdb 100644 |
|
58 --- a/gtkgl/Makefile.am |
|
59 +++ b/gtkgl/Makefile.am |
|
60 @@ -1,28 +1,28 @@ |
|
61 ## gtkgl directory |
|
62 |
|
63 +INSTALL_EXTRA= |
|
64 +UNINSTALL_EXTRA= |
|
65 + |
|
66 if OS_WIN32 |
|
67 export_symbols = -export-symbols gtkgl.def |
|
68 - |
|
69 +if USE_SHARED |
|
70 install-libtool-import-lib: |
|
71 $(INSTALL) .libs/libgtkgl-2.0.dll.a $(DESTDIR)$(libdir) |
|
72 uninstall-libtool-import-lib: |
|
73 -rm $(DESTDIR)$(libdir)/libgtkgl-2.0.dll.a |
|
74 -else |
|
75 -install-libtool-import-lib: |
|
76 -uninstall-libtool-import-lib: |
|
77 +INSTALL_EXTRA += install-libtool-import-lib |
|
78 +UNINSTALL_EXTRA += uninstall-libtool-import-lib |
|
79 +endif |
|
80 endif |
|
81 |
|
82 if MS_LIB_AVAILABLE |
|
83 noinst_DATA = gtkgl-2.0.lib |
|
84 - |
|
85 install-ms-lib: |
|
86 $(INSTALL) gtkgl-2.0.lib $(DESTDIR)$(libdir) |
|
87 - |
|
88 uninstall-ms-lib: |
|
89 -rm $(DESTDIR)$(libdir)/gtkgl-2.0.lib |
|
90 -else |
|
91 -install-ms-lib: |
|
92 -uninstall-ms-lib: |
|
93 +INSTALL_EXTRA += install-ms-lib |
|
94 +UNINSTALL_EXTRA += uninstall-ms-lib |
|
95 endif |
|
96 |
|
97 EXTRA_DIST = makefile.mingw makefile.mingw.in gtkgl.def |
|
98 @@ -42,6 +42,6 @@ libgtkgl_2_0_la_LIBADD = $(GTK_LIBS) $(GL_LIBS) |
|
99 gtkgl-2.0.lib: libgtkgl-2.0.la gtkgl.def |
|
100 lib -name:libgtkgl-2.0-@LT_CURRENT_MINUS_AGE@.dll -def:gtkgl.def -out:$@ |
|
101 |
|
102 -install-data-local: install-ms-lib install-libtool-import-lib |
|
103 +install-data-local: $(INSTALL_EXTRA) |
|
104 |
|
105 -uninstall-local: uninstall-ms-lib uninstall-libtool-import-lib |
|
106 +uninstall-local: $(UNINSTALL_EXTRA) |
|
107 -- |
|
108 1.7.9.5 |
|
109 |