mirrors/fltk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix regression in "configure --enable-shared" introduced at c96a4f3

Browse Source
This commit is contained in:
ManoloFLTK 2022-10-13 09:31:49 +02:00
parent e72324d3d9
commit 42887c0619
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Makefile
View File

@ -202,8 +202,8 @@ GLCPPFILES = \
drivers/OpenGL/Fl_OpenGL_Graphics_Driver_rect.cxx \
drivers/OpenGL/Fl_OpenGL_Graphics_Driver_vertex.cxx
GLCPPFILES_OSX = drivers/Cocoa/Fl_Cocoa_Gl_Window_Driver.mm \
drivers/Cocoa/fl_macOS_gl_platform_init.cxx
GLCPPFILES_OSX = drivers/Cocoa/fl_macOS_gl_platform_init.cxx
GLOBJCPPFILES = drivers/Cocoa/Fl_Cocoa_Gl_Window_Driver.mm
GLCPPFILES_X11 = drivers/X11/Fl_X11_Gl_Window_Driver.cxx \
drivers/X11/fl_X11_gl_platform_init.cxx
GLCPPFILES_XFT = $(GLCPPFILES_X11)
@ -216,6 +216,8 @@ GLCPPFILES_WAYLANDX11 = $(GLCPPFILES_WAYLAND) \
drivers/X11/Fl_X11_Gl_Window_Driver.cxx
GLCPPFILES += $(GLCPPFILES_$(BUILD))
GLMMFILES_OSX = $(GLOBJCPPFILES)
GLMMFILES = $(GLMMFILES_$(BUILD))
# the following file currently doesn't contribute code to GLCPPFILES
# drivers/OpenGL/Fl_OpenGL_Graphics_Driver.cxx
@ -427,7 +429,7 @@ CXXFLAGS += $(EXTRA_CXXFLAGS_$(BUILD))
OBJECTS = $(MMFILES:.mm=.o) $(CPPFILES:.cxx=.o) $(CFILES:.c=.o) $(UTF8CFILES:.c=.o)
OBJECTS += $(EXTRA_OBJECTS_$(BUILD))
GLOBJECTS = $(GLCPPFILES:.cxx=.o) $(GLCPPFILES:.mm=.o)
GLOBJECTS = $(GLCPPFILES:.cxx=.o) $(GLMMFILES:.mm=.o)
FLOBJECTS = $(FLCPPFILES:.cxx=.o)
IMGOBJECTS = $(IMGCPPFILES:.cxx=.o)