Mercurial > mxe-octave

annotate src/msvc-fltk-1.patch @ 5893:53a6c7df43f8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Mesa 3D: Update to version 21.1.8. * src/mesa.mk: Update version and checksum. * src/mesa-2-uninitialized.patch: Remove file. * dist-files.mk: Remove file from list.
author Markus Mützel <markus.muetzel@gmx.de>
date Thu, 16 Sep 2021 22:37:45 +0200
parents 75c25cc8e6b6
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
3099
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
1 diff -ur fltk-1.3.1-orig/FL/Fl_Device.H fltk-1.3.1/FL/Fl_Device.H
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
2 --- fltk-1.3.1-orig/FL/Fl_Device.H 2012-11-06 15:46:14 -0500
3149
7bd867b6fc5b [MSVC] fix fltk-config to include OpenGL libraries with using --use-gl
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3143
diff changeset
3 +++ fltk-1.3.1/FL/Fl_Device.H 2013-07-17 19:22:49 -0400
3099
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
4 @@ -213,7 +213,7 @@
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
5 friend void fl_draw_image(Fl_Draw_Image_Cb cb, void* data, int X,int Y,int W,int H, int D);
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
6 friend FL_EXPORT void fl_draw_image_mono(Fl_Draw_Image_Cb cb, void* data, int X,int Y,int W,int H, int D);
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
7 friend FL_EXPORT void gl_start();
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
8 - friend void fl_copy_offscreen(int x, int y, int w, int h, Fl_Offscreen pixmap, int srcx, int srcy);
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
9 + friend FL_EXPORT void fl_copy_offscreen(int x, int y, int w, int h, Fl_Offscreen pixmap, int srcx, int srcy);
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
10 matrix *fl_matrix; /**< Points to the current coordinate transformation matrix */
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
11
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
12 /** \brief The constructor. */
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
13 diff -ur fltk-1.3.1-orig/configure.in fltk-1.3.1/configure.in
3149
7bd867b6fc5b [MSVC] fix fltk-config to include OpenGL libraries with using --use-gl
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3143
diff changeset
14 --- fltk-1.3.1-orig/configure.in 2013-07-17 19:22:33 -0400
7bd867b6fc5b [MSVC] fix fltk-config to include OpenGL libraries with using --use-gl
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3143
diff changeset
15 +++ fltk-1.3.1/configure.in 2013-07-17 19:22:49 -0400
3099
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
16 @@ -164,6 +164,31 @@
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
17 fi
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
18 fi
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
19
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
20 +case $uname in
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
21 + MINGW*)
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
22 + if test x$GCC != xyes; then
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
23 + dnl Assume VC++ compiler
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
24 + LINKFLTK="../lib/fltk.lib"
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
25 + LINKFLTKFORMS=
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
26 + LINKFLTKGL=
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
27 + LINKFLTKIMG=
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
28 +
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
29 + LIBEXT=".lib"
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
30 + LIBNAME="../lib/fltk.lib"
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
31 + FLLIBNAME=
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
32 + GLLIBNAME=
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
33 + IMGLIBNAME=
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
34 + CAIROLIBNAME=
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
35 +
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
36 + LIBBASENAME="fltk.lib"
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
37 + FLLIBBASENAME=
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
38 + GLLIBBASENAME=
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
39 + IMGLIBBASENAME=
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
40 + CAIROLIBBASENAME=
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
41 + fi
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
42 + ;;
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
43 +esac
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
44 +
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
45 AC_SUBST(CAIRODIR)
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
46 AC_SUBST(CAIROFLAGS)
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
47 AC_SUBST(CAIROLIBS)
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
48 @@ -287,36 +312,47 @@
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
49 ;;
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
50 CYGWIN* | MINGW*)
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
51 PICFLAG=0
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
52 - if test x$enable_cygwin != xyes; then
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
53 - DSONAME="mgwfltknox-$FL_API_VERSION.dll"
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
54 - FLDSONAME="mgwfltknox_forms-$FL_API_VERSION.dll"
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
55 - GLDSONAME="mgwfltknox_gl-$FL_API_VERSION.dll"
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
56 - IMGDSONAME="mgwfltknox_images-$FL_API_VERSION.dll"
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
57 - CAIRODSONAME="mgwfltknox_cairo-$FL_API_VERSION.dll"
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
58 + if test x$GCC = xyes; then
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
59 + if test x$enable_cygwin != xyes; then
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
60 + DSONAME="mgwfltknox-$FL_API_VERSION.dll"
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
61 + FLDSONAME="mgwfltknox_forms-$FL_API_VERSION.dll"
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
62 + GLDSONAME="mgwfltknox_gl-$FL_API_VERSION.dll"
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
63 + IMGDSONAME="mgwfltknox_images-$FL_API_VERSION.dll"
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
64 + CAIRODSONAME="mgwfltknox_cairo-$FL_API_VERSION.dll"
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
65 + else
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
66 + if test x$enable_x11 = xyes; then
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
67 + DSONAME="cygfltk-$FL_API_VERSION.dll"
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
68 + FLDSONAME="cygfltk_forms-$FL_API_VERSION.dll"
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
69 + GLDSONAME="cygfltk_gl-$FL_API_VERSION.dll"
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
70 + IMGDSONAME="cygfltk_images-$FL_API_VERSION.dll"
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
71 + CAIRODSONAME="cygfltk_cairo-$FL_API_VERSION.dll"
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
72 + else
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
73 + DSONAME="cygfltknox-$FL_API_VERSION.dll"
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
74 + FLDSONAME="cygfltknox_forms-$FL_API_VERSION.dll"
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
75 + GLDSONAME="cygfltknox_gl-$FL_API_VERSION.dll"
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
76 + IMGDSONAME="cygfltknox_images-$FL_API_VERSION.dll"
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
77 + CAIRODSONAME="cygfltknox_cairo-$FL_API_VERSION.dll"
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
78 + fi
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
79 + fi
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
80 + #-----------------------------------------------------------
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
81 + # -Wl,--enable-runtime-pseudo-reloc: See str 1585
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
82 + # appears to be necessary for older binutils versions < 2.16
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
83 + #-----------------------------------------------------------
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
84 + LDFLAGS="$LDFLAGS -Wl,--enable-auto-import -Wl,--enable-runtime-pseudo-reloc"
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
85 + DSOCOMMAND="\$(CXX) \$(DSOFLAGS) -shared \
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
86 + -Wl,--whole-archive -Wl,--export-all-symbols \
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
87 + -Wl,--enable-runtime-pseudo-reloc -Wl,--enable-auto-import \
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
88 + -Wl,--enable-auto-image-base -o \$@"
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
89 else
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
90 - if test x$enable_x11 = xyes; then
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
91 - DSONAME="cygfltk-$FL_API_VERSION.dll"
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
92 - FLDSONAME="cygfltk_forms-$FL_API_VERSION.dll"
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
93 - GLDSONAME="cygfltk_gl-$FL_API_VERSION.dll"
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
94 - IMGDSONAME="cygfltk_images-$FL_API_VERSION.dll"
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
95 - CAIRODSONAME="cygfltk_cairo-$FL_API_VERSION.dll"
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
96 - else
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
97 - DSONAME="cygfltknox-$FL_API_VERSION.dll"
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
98 - FLDSONAME="cygfltknox_forms-$FL_API_VERSION.dll"
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
99 - GLDSONAME="cygfltknox_gl-$FL_API_VERSION.dll"
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
100 - IMGDSONAME="cygfltknox_images-$FL_API_VERSION.dll"
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
101 - CAIRODSONAME="cygfltknox_cairo-$FL_API_VERSION.dll"
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
102 - fi
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
103 + dnl Assume VC++ compiler
3143
a2afd94e919f [MSVC] fix fltk-config script for octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3099
diff changeset
104 + DSONAME="@@LIBRARY_PREFIX@@fltk-$FL_API_VERSION@@LIBRARY_SUFFIX@@.dll"
3099
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
105 + FLDSONAME=
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
106 + GLDSONAME=
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
107 + IMGDSONAME=
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
108 + CAIRODSONAME=
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
109 +
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
110 + DSOCOMMAND="\$(CXX) \$(DSOFLAGS) -shared -o \$@"
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
111 fi
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
112 - #-----------------------------------------------------------
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
113 - # -Wl,--enable-runtime-pseudo-reloc: See str 1585
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
114 - # appears to be necessary for older binutils versions < 2.16
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
115 - #-----------------------------------------------------------
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
116 - LDFLAGS="$LDFLAGS -Wl,--enable-auto-import -Wl,--enable-runtime-pseudo-reloc"
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
117 - DSOCOMMAND="\$(CXX) \$(DSOFLAGS) -shared \
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
118 - -Wl,--whole-archive -Wl,--export-all-symbols \
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
119 - -Wl,--enable-runtime-pseudo-reloc -Wl,--enable-auto-import \
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
120 - -Wl,--enable-auto-image-base -o \$@"
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
121 ;;
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
122 *)
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
123 AC_MSG_WARN(Shared libraries may not be supported. Trying -shared option with compiler.)
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
124 @@ -330,6 +366,15 @@
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
125 esac
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
126
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
127 LINKSHARED="-L../src $FLTKCAIROOPTION -lfltk_images$SHAREDSUFFIX -lfltk_forms$SHAREDSUFFIX -lfltk$SHAREDSUFFIX"
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
128 +
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
129 + case $uname in
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
130 + MINGW*)
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
131 + if test x$GCC != xyes; then
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
132 + dnl Assume VC++ compiler
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
133 + LINKSHARED="-L../src $FLTKCAIROOPTION -lfltk$SHAREDSUFFIX"
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
134 + fi
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
135 + ;;
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
136 + esac
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
137 else
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
138 DSOCOMMAND="echo"
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
139 DSOLINK=""
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
140 @@ -705,7 +750,7 @@
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
141 syspnglib_ok=no
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
142 syspnginc_ok=no
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
143 if test x$enable_localpng != xyes; then
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
144 - AC_CHECK_LIB(png, png_read_info,
3300
75c25cc8e6b6 [MSVC] Update FLTK and Qt patches to allow compilation with libpng16.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3149
diff changeset
145 + AC_CHECK_LIB(png16, png_read_info,
3099
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
146 [AC_CHECK_HEADER(png.h,
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
147 AC_DEFINE(HAVE_PNG_H)
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
148 syspnginc_ok=yes)
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
149 @@ -734,11 +779,11 @@
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
150 else
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
151 PNGINC=""
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
152 PNG=""
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
153 - IMAGELIBS="-lpng $IMAGELIBS"
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
154 - STATICIMAGELIBS="-lpng $STATICIMAGELIBS"
3300
75c25cc8e6b6 [MSVC] Update FLTK and Qt patches to allow compilation with libpng16.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3149
diff changeset
155 + IMAGELIBS="-lpng16 $IMAGELIBS"
75c25cc8e6b6 [MSVC] Update FLTK and Qt patches to allow compilation with libpng16.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3149
diff changeset
156 + STATICIMAGELIBS="-lpng16 $STATICIMAGELIBS"
3099
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
157 AC_DEFINE(HAVE_LIBPNG)
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
158 - AC_CHECK_LIB(png,png_get_valid, AC_DEFINE(HAVE_PNG_GET_VALID))
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
159 - AC_CHECK_LIB(png,png_set_tRNS_to_alpha, AC_DEFINE(HAVE_PNG_SET_TRNS_TO_ALPHA))
3300
75c25cc8e6b6 [MSVC] Update FLTK and Qt patches to allow compilation with libpng16.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3149
diff changeset
160 + AC_CHECK_LIB(png16,png_get_valid, AC_DEFINE(HAVE_PNG_GET_VALID))
75c25cc8e6b6 [MSVC] Update FLTK and Qt patches to allow compilation with libpng16.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3149
diff changeset
161 + AC_CHECK_LIB(png16,png_set_tRNS_to_alpha, AC_DEFINE(HAVE_PNG_SET_TRNS_TO_ALPHA))
3099
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
162 fi
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
163
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
164 AC_SUBST(JPEG)
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
165 @@ -824,11 +869,17 @@
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
166 # checks don't work because the shell puts out \r\n instead of
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
167 # \n. Here we just force U32 to be defined to "unsigned"...
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
168 AC_DEFINE(U32,unsigned)
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
169 - CFLAGS="-mwindows -DWIN32 -DUSE_OPENGL32 $CFLAGS"
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
170 - CXXFLAGS="-mwindows -DWIN32 -DUSE_OPENGL32 $CXXFLAGS"
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
171 - LDFLAGS="-mwindows $LDFLAGS"
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
172 - DSOFLAGS="-mwindows $DSOFLAGS"
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
173 - LIBS="$LIBS -lole32 -luuid -lcomctl32"
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
174 + if test x$GCC = xyes; then
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
175 + CFLAGS="-mwindows -DWIN32 -DUSE_OPENGL32 $CFLAGS"
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
176 + CXXFLAGS="-mwindows -DWIN32 -DUSE_OPENGL32 $CXXFLAGS"
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
177 + LDFLAGS="-mwindows $LDFLAGS"
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
178 + DSOFLAGS="-mwindows $DSOFLAGS"
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
179 + LIBS="$LIBS -lole32 -luuid -lcomctl32"
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
180 + else
3143
a2afd94e919f [MSVC] fix fltk-config script for octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3099
diff changeset
181 + CFLAGS="-DWIN32 -DUSE_OPENGL32 -DFL_DLL $CFLAGS"
3099
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
182 + CXXFLAGS="-DWIN32 -DUSE_OPENGL32 -DFL_DLL $CXXFLAGS"
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
183 + LIBS="$LIBS -lole32 -luuid -lcomctl32 -lcomdlg32 -lgdi32"
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
184 + fi
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
185 if test "x$with_optim" = x; then
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
186 dnl Avoid -Os optimization on Cygwin/MinGW
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
187 with_optim="-O3"
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
188 @@ -837,10 +888,10 @@
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
189 if test x$enable_gl != xno; then
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
190 AC_CHECK_HEADER(GL/gl.h,
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
191 AC_DEFINE(HAVE_GL)
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
192 - GLLIB="-lopengl32")
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
193 + GLLIB="-lopengl32", [], [#include <windows.h>])
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
194 AC_CHECK_HEADER(GL/glu.h,
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
195 AC_DEFINE(HAVE_GL_GLU_H)
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
196 - GLLIB="-lglu32 $GLLIB")
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
197 + GLLIB="-lglu32 $GLLIB", [], [#include <windows.h>])
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
198 else
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
199 LINKFLTKGL=""
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
200 GLLIBNAME=""
3143
a2afd94e919f [MSVC] fix fltk-config script for octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3099
diff changeset
201 diff -ur fltk-1.3.1-orig/fltk-config.in fltk-1.3.1/fltk-config.in
3149
7bd867b6fc5b [MSVC] fix fltk-config to include OpenGL libraries with using --use-gl
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3143
diff changeset
202 --- fltk-1.3.1-orig/fltk-config.in 2013-07-17 19:22:36 -0400
7bd867b6fc5b [MSVC] fix fltk-config to include OpenGL libraries with using --use-gl
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3143
diff changeset
203 +++ fltk-1.3.1/fltk-config.in 2013-07-17 19:23:21 -0400
3143
a2afd94e919f [MSVC] fix fltk-config script for octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3099
diff changeset
204 @@ -28,7 +28,7 @@
a2afd94e919f [MSVC] fix fltk-config script for octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3099
diff changeset
205 ### BEGIN fltk-config
a2afd94e919f [MSVC] fix fltk-config script for octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3099
diff changeset
206 selfdir=`dirname "$0"`
a2afd94e919f [MSVC] fix fltk-config script for octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3099
diff changeset
207
a2afd94e919f [MSVC] fix fltk-config script for octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3099
diff changeset
208 -prefix=@prefix@
a2afd94e919f [MSVC] fix fltk-config script for octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3099
diff changeset
209 +prefix=`cd $selfdir && pwd -W | sed -e 's,/bin$,,'`
a2afd94e919f [MSVC] fix fltk-config script for octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3099
diff changeset
210 exec_prefix=@exec_prefix@
a2afd94e919f [MSVC] fix fltk-config script for octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3099
diff changeset
211 exec_prefix_set=no
a2afd94e919f [MSVC] fix fltk-config script for octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3099
diff changeset
212 bindir=@bindir@
a2afd94e919f [MSVC] fix fltk-config script for octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3099
diff changeset
213 @@ -233,18 +233,18 @@
a2afd94e919f [MSVC] fix fltk-config script for octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3099
diff changeset
214 LDSTATIC="$libdir/libfltk.a $LDLIBS"
a2afd94e919f [MSVC] fix fltk-config script for octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3099
diff changeset
215 LDLIBS="-lfltk$SHAREDSUFFIX $LDLIBS"
a2afd94e919f [MSVC] fix fltk-config script for octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3099
diff changeset
216
a2afd94e919f [MSVC] fix fltk-config script for octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3099
diff changeset
217 -if test x$use_forms = xyes; then
a2afd94e919f [MSVC] fix fltk-config script for octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3099
diff changeset
218 - LDLIBS="-lfltk_forms$SHAREDSUFFIX $LDLIBS"
a2afd94e919f [MSVC] fix fltk-config script for octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3099
diff changeset
219 - LDSTATIC="$libdir/libfltk_forms.a $LDSTATIC"
a2afd94e919f [MSVC] fix fltk-config script for octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3099
diff changeset
220 -fi
3149
7bd867b6fc5b [MSVC] fix fltk-config to include OpenGL libraries with using --use-gl
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3143
diff changeset
221 +#if test x$use_forms = xyes; then
7bd867b6fc5b [MSVC] fix fltk-config to include OpenGL libraries with using --use-gl
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3143
diff changeset
222 +# LDLIBS="-lfltk_forms$SHAREDSUFFIX $LDLIBS"
7bd867b6fc5b [MSVC] fix fltk-config to include OpenGL libraries with using --use-gl
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3143
diff changeset
223 +# LDSTATIC="$libdir/libfltk_forms.a $LDSTATIC"
7bd867b6fc5b [MSVC] fix fltk-config to include OpenGL libraries with using --use-gl
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3143
diff changeset
224 +#fi
7bd867b6fc5b [MSVC] fix fltk-config to include OpenGL libraries with using --use-gl
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3143
diff changeset
225 if test x$use_gl = xyes; then
3143
a2afd94e919f [MSVC] fix fltk-config script for octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3099
diff changeset
226 - LDLIBS="-lfltk_gl$SHAREDSUFFIX @GLLIB@ $LDLIBS"
a2afd94e919f [MSVC] fix fltk-config script for octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3099
diff changeset
227 - LDSTATIC="$libdir/libfltk_gl.a @GLLIB@ $LDSTATIC"
a2afd94e919f [MSVC] fix fltk-config script for octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3099
diff changeset
228 -fi
a2afd94e919f [MSVC] fix fltk-config script for octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3099
diff changeset
229 -if test x$use_images = xyes; then
a2afd94e919f [MSVC] fix fltk-config script for octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3099
diff changeset
230 - LDLIBS="-lfltk_images$SHAREDSUFFIX $IMAGELIBS $LDLIBS"
a2afd94e919f [MSVC] fix fltk-config script for octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3099
diff changeset
231 - LDSTATIC="$libdir/libfltk_images.a $STATICIMAGELIBS $LDSTATIC"
3149
7bd867b6fc5b [MSVC] fix fltk-config to include OpenGL libraries with using --use-gl
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3143
diff changeset
232 + LDLIBS="@GLLIB@ $LDLIBS"
7bd867b6fc5b [MSVC] fix fltk-config to include OpenGL libraries with using --use-gl
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3143
diff changeset
233 + LDSTATIC="@GLLIB@ $LDSTATIC"
7bd867b6fc5b [MSVC] fix fltk-config to include OpenGL libraries with using --use-gl
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3143
diff changeset
234 fi
3143
a2afd94e919f [MSVC] fix fltk-config script for octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3099
diff changeset
235 +#if test x$use_images = xyes; then
a2afd94e919f [MSVC] fix fltk-config script for octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3099
diff changeset
236 +# LDLIBS="-lfltk_images$SHAREDSUFFIX $IMAGELIBS $LDLIBS"
a2afd94e919f [MSVC] fix fltk-config script for octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3099
diff changeset
237 +# LDSTATIC="$libdir/libfltk_images.a $STATICIMAGELIBS $LDSTATIC"
a2afd94e919f [MSVC] fix fltk-config script for octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3099
diff changeset
238 +#fi
a2afd94e919f [MSVC] fix fltk-config script for octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3099
diff changeset
239
a2afd94e919f [MSVC] fix fltk-config script for octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3099
diff changeset
240 if test x$use_cairo = xyes; then
a2afd94e919f [MSVC] fix fltk-config script for octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3099
diff changeset
241 LDLIBS="-lfltk_cairo$SHAREDSUFFIX $CAIROLIBS $LDLIBS"
3099
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
242 diff -ur fltk-1.3.1-orig/fluid/factory.cxx fltk-1.3.1/fluid/factory.cxx
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
243 --- fltk-1.3.1-orig/fluid/factory.cxx 2011-07-19 00:49:30 -0400
3149
7bd867b6fc5b [MSVC] fix fltk-config to include OpenGL libraries with using --use-gl
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3143
diff changeset
244 +++ fltk-1.3.1/fluid/factory.cxx 2013-07-17 19:22:49 -0400
3099
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
245 @@ -37,7 +37,7 @@
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
246
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
247 extern Fl_Pixmap *pixmap[];
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
248
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
249 -#if !HAVE_STRCASECMP
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
250 +#if !HAVE_STRCASECMP && !defined(strcasecmp)
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
251 //
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
252 // 'strcasecmp()' - Do a case-insensitive compare...
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
253 //
3143
a2afd94e919f [MSVC] fix fltk-config script for octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3099
diff changeset
254 diff -ur fltk-1.3.1-orig/makeinclude.in fltk-1.3.1/makeinclude.in
a2afd94e919f [MSVC] fix fltk-config script for octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3099
diff changeset
255 --- fltk-1.3.1-orig/makeinclude.in 2011-07-19 00:49:30 -0400
3149
7bd867b6fc5b [MSVC] fix fltk-config to include OpenGL libraries with using --use-gl
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3143
diff changeset
256 +++ fltk-1.3.1/makeinclude.in 2013-07-17 19:22:49 -0400
3143
a2afd94e919f [MSVC] fix fltk-config script for octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3099
diff changeset
257 @@ -50,7 +50,7 @@
a2afd94e919f [MSVC] fix fltk-config script for octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3099
diff changeset
258 # flags for C++ compiler:
a2afd94e919f [MSVC] fix fltk-config script for octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3099
diff changeset
259 ARCHFLAGS = @ARCHFLAGS@
a2afd94e919f [MSVC] fix fltk-config script for octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3099
diff changeset
260 OPTIM = @OPTIM@
a2afd94e919f [MSVC] fix fltk-config script for octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3099
diff changeset
261 -CFLAGS = $(OPTIM) @LARGEFILE@ @PTHREAD_FLAGS@ @CPPFLAGS@ @CFLAGS@
a2afd94e919f [MSVC] fix fltk-config script for octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3099
diff changeset
262 +CFLAGS = $(OPTIM) @LARGEFILE@ @PTHREAD_FLAGS@ @CPPFLAGS@ @CFLAGS@ $(FLTKFLAGS)
a2afd94e919f [MSVC] fix fltk-config script for octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3099
diff changeset
263 CXXFLAGS = $(OPTIM) @LARGEFILE@ @PTHREAD_FLAGS@ @CPPFLAGS@ @CXXFLAGS@ $(FLTKFLAGS)
a2afd94e919f [MSVC] fix fltk-config script for octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3099
diff changeset
264
a2afd94e919f [MSVC] fix fltk-config script for octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3099
diff changeset
265 # program to make the archive:
3099
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
266 diff -ur fltk-1.3.1-orig/src/Makefile fltk-1.3.1/src/Makefile
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
267 --- fltk-1.3.1-orig/src/Makefile 2012-11-06 16:13:54 -0500
3149
7bd867b6fc5b [MSVC] fix fltk-config to include OpenGL libraries with using --use-gl
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3143
diff changeset
268 +++ fltk-1.3.1/src/Makefile 2013-07-17 19:22:49 -0400
3099
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
269 @@ -459,6 +459,13 @@
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
270 -L. -lfltk -Wl,--exclude-libs -Wl,libfltk_png.a \
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
271 $(IMAGELIBS) $(LDLIBS)
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
272
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
273 +$(LIBNAME):
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
274 + true
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
275 +
3143
a2afd94e919f [MSVC] fix fltk-config script for octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3099
diff changeset
276 +@@LIBRARY_PREFIX@@fltk-1.3@@LIBRARY_SUFFIX@@.dll: $(OBJECTS) $(FLOBJECTS) $(GLOBJECTS) $(IMGOBJECTS)
3099
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
277 + echo $(DSOCOMMAND) ...
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
278 + $(DSOCOMMAND) $^ -Wl,--out-implib=$(LIBNAME) $(IMAGELIBS) $(LDLIBS) $(GLDLIBS)
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
279 +
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
280 clean:
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
281 -$(RM) *.o xutf8/*.o *.dll.a core.* *~ *.bak *.bck
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
282 -$(RM) $(DSONAME) $(FLDSONAME) $(GLDSONAME) $(IMGDSONAME) \
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
283 @@ -554,15 +561,19 @@
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
284 -$(INSTALL_DIR) $(DESTDIR)$(bindir)
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
285 $(RM) $(DESTDIR)$(libdir)/$(LIBBASENAME)
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
286 $(INSTALL_LIB) $(LIBNAME) $(DESTDIR)$(libdir)
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
287 - $(INSTALL_LIB) $(FLLIBNAME) $(DESTDIR)$(libdir)
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
288 - $(INSTALL_LIB) $(IMGLIBNAME) $(DESTDIR)$(libdir)
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
289 $(RANLIB) $(DESTDIR)$(libdir)/$(LIBBASENAME)
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
290 - $(RANLIB) $(DESTDIR)$(libdir)/$(FLLIBBASENAME)
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
291 + if test x$(FLLIBNAME) != x; then \
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
292 + $(INSTALL_LIB) $(FLLIBNAME) $(DESTDIR)$(libdir); \
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
293 + $(RANLIB) $(DESTDIR)$(libdir)/$(FLLIBBASENAME); \
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
294 + fi
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
295 + if test x$(IMGLIBNAME) != x; then \
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
296 + $(INSTALL_LIB) $(IMGLIBNAME) $(DESTDIR)$(libdir); \
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
297 + $(RANLIB) $(DESTDIR)$(libdir)/$(IMGLIBBASENAME); \
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
298 + fi
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
299 if test x$(GLLIBNAME) != x; then \
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
300 $(INSTALL_LIB) $(GLLIBNAME) $(DESTDIR)$(libdir); \
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
301 $(RANLIB) $(DESTDIR)$(libdir)/$(GLLIBBASENAME); \
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
302 fi
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
303 - $(RANLIB) $(DESTDIR)$(libdir)/$(IMGLIBBASENAME)
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
304 if test x$(DSONAME) = xlibfltk.so.1.3; then\
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
305 $(RM) $(DESTDIR)$(libdir)/libfltk.so*;\
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
306 $(INSTALL_LIB) libfltk.so.1.3 $(DESTDIR)$(libdir); \
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
307 @@ -687,6 +698,10 @@
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
308 $(RM) $(DESTDIR)$(libdir)/libfltk_images.dll.a;\
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
309 $(INSTALL_LIB) libfltk_images.dll.a $(DESTDIR)$(libdir); \
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
310 fi
3143
a2afd94e919f [MSVC] fix fltk-config script for octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3099
diff changeset
311 + if test x$(DSONAME) = x@@LIBRARY_PREFIX@@fltk-1.3@@LIBRARY_SUFFIX@@.dll; then\
3099
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
312 + $(RM) $(DESTDIR)$(bindir)/$(DSONAME);\
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
313 + $(INSTALL_LIB) $(DSONAME) $(DESTDIR)$(bindir); \
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
314 + fi
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
315
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
316
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
317 uninstall:
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
318 diff -ur fltk-1.3.1-orig/test/Makefile fltk-1.3.1/test/Makefile
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
319 --- fltk-1.3.1-orig/test/Makefile 2011-07-19 00:49:30 -0400
3149
7bd867b6fc5b [MSVC] fix fltk-config to include OpenGL libraries with using --use-gl
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3143
diff changeset
320 +++ fltk-1.3.1/test/Makefile 2013-07-17 19:22:49 -0400
3099
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
321 @@ -260,7 +260,7 @@
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
322 # FLUID file rules
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
323 .fl.cxx .fl.h: ../fluid/fluid$(EXEEXT)
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
324 echo Generating $@ and header from $<...
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
325 - ../fluid/fluid$(EXEEXT) -c $<
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
326 + PATH=../src:$$PATH ../fluid/fluid$(EXEEXT) -c $<
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
327
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
328 # All demos depend on the FLTK library...
034f830a5823 [MSVC] enable FLTK compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
329 $(ALL): $(LIBNAME)