diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 1998-12-06 14:59:14 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 1998-12-06 14:59:14 +0000 |
| commit | 16252e5fafbf77588f445054a026055e7fdd5b4d (patch) | |
| tree | 3e811a0262b39bb4963cd69683a4ef56ea85908e /fluid | |
| parent | 17a80e000c7b6cbc804298782497b74b8e7db920 (diff) | |
Changes for .C == .cxx and .H == .h.
git-svn-id: file:///fltk/svn/fltk/trunk@128 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'fluid')
| -rw-r--r-- | fluid/Makefile | 44 | ||||
| -rw-r--r-- | fluid/alignment_panel.cxx | 2 | ||||
| -rw-r--r-- | fluid/fluid.cxx | 14 |
3 files changed, 30 insertions, 30 deletions
diff --git a/fluid/Makefile b/fluid/Makefile index ea5c099c7..46762e262 100644 --- a/fluid/Makefile +++ b/fluid/Makefile @@ -1,5 +1,5 @@ # -# "$Id: Makefile,v 1.5 1998/10/21 17:24:50 mike Exp $" +# "$Id: Makefile,v 1.6 1998/12/06 14:59:12 mike Exp $" # # Fluid makefile for the Fast Light Tool Kit (FLTK). # @@ -26,38 +26,38 @@ PROGRAM = fluid CPPFILES = \ - Fl_Function_Type.C \ - Fl_Menu_Type.C \ - Fl_Group_Type.C \ - Fl_Widget_Type.C \ - Fl_Type.C \ - Fl_Window_Type.C \ - Fluid_Image.C \ - code.C \ - factory.C \ - file.C \ - fluid.C \ - about_panel.C \ - widget_panel.C \ - alignment_panel.C \ - function_panel.C \ - gif.C + Fl_Function_Type.cxx \ + Fl_Menu_Type.cxx \ + Fl_Group_Type.cxx \ + Fl_Widget_Type.cxx \ + Fl_Type.cxx \ + Fl_Window_Type.cxx \ + Fluid_Image.cxx \ + code.cxx \ + factory.cxx \ + file.cxx \ + fluid.cxx \ + about_panel.cxx \ + widget_panel.cxx \ + alignment_panel.cxx \ + function_panel.cxx \ + gif.cxx ################################################################ -OBJECTS = $(CPPFILES:.C=.o) +OBJECTS = $(CPPFILES:.cxx=.o) include ../makeinclude -.SUFFIXES : .C .c .o +.SUFFIXES : .cxx .c .o -.C.o : +.cxx.o : @echo $<: @$(CXX) -I.. $(CXXFLAGS) -c $< .c.o : @echo $<: @$(CC) -I.. $(CFLAGS) -c $< -.C : +.cxx : @echo $@: @$(CXX) -I.. $(CXXFLAGS) -o $@ $< -L../lib -lfltk $(LDLIBS) @@ -94,5 +94,5 @@ rebuild: ./fluid -c widget_panel.fl # -# End of "$Id: Makefile,v 1.5 1998/10/21 17:24:50 mike Exp $". +# End of "$Id: Makefile,v 1.6 1998/12/06 14:59:12 mike Exp $". # diff --git a/fluid/alignment_panel.cxx b/fluid/alignment_panel.cxx index 218c8b80d..d01b012f4 100644 --- a/fluid/alignment_panel.cxx +++ b/fluid/alignment_panel.cxx @@ -68,7 +68,7 @@ Fl_Window* make_alignment_window() { o->callback((Fl_Callback*)code_input_cb, (void*)(1)); o->when(1); } - { Fl_Light_Button* o = include_H_from_C_button = new Fl_Light_Button(60, 250, 140, 20, "Include .H from .C"); + { Fl_Light_Button* o = include_H_from_C_button = new Fl_Light_Button(60, 250, 140, 20, "Include .h from .cxx"); o->value(1); o->callback((Fl_Callback*)include_H_from_C_button_cb); } diff --git a/fluid/fluid.cxx b/fluid/fluid.cxx index 948d9a061..beed2a503 100644 --- a/fluid/fluid.cxx +++ b/fluid/fluid.cxx @@ -1,5 +1,5 @@ // -// "$Id: fluid.cxx,v 1.6 1998/11/05 16:04:44 mike Exp $" +// "$Id: fluid.cxx,v 1.7 1998/12/06 14:59:13 mike Exp $" // // FLUID main entry for the Fast Light Tool Kit (FLTK). // @@ -150,8 +150,8 @@ void new_cb(Fl_Widget *, void *v) { static int compile_only; -const char* header_file_name = ".H"; -const char* code_file_name = ".C"; +const char* header_file_name = ".h"; +const char* code_file_name = ".cxx"; void write_cb(Fl_Widget *, void *) { if (!filename) { @@ -377,9 +377,9 @@ int main(int argc,char **argv) { int i = 1; if (!Fl::args(argc,argv,i,arg) || i < argc-1) { fprintf(stderr,"usage: %s <switches> name.fl\n" -" -c : write .C and .H and exit\n" -" -o <name> : .C output filename, or extension if <name> starts with '.'\n" -" -h <name> : .H output filename, or extension if <name> starts with '.'\n" +" -c : write .cxx and .h and exit\n" +" -o <name> : .cxx output filename, or extension if <name> starts with '.'\n" +" -h <name> : .h output filename, or extension if <name> starts with '.'\n" "%s\n", argv[0], Fl::help); return 1; } @@ -407,5 +407,5 @@ int main(int argc,char **argv) { } // -// End of "$Id: fluid.cxx,v 1.6 1998/11/05 16:04:44 mike Exp $". +// End of "$Id: fluid.cxx,v 1.7 1998/12/06 14:59:13 mike Exp $". // |
