mirror of https://github.com/fltk/fltk
Fluid: Fix platform-specific build system (CMake + configure).
Don't compile "empty" file (avoid warning: empty translation unit). Add '-u' (update) command switch to 'make rebuild'. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12173 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
parent
1e5826e84b
commit
66cdcfcd1b
|
@ -22,8 +22,6 @@ set(CPPFILES
|
||||||
Fl_Group_Type.cxx
|
Fl_Group_Type.cxx
|
||||||
Fl_Menu_Type.cxx
|
Fl_Menu_Type.cxx
|
||||||
Fl_Type.cxx
|
Fl_Type.cxx
|
||||||
ExternalCodeEditor_UNIX.cxx
|
|
||||||
ExternalCodeEditor_WIN32.cxx
|
|
||||||
Fl_Widget_Type.cxx
|
Fl_Widget_Type.cxx
|
||||||
Fl_Window_Type.cxx
|
Fl_Window_Type.cxx
|
||||||
Fluid_Image.cxx
|
Fluid_Image.cxx
|
||||||
|
@ -40,6 +38,14 @@ set(CPPFILES
|
||||||
widget_panel.cxx
|
widget_panel.cxx
|
||||||
)
|
)
|
||||||
|
|
||||||
|
# ExternalCodeEditor: platform specific files
|
||||||
|
|
||||||
|
if (WIN32)
|
||||||
|
list(APPEND CPPFILES ExternalCodeEditor_WIN32.cxx)
|
||||||
|
else ()
|
||||||
|
list(APPEND CPPFILES ExternalCodeEditor_UNIX.cxx)
|
||||||
|
endif (WIN32)
|
||||||
|
|
||||||
if(APPLE AND (NOT OPTION_APPLE_X11) AND (NOT OPTION_APPLE_SDL))
|
if(APPLE AND (NOT OPTION_APPLE_X11) AND (NOT OPTION_APPLE_SDL))
|
||||||
set( ICON_NAME fluid.icns )
|
set( ICON_NAME fluid.icns )
|
||||||
set( ICON_PATH "${PROJECT_SOURCE_DIR}/fluid/Fluid.app/Contents/Resources/${ICON_NAME}" )
|
set( ICON_PATH "${PROJECT_SOURCE_DIR}/fluid/Fluid.app/Contents/Resources/${ICON_NAME}" )
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
//
|
//
|
||||||
// External code editor management class for Unix
|
// External code editor management class for Unix
|
||||||
//
|
//
|
||||||
#ifndef WIN32 /* This entire file unix only */
|
// Note: This entire file Unix only
|
||||||
|
|
||||||
#include <errno.h> /* errno */
|
#include <errno.h> /* errno */
|
||||||
#include <string.h> /* strerror() */
|
#include <string.h> /* strerror() */
|
||||||
|
@ -459,7 +459,6 @@ int ExternalCodeEditor::editors_open() {
|
||||||
return L_editors_open;
|
return L_editors_open;
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif /* !WIN32 */
|
|
||||||
//
|
//
|
||||||
// End of "$Id$".
|
// End of "$Id$".
|
||||||
//
|
//
|
||||||
|
|
|
@ -3,8 +3,7 @@
|
||||||
//
|
//
|
||||||
// External code editor management class for Windows
|
// External code editor management class for Windows
|
||||||
//
|
//
|
||||||
|
// Note: This entire file Windows only.
|
||||||
#ifdef WIN32 /* This entire file windows only */
|
|
||||||
|
|
||||||
#include <stdio.h> // snprintf()
|
#include <stdio.h> // snprintf()
|
||||||
|
|
||||||
|
@ -571,7 +570,6 @@ int ExternalCodeEditor::editors_open() {
|
||||||
return L_editors_open;
|
return L_editors_open;
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif /* WIN32 */
|
|
||||||
//
|
//
|
||||||
// End of "$Id$".
|
// End of "$Id$".
|
||||||
//
|
//
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
#
|
#
|
||||||
# FLUID makefile for the Fast Light Tool Kit (FLTK).
|
# FLUID makefile for the Fast Light Tool Kit (FLTK).
|
||||||
#
|
#
|
||||||
# Copyright 1998-2016 by Bill Spitzak and others.
|
# Copyright 1998-2017 by Bill Spitzak and others.
|
||||||
#
|
#
|
||||||
# This library is free software. Distribution and use rights are outlined in
|
# This library is free software. Distribution and use rights are outlined in
|
||||||
# the file "COPYING" which should have been included with this file. If this
|
# the file "COPYING" which should have been included with this file. If this
|
||||||
|
@ -16,10 +16,10 @@
|
||||||
# http://www.fltk.org/str.php
|
# http://www.fltk.org/str.php
|
||||||
#
|
#
|
||||||
|
|
||||||
|
include ../makeinclude
|
||||||
|
|
||||||
CPPFILES = \
|
CPPFILES = \
|
||||||
CodeEditor.cxx \
|
CodeEditor.cxx \
|
||||||
ExternalCodeEditor_UNIX.cxx \
|
|
||||||
ExternalCodeEditor_WIN32.cxx \
|
|
||||||
Fl_Function_Type.cxx \
|
Fl_Function_Type.cxx \
|
||||||
Fl_Group_Type.cxx \
|
Fl_Group_Type.cxx \
|
||||||
Fl_Menu_Type.cxx \
|
Fl_Menu_Type.cxx \
|
||||||
|
@ -39,12 +39,19 @@ CPPFILES = \
|
||||||
undo.cxx \
|
undo.cxx \
|
||||||
widget_panel.cxx
|
widget_panel.cxx
|
||||||
|
|
||||||
|
# ExternalCodeEditor: platform specific files
|
||||||
|
|
||||||
|
CPPFILES_WIN = ExternalCodeEditor_WIN32.cxx
|
||||||
|
CPPFILES_OSX = ExternalCodeEditor_UNIX.cxx
|
||||||
|
CPPFILES_X11 = ExternalCodeEditor_UNIX.cxx
|
||||||
|
CPPFILES_XFT = ExternalCodeEditor_UNIX.cxx
|
||||||
|
|
||||||
|
CPPFILES += $(CPPFILES_$(BUILD))
|
||||||
|
|
||||||
################################################################
|
################################################################
|
||||||
|
|
||||||
OBJECTS = $(CPPFILES:.cxx=.o)
|
OBJECTS = $(CPPFILES:.cxx=.o)
|
||||||
|
|
||||||
include ../makeinclude
|
|
||||||
|
|
||||||
all: $(FLUID) fluid$(EXEEXT)
|
all: $(FLUID) fluid$(EXEEXT)
|
||||||
|
|
||||||
fluid$(EXEEXT): $(OBJECTS) $(LIBNAME) $(FLLIBNAME) \
|
fluid$(EXEEXT): $(OBJECTS) $(LIBNAME) $(FLLIBNAME) \
|
||||||
|
@ -116,12 +123,12 @@ uninstall-osx:
|
||||||
#
|
#
|
||||||
|
|
||||||
rebuild:
|
rebuild:
|
||||||
./fluid -c about_panel.fl
|
./fluid -u -c about_panel.fl
|
||||||
./fluid -c alignment_panel.fl
|
./fluid -u -c alignment_panel.fl
|
||||||
./fluid -c function_panel.fl
|
./fluid -u -c function_panel.fl
|
||||||
./fluid -c print_panel.fl
|
./fluid -u -c print_panel.fl
|
||||||
./fluid -c template_panel.fl
|
./fluid -u -c template_panel.fl
|
||||||
./fluid -c widget_panel.fl
|
./fluid -u -c widget_panel.fl
|
||||||
|
|
||||||
#
|
#
|
||||||
# End of "$Id$".
|
# End of "$Id$".
|
||||||
|
|
|
@ -26,7 +26,7 @@ FL_DSO_VERSION = @FL_DSO_VERSION@
|
||||||
FL_ABI_VERSION = @FL_ABI_VERSION@
|
FL_ABI_VERSION = @FL_ABI_VERSION@
|
||||||
FL_VERSION = @FL_VERSION@
|
FL_VERSION = @FL_VERSION@
|
||||||
|
|
||||||
# FLTK configuration options
|
# FLTK configuration options: BUILD = { WIN | OSX | X11 | XFT }
|
||||||
|
|
||||||
BUILD = @BUILD@
|
BUILD = @BUILD@
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue