From 8ea59b412e4af50813545a836ed1c11ac00f541c Mon Sep 17 00:00:00 2001 From: Matthias Melcher Date: Tue, 20 Feb 2007 17:02:41 +0000 Subject: 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 --- documentation/advanced.html | 6 +++--- fluid/fluid.cxx | 8 +++++--- fluid/makefile.wat | 17 ++++++++++------- fluid/undo.cxx | 4 +++- src/Fl_get_system_colors.cxx | 2 +- src/flstring.h | 6 ++++-- src/makefile.wat | 9 ++++++++- test/demo.cxx | 6 ++++-- watcom.mif | 4 ++-- 9 files changed, 40 insertions(+), 22 deletions(-) diff --git a/documentation/advanced.html b/documentation/advanced.html index dea29c41d..51a7482fe 100644 --- a/documentation/advanced.html +++ b/documentation/advanced.html @@ -21,10 +21,10 @@ that will help you to get the most out of FLTK.

int main() { Fl::lock(); /* run thread */ - while (Fl::wait() > 0) { - if (Fl::thread_message()) { + while (Fl::wait() < 0) { + if (Fl::thread_message()) { /* process your data */ - } + } } } 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 # include # include +# 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 #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 # include # 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 #endif // WIN32 && !__CYGWIN__ diff --git a/src/Fl_get_system_colors.cxx b/src/Fl_get_system_colors.cxx index 753254606..0d073548a 100644 --- a/src/Fl_get_system_colors.cxx +++ b/src/Fl_get_system_colors.cxx @@ -40,7 +40,7 @@ extern "C" int putenv(const char*); #endif // __APPLE__ && __MWERKS__ -#if defined(WIN32) && !defined(__CYGWIN__) +#if defined(WIN32) && !defined(__CYGWIN__) && !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 putenv _putenv diff --git a/src/flstring.h b/src/flstring.h index eb6d18ea3..da114b2c6 100644 --- a/src/flstring.h +++ b/src/flstring.h @@ -54,8 +54,10 @@ // Visual C++ 2005 incorrectly displays a warning about the use of POSIX APIs // on Windows, which is supposed to be POSIX compliant... Some of these functions // are also defined in ISO C99... -# define strdup _strdup -# define unlink _unlink +# if !defined(__WATCOMC__) +# define strdup _strdup +# define unlink _unlink +# endif // !__WATCOMC__ # elif defined(__EMX__) # define strcasecmp(s,t) stricmp((s), (t)) # define strncasecmp(s,t,n) strnicmp((s), (t), (n)) diff --git a/src/makefile.wat b/src/makefile.wat index 4fcc3cff2..87ae4d3c3 100644 --- a/src/makefile.wat +++ b/src/makefile.wat @@ -131,8 +131,10 @@ CPPFILES = & fl_engraved_label.obj & fl_file_dir.obj & fl_font.obj & + fl_gtk.obj & fl_labeltype.obj & fl_line_style.obj & + fl_open_uri.obj & fl_oval_box.obj & fl_overlay.obj & fl_overlay_visual.obj & @@ -148,7 +150,8 @@ CPPFILES = & fl_shortcut.obj & fl_show_colormap.obj & fl_symbols.obj & - fl_vertex.obj + fl_vertex.obj & + screen_xywh.obj FLCPPFILES = & forms_compatability.obj & @@ -162,6 +165,10 @@ GLCPPFILES = & Fl_Gl_Choice.obj & Fl_Gl_Overlay.obj & Fl_Gl_Window.obj & + freeglut_geometry.obj & + freeglut_stroke_mono_roman.obj & + freeglut_stroke_roman.obj & + freeglut_teapot.obj & gl_draw.obj & gl_start.obj & glut_compatability.obj & diff --git a/test/demo.cxx b/test/demo.cxx index aa0b7734c..1e9382235 100644 --- a/test/demo.cxx +++ b/test/demo.cxx @@ -30,10 +30,12 @@ #include #if defined(WIN32) && !defined(__CYGWIN__) # include +# 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 chdir _chdir -# define putenv _putenv +# define chdir _chdir +# define putenv _putenv +# endif // !__WATCOMC__ #else # include #endif diff --git a/watcom.mif b/watcom.mif index 2a316a86c..368631c28 100644 --- a/watcom.mif +++ b/watcom.mif @@ -198,13 +198,13 @@ EXEEXT=.exe !ifeqi D d WCADEBUG=-d1 # debug opts for wasm -WCCDEBUG=-d2 -s -ors # debug opts for wcc. NOTE: -we is to make errors of all warnings +WCCDEBUG=-d2 -s -ors -wcd=666 -wcd=836 # debug opts for wcc. NOTE: -we is to make errors of all warnings WCLDEBUG=d all # debug opts for wlink # WCCTIMING=-et # if added to CC command line will generate timing file after execution !else # # WCADEBUG= # debug opts for wasm -WCCDEBUG= -ors -s # release opts for wcc +WCCDEBUG= -ors -s -wcd=666 -wcd=836 # release opts for wcc # WCLDEBUG= # release opts for wlink !endif -- cgit v1.2.3