diff options
| author | Matthias Melcher <fltk@matthiasm.com> | 2007-02-20 17:02:41 +0000 |
|---|---|---|
| committer | Matthias Melcher <fltk@matthiasm.com> | 2007-02-20 17:02:41 +0000 |
| commit | 8ea59b412e4af50813545a836ed1c11ac00f541c (patch) | |
| tree | 0b54d44d750819b99dde5d7d167d1e6158a5a856 /fluid | |
| parent | 658162c5096dfbe75962a3e8d37d8899a914809a (diff) | |
Fixed Watcom compiler setup without verification using a patch by mnieuw
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@5699 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'fluid')
| -rw-r--r-- | fluid/fluid.cxx | 8 | ||||
| -rw-r--r-- | fluid/makefile.wat | 17 | ||||
| -rw-r--r-- | fluid/undo.cxx | 4 |
3 files changed, 18 insertions, 11 deletions
diff --git a/fluid/fluid.cxx b/fluid/fluid.cxx index 6fc0149c1..df48ef78d 100644 --- a/fluid/fluid.cxx +++ b/fluid/fluid.cxx @@ -59,11 +59,13 @@ # include <io.h> # include <commdlg.h> # include <FL/x.H> +# if !defined(__WATCOMC__) // Visual C++ 2005 incorrectly displays a warning about the use of POSIX APIs // on Windows, which is supposed to be POSIX compliant... -# define access _access -# define chdir _chdir -# define getcwd _getcwd +# define access _access +# define chdir _chdir +# define getcwd _getcwd +# endif // !__WATCOMC__ #else # include <unistd.h> #endif diff --git a/fluid/makefile.wat b/fluid/makefile.wat index 9c609ffd8..4f0a164c0 100644 --- a/fluid/makefile.wat +++ b/fluid/makefile.wat @@ -24,21 +24,24 @@ #
OBJECTS = &
+ CodeEditor.obj &
Fl_Function_Type.obj &
- Fl_Menu_Type.obj &
Fl_Group_Type.obj &
- Fl_Widget_Type.obj &
+ Fl_Menu_Type.obj &
Fl_Type.obj &
+ Fl_Widget_Type.obj &
Fl_Window_Type.obj &
Fluid_Image.obj &
+ about_panel.obj &
+ align_widget.obj &
+ alignment_panel.obj &
code.obj &
factory.obj &
file.obj &
- align_widget.obj &
- about_panel.obj &
- widget_panel.obj &
- alignment_panel.obj &
- function_panel.obj
+ function_panel.obj &
+ template_panel.obj &
+ undo.obj &
+ widget_panel.obj
# fluid.obj should not be in the list, because the watcom.mif file
# assumes an object file with the same name as the target executable
diff --git a/fluid/undo.cxx b/fluid/undo.cxx index 502df64b4..54e0bcd6c 100644 --- a/fluid/undo.cxx +++ b/fluid/undo.cxx @@ -34,9 +34,11 @@ # include <io.h> # include <windows.h> # define getpid (int)GetCurrentProcessId +# if !defined(__WATCOMC__) // Visual C++ 2005 incorrectly displays a warning about the use of POSIX APIs // on Windows, which is supposed to be POSIX compliant... -# define unlink _unlink +# define unlink _unlink +# endif // !__WATCOMC__ #else # include <unistd.h> #endif // WIN32 && !__CYGWIN__ |