mirror of https://github.com/fltk/fltk
Fix dependencies and whitespace errors
No "real" code changes, but dependencies can affect building.
This commit is contained in:
parent
6064518100
commit
6a546d4e9c
|
@ -74,7 +74,7 @@
|
||||||
|
|
||||||
\see examples/cairo-draw-x.cxx
|
\see examples/cairo-draw-x.cxx
|
||||||
\see test/cairo_test.cxx
|
\see test/cairo_test.cxx
|
||||||
|
|
||||||
\note Class Fl_Cairo_Window requires the FLTK library to have been built with
|
\note Class Fl_Cairo_Window requires the FLTK library to have been built with
|
||||||
CMake option OPTION_CAIRO or configure --enable-cairo.
|
CMake option OPTION_CAIRO or configure --enable-cairo.
|
||||||
|
|
||||||
|
|
10
configure.ac
10
configure.ac
|
@ -999,7 +999,7 @@ AS_CASE([$host_os_gui], [cygwin* | mingw*], [
|
||||||
LDFLAGS="$LDFLAGS -rdynamic"
|
LDFLAGS="$LDFLAGS -rdynamic"
|
||||||
AC_SUBST([UNAME])
|
AC_SUBST([UNAME])
|
||||||
UNAME="$(uname -s)"
|
UNAME="$(uname -s)"
|
||||||
AS_CASE([$UNAME],
|
AS_CASE([$UNAME],
|
||||||
[Linux], [LDFLAGS="$LDFLAGS -no-pie"],
|
[Linux], [LDFLAGS="$LDFLAGS -no-pie"],
|
||||||
[*], [CXXFLAGS="$CXXFLAGS -I../libdecor/build"]
|
[*], [CXXFLAGS="$CXXFLAGS -I../libdecor/build"]
|
||||||
)
|
)
|
||||||
|
@ -1007,12 +1007,12 @@ AS_CASE([$host_os_gui], [cygwin* | mingw*], [
|
||||||
AC_SEARCH_LIBS([dlopen], [dl])
|
AC_SEARCH_LIBS([dlopen], [dl])
|
||||||
|
|
||||||
AS_IF([test x$enable_gl != xno], [
|
AS_IF([test x$enable_gl != xno], [
|
||||||
AS_IF([$PKGCONFIG --exists gl], [
|
AS_IF([$PKGCONFIG --exists gl], [
|
||||||
AC_DEFINE([HAVE_GL])
|
AC_DEFINE([HAVE_GL])
|
||||||
GLLIBS="$($PKGCONFIG --libs wayland-egl) $($PKGCONFIG --libs egl) $($PKGCONFIG --libs gl) $GLLIBS"
|
GLLIBS="$($PKGCONFIG --libs wayland-egl) $($PKGCONFIG --libs egl) $($PKGCONFIG --libs gl) $GLLIBS"
|
||||||
])
|
])
|
||||||
AS_IF([$PKGCONFIG --exists glu], [
|
AS_IF([$PKGCONFIG --exists glu], [
|
||||||
AC_DEFINE([HAVE_GL_GLU_H])
|
AC_DEFINE([HAVE_GL_GLU_H])
|
||||||
GLLIBS="$($PKGCONFIG --libs glu) $GLLIBS"
|
GLLIBS="$($PKGCONFIG --libs glu) $GLLIBS"
|
||||||
])
|
])
|
||||||
GLWLDEMO="egl"
|
GLWLDEMO="egl"
|
||||||
|
|
|
@ -2,44 +2,24 @@
|
||||||
|
|
||||||
drivers/Cairo/Fl_Cairo_Graphics_Driver.o: ../config.h
|
drivers/Cairo/Fl_Cairo_Graphics_Driver.o: ../config.h
|
||||||
drivers/Cairo/Fl_Cairo_Graphics_Driver.o: ../FL/fl_config.h
|
drivers/Cairo/Fl_Cairo_Graphics_Driver.o: ../FL/fl_config.h
|
||||||
drivers/OpenGL/Fl_OpenGL_Display_Device.o: ../config.h
|
|
||||||
drivers/OpenGL/Fl_OpenGL_Display_Device.o: ../FL/Enumerations.H
|
drivers/OpenGL/Fl_OpenGL_Display_Device.o: ../FL/Enumerations.H
|
||||||
drivers/OpenGL/Fl_OpenGL_Display_Device.o: ../FL/Fl.H
|
drivers/OpenGL/Fl_OpenGL_Display_Device.o: ../FL/Fl.H
|
||||||
drivers/OpenGL/Fl_OpenGL_Display_Device.o: ../FL/Fl_Bitmap.H
|
drivers/OpenGL/Fl_OpenGL_Display_Device.o: ../FL/Fl_Bitmap.H
|
||||||
drivers/OpenGL/Fl_OpenGL_Display_Device.o: ../FL/Fl_Cairo.H
|
|
||||||
drivers/OpenGL/Fl_OpenGL_Display_Device.o: ../FL/fl_casts.H
|
|
||||||
drivers/OpenGL/Fl_OpenGL_Display_Device.o: ../FL/fl_config.h
|
drivers/OpenGL/Fl_OpenGL_Display_Device.o: ../FL/fl_config.h
|
||||||
drivers/OpenGL/Fl_OpenGL_Display_Device.o: ../FL/Fl_Device.H
|
drivers/OpenGL/Fl_OpenGL_Display_Device.o: ../FL/Fl_Device.H
|
||||||
drivers/OpenGL/Fl_OpenGL_Display_Device.o: ../FL/Fl_Double_Window.H
|
|
||||||
drivers/OpenGL/Fl_OpenGL_Display_Device.o: ../FL/fl_draw.H
|
drivers/OpenGL/Fl_OpenGL_Display_Device.o: ../FL/fl_draw.H
|
||||||
drivers/OpenGL/Fl_OpenGL_Display_Device.o: ../FL/Fl_Export.H
|
drivers/OpenGL/Fl_OpenGL_Display_Device.o: ../FL/Fl_Export.H
|
||||||
drivers/OpenGL/Fl_OpenGL_Display_Device.o: ../FL/Fl_Gl_Window.H
|
|
||||||
drivers/OpenGL/Fl_OpenGL_Display_Device.o: ../FL/Fl_Graphics_Driver.H
|
drivers/OpenGL/Fl_OpenGL_Display_Device.o: ../FL/Fl_Graphics_Driver.H
|
||||||
drivers/OpenGL/Fl_OpenGL_Display_Device.o: ../FL/Fl_Group.H
|
|
||||||
drivers/OpenGL/Fl_OpenGL_Display_Device.o: ../FL/Fl_Image.H
|
drivers/OpenGL/Fl_OpenGL_Display_Device.o: ../FL/Fl_Image.H
|
||||||
drivers/OpenGL/Fl_OpenGL_Display_Device.o: ../FL/Fl_Overlay_Window.H
|
|
||||||
drivers/OpenGL/Fl_OpenGL_Display_Device.o: ../FL/Fl_Pixmap.H
|
drivers/OpenGL/Fl_OpenGL_Display_Device.o: ../FL/Fl_Pixmap.H
|
||||||
drivers/OpenGL/Fl_OpenGL_Display_Device.o: ../FL/Fl_Plugin.H
|
drivers/OpenGL/Fl_OpenGL_Display_Device.o: ../FL/Fl_Plugin.H
|
||||||
drivers/OpenGL/Fl_OpenGL_Display_Device.o: ../FL/Fl_Preferences.H
|
drivers/OpenGL/Fl_OpenGL_Display_Device.o: ../FL/Fl_Preferences.H
|
||||||
drivers/OpenGL/Fl_OpenGL_Display_Device.o: ../FL/Fl_Rect.H
|
|
||||||
drivers/OpenGL/Fl_OpenGL_Display_Device.o: ../FL/Fl_RGB_Image.H
|
drivers/OpenGL/Fl_OpenGL_Display_Device.o: ../FL/Fl_RGB_Image.H
|
||||||
drivers/OpenGL/Fl_OpenGL_Display_Device.o: ../FL/Fl_Scrollbar.H
|
|
||||||
drivers/OpenGL/Fl_OpenGL_Display_Device.o: ../FL/Fl_Slider.H
|
|
||||||
drivers/OpenGL/Fl_OpenGL_Display_Device.o: ../FL/Fl_Text_Buffer.H
|
|
||||||
drivers/OpenGL/Fl_OpenGL_Display_Device.o: ../FL/Fl_Text_Display.H
|
|
||||||
drivers/OpenGL/Fl_OpenGL_Display_Device.o: ../FL/Fl_Text_Editor.H
|
|
||||||
drivers/OpenGL/Fl_OpenGL_Display_Device.o: ../FL/fl_types.h
|
drivers/OpenGL/Fl_OpenGL_Display_Device.o: ../FL/fl_types.h
|
||||||
drivers/OpenGL/Fl_OpenGL_Display_Device.o: ../FL/fl_utf8.h
|
|
||||||
drivers/OpenGL/Fl_OpenGL_Display_Device.o: ../FL/Fl_Valuator.H
|
|
||||||
drivers/OpenGL/Fl_OpenGL_Display_Device.o: ../FL/Fl_Widget.H
|
drivers/OpenGL/Fl_OpenGL_Display_Device.o: ../FL/Fl_Widget.H
|
||||||
drivers/OpenGL/Fl_OpenGL_Display_Device.o: ../FL/Fl_Window.H
|
|
||||||
drivers/OpenGL/Fl_OpenGL_Display_Device.o: ../FL/gl.h
|
|
||||||
drivers/OpenGL/Fl_OpenGL_Display_Device.o: ../FL/platform_types.h
|
drivers/OpenGL/Fl_OpenGL_Display_Device.o: ../FL/platform_types.h
|
||||||
drivers/OpenGL/Fl_OpenGL_Display_Device.o: drivers/OpenGL/Fl_OpenGL_Display_Device.H
|
drivers/OpenGL/Fl_OpenGL_Display_Device.o: drivers/OpenGL/Fl_OpenGL_Display_Device.H
|
||||||
drivers/OpenGL/Fl_OpenGL_Display_Device.o: drivers/OpenGL/Fl_OpenGL_Graphics_Driver.H
|
drivers/OpenGL/Fl_OpenGL_Display_Device.o: drivers/OpenGL/Fl_OpenGL_Graphics_Driver.H
|
||||||
drivers/OpenGL/Fl_OpenGL_Display_Device.o: Fl_Gl_Window_Driver.H
|
|
||||||
drivers/OpenGL/Fl_OpenGL_Display_Device.o: Fl_Screen_Driver.H
|
|
||||||
drivers/OpenGL/Fl_OpenGL_Display_Device.o: Fl_Window_Driver.H
|
|
||||||
drivers/OpenGL/Fl_OpenGL_Graphics_Driver_arci.o: ../config.h
|
drivers/OpenGL/Fl_OpenGL_Graphics_Driver_arci.o: ../config.h
|
||||||
drivers/OpenGL/Fl_OpenGL_Graphics_Driver_arci.o: ../FL/Enumerations.H
|
drivers/OpenGL/Fl_OpenGL_Graphics_Driver_arci.o: ../FL/Enumerations.H
|
||||||
drivers/OpenGL/Fl_OpenGL_Graphics_Driver_arci.o: ../FL/Fl.H
|
drivers/OpenGL/Fl_OpenGL_Graphics_Driver_arci.o: ../FL/Fl.H
|
||||||
|
@ -753,6 +733,7 @@ drivers/Xlib/Fl_Xlib_Graphics_Driver_image.o: ../FL/Fl_Slider.H
|
||||||
drivers/Xlib/Fl_Xlib_Graphics_Driver_image.o: ../FL/Fl_Text_Buffer.H
|
drivers/Xlib/Fl_Xlib_Graphics_Driver_image.o: ../FL/Fl_Text_Buffer.H
|
||||||
drivers/Xlib/Fl_Xlib_Graphics_Driver_image.o: ../FL/Fl_Text_Display.H
|
drivers/Xlib/Fl_Xlib_Graphics_Driver_image.o: ../FL/Fl_Text_Display.H
|
||||||
drivers/Xlib/Fl_Xlib_Graphics_Driver_image.o: ../FL/Fl_Text_Editor.H
|
drivers/Xlib/Fl_Xlib_Graphics_Driver_image.o: ../FL/Fl_Text_Editor.H
|
||||||
|
drivers/Xlib/Fl_Xlib_Graphics_Driver_image.o: ../FL/Fl_Tiled_Image.H
|
||||||
drivers/Xlib/Fl_Xlib_Graphics_Driver_image.o: ../FL/fl_types.h
|
drivers/Xlib/Fl_Xlib_Graphics_Driver_image.o: ../FL/fl_types.h
|
||||||
drivers/Xlib/Fl_Xlib_Graphics_Driver_image.o: ../FL/fl_utf8.h
|
drivers/Xlib/Fl_Xlib_Graphics_Driver_image.o: ../FL/fl_utf8.h
|
||||||
drivers/Xlib/Fl_Xlib_Graphics_Driver_image.o: ../FL/Fl_Valuator.H
|
drivers/Xlib/Fl_Xlib_Graphics_Driver_image.o: ../FL/Fl_Valuator.H
|
||||||
|
@ -1968,7 +1949,7 @@ Fl_Gl_Device_Plugin.o: ../FL/Fl_Preferences.H
|
||||||
Fl_Gl_Device_Plugin.o: ../FL/Fl_RGB_Image.H
|
Fl_Gl_Device_Plugin.o: ../FL/Fl_RGB_Image.H
|
||||||
Fl_Gl_Device_Plugin.o: ../FL/Fl_Window.H
|
Fl_Gl_Device_Plugin.o: ../FL/Fl_Window.H
|
||||||
Fl_Gl_Device_Plugin.o: ../FL/platform_types.h
|
Fl_Gl_Device_Plugin.o: ../FL/platform_types.h
|
||||||
Fl_Gl_Device_Plugin.o: drivers/OpenGL/Fl_OpenGL_Display_Device.H
|
Fl_Gl_Device_Plugin.o: Fl_Gl_Window_Driver.H
|
||||||
Fl_Gl_Overlay.o: ../config.h
|
Fl_Gl_Overlay.o: ../config.h
|
||||||
Fl_Gl_Overlay.o: ../FL/Enumerations.H
|
Fl_Gl_Overlay.o: ../FL/Enumerations.H
|
||||||
Fl_Gl_Overlay.o: ../FL/Fl.H
|
Fl_Gl_Overlay.o: ../FL/Fl.H
|
||||||
|
|
Loading…
Reference in New Issue