diff options
| author | ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com> | 2022-10-13 09:31:49 +0200 |
|---|---|---|
| committer | ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com> | 2022-10-13 09:31:49 +0200 |
| commit | 42887c061966971eab69c2ffb50374e33155166f (patch) | |
| tree | 280dd0970c624f29c51204c9a0d18259672008ae /src/Makefile | |
| parent | e72324d3d9f9db448e666f7d6549caec16f40252 (diff) | |
Fix regression in "configure --enable-shared" introduced at c96a4f3
Diffstat (limited to 'src/Makefile')
| -rw-r--r-- | src/Makefile | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/Makefile b/src/Makefile index 1271f7ce3..cb3421414 100644 --- a/src/Makefile +++ b/src/Makefile @@ -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) |