diff options
| author | Albrecht Schlosser <albrechts.fltk@online.de> | 2016-01-31 00:39:57 +0000 |
|---|---|---|
| committer | Albrecht Schlosser <albrechts.fltk@online.de> | 2016-01-31 00:39:57 +0000 |
| commit | 5c32d3b24ceec2005c38ec7e3335fead43b26d1d (patch) | |
| tree | 1453890859ba59b6ccc35715730045a91965d5cf /src/Makefile | |
| parent | 6cc67c18f24d76ce890e16fb9e55217b8665680b (diff) | |
Update build system to compile all drivers as indiviual objects.
Removed obsolete files that served only one purpose: to #include
different driver files. Updated CMake and Makefiles to reflect the
changes. Build tested with:
- MinGW + configure/make
- MinGW + CMake/make
- Visual Studio 2010 generated by CMake
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11092 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/Makefile')
| -rw-r--r-- | src/Makefile | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/src/Makefile b/src/Makefile index 8797e790b..a8ddc3d25 100644 --- a/src/Makefile +++ b/src/Makefile @@ -124,7 +124,6 @@ CPPFILES = \ filename_match.cxx \ filename_setext.cxx \ fl_arc.cxx \ - fl_arci.cxx \ fl_ask.cxx \ fl_boxtype.cxx \ fl_color.cxx \ @@ -133,7 +132,6 @@ CPPFILES = \ fl_diamond_box.cxx \ fl_dnd.cxx \ fl_draw.cxx \ - fl_draw_image.cxx \ fl_draw_pixmap.cxx \ fl_encoding_latin1.cxx \ fl_encoding_mac_roman.cxx \ @@ -154,7 +152,6 @@ CPPFILES = \ fl_round_box.cxx \ fl_rounded_box.cxx \ fl_set_font.cxx \ - fl_set_fonts.cxx \ fl_scroll_area.cxx \ fl_shadow_box.cxx \ fl_shortcut.cxx \ @@ -191,7 +188,16 @@ GLCPPFILES = \ gl_draw.cxx \ gl_start.cxx \ glut_compatability.cxx \ - glut_font.cxx + glut_font.cxx \ + drivers/OpenGL/Fl_OpenGL_Display_Device.cxx \ + drivers/OpenGL/Fl_OpenGL_Graphics_Driver.cxx \ + drivers/OpenGL/Fl_OpenGL_Graphics_Driver_arci.cxx \ + drivers/OpenGL/Fl_OpenGL_Graphics_Driver_color.cxx \ + drivers/OpenGL/Fl_OpenGL_Graphics_Driver_font.cxx \ + drivers/OpenGL/Fl_OpenGL_Graphics_Driver_image.cxx \ + drivers/OpenGL/Fl_OpenGL_Graphics_Driver_line_style.cxx \ + drivers/OpenGL/Fl_OpenGL_Graphics_Driver_rect.cxx \ + drivers/OpenGL/Fl_OpenGL_Graphics_Driver_vertex.cxx IMGCPPFILES = \ fl_images_core.cxx \ @@ -260,7 +266,7 @@ CPPFILES += $(shell if test $(BUILD_X11) = Yes; then echo $(XLIBCPPFILES); fi) CPPFILES += $(shell if test $(BUILD_X11) = Yes -a $(BUILD_XFT) = Yes; then echo $(XLIBXFTFILES); fi) CPPFILES += $(shell if test $(BUILD_X11) = Yes -a $(BUILD_XFT) != Yes; then echo $(XLIBFONTFILES); fi) -# CPPFILES += $(shell if test $(BUILD_GDI) = Yes; then echo $(GDICPPFILES); fi) +CPPFILES += $(shell if test $(BUILD_GDI) = Yes; then echo $(GDICPPFILES); fi) OBJECTS = $(MMFILES:.mm=.o) $(CPPFILES:.cxx=.o) $(CFILES:.c=.o) $(UTF8CFILES:.c=.o) |