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 --- src/Fl_get_system_colors.cxx | 2 +- src/flstring.h | 6 ++++-- src/makefile.wat | 9 ++++++++- 3 files changed, 13 insertions(+), 4 deletions(-) (limited to 'src') 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 & -- cgit v1.2.3