summaryrefslogtreecommitdiff
path: root/src/Makefile
diff options
context:
space:
mode:
authorManolo Gouy <Manolo>2016-04-07 15:10:30 +0000
committerManolo Gouy <Manolo>2016-04-07 15:10:30 +0000
commit23a60edb44d264887a398eef1b6346f8f24737e2 (patch)
treeae6920a8b002dd26240f560d61df84888ba3b4a5 /src/Makefile
parent406fcaf3053b2d8d9c8ea677c59667a7ec43a556 (diff)
Rewrite filename_list.cxx under the driver model.
One more platform-dependent type is necessary: struct dirent Create a new header file, FL/platform_types.h, to define all types whose definition is platform-dependent. This file is for C because it is included by scandir_XXX.c git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11550 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/Makefile')
-rw-r--r--src/Makefile12
1 files changed, 10 insertions, 2 deletions
diff --git a/src/Makefile b/src/Makefile
index c5bce1a7b..b33a7795e 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -209,7 +209,7 @@ IMGCPPFILES = \
Fl_PNM_Image.cxx
-CFILES = fl_call_main.c flstring.c scandir.c numericsort.c vsnprintf.c
+CFILES = fl_call_main.c flstring.c numericsort.c vsnprintf.c
UTF8CFILES = \
xutf8/case.c \
@@ -257,7 +257,8 @@ XLIBCPPFILES = \
# This C file is used under condition: BUILD_X11
XLIBCFILES = \
- xutf8/keysym2Ucs.c
+ xutf8/keysym2Ucs.c \
+ scandir_posix.c
# These C files are used under condition: BUILD_X11 AND NOT BUILD_XFT
XLIBXCFILES = \
@@ -294,6 +295,10 @@ GDICPPFILES = \
Fl_Native_File_Chooser_WIN32.cxx \
Fl_get_key_win32.cxx
+# These C files are used under condition: BUILD_GDI
+GDICFILES = \
+ scandir_win32.c
+
PSCPPFILES = \
drivers/PostScript/Fl_PostScript.cxx \
drivers/PostScript/Fl_PostScript_image.cxx
@@ -315,6 +320,8 @@ CPPFILES += $(shell if test $(BUILD_GDI) = Yes; then echo $(GDICPPFILES); fi)
CFILES += $(shell if test $(BUILD_X11) = Yes; then echo $(XLIBCFILES); fi)
CFILES += $(shell if test $(BUILD_X11) = Yes -a $(BUILD_XFT) != Yes; then echo $(XLIBXCFILES); fi)
+CFILES += $(shell if test $(BUILD_GDI) = Yes; then echo $(GDICFILES); fi)
+
OBJECTS = $(MMFILES:.mm=.o) $(CPPFILES:.cxx=.o) $(CFILES:.c=.o) $(UTF8CFILES:.c=.o)
GLOBJECTS = $(GLCPPFILES:.cxx=.o)
FLOBJECTS = $(FLCPPFILES:.cxx=.o)
@@ -595,6 +602,7 @@ include makedepend
# (like "*xft*") here:
Fl_get_key_mac.o: Fl_get_key_mac.cxx
Fl_get_key_win32.o: Fl_get_key_win32.cxx
+scandir_win32.o scandir_win32.c
Fl_Native_File_Chooser_WIN32.o : Fl_Native_File_Chooser_WIN32.cxx
Fl_Native_File_Chooser_MAC.o: Fl_Native_File_Chooser_MAC.mm
Fl_Native_File_Chooser_FLTK.o: Fl_Native_File_Chooser_FLTK.cxx