From e2cc1a80f09b7b33665be2ae14ef20673f9d6f7b Mon Sep 17 00:00:00 2001
From: Ian MacArthur <imacarthur@gmail.com>
Date: Thu, 28 Jan 2016 11:18:01 +0000
Subject: Some trivial adjustments to support building under Win32/mingw with
 the configure/make on Win7 with Msys.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11073 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
---
 src/fl_color.cxx | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

(limited to 'src/fl_color.cxx')

diff --git a/src/fl_color.cxx b/src/fl_color.cxx
index bf448b6d3..d98db309e 100644
--- a/src/fl_color.cxx
+++ b/src/fl_color.cxx
@@ -29,6 +29,17 @@
 #include <config.h>
 #include "config_lib.h"
 
+// fl_cmap needs to be defined *before* we include Fl_GDI_Graphics_Driver_color.cxx
+
+/** \addtogroup  fl_attributes
+ @{ */
+
+/* static */
+unsigned fl_cmap[256] = {
+#include "fl_cmap.h" // this is a file produced by "cmap.cxx":
+};
+
+
 // Remove #ifndef FL_LIBRARY_CMAKE and the entire block of #include
 // statements when the new build system is ready:
 #ifndef FL_LIBRARY_CMAKE
@@ -60,14 +71,6 @@
 
 // -----------------------------------------------------------------------------
 
-/** \addtogroup  fl_attributes
- @{ */
-
-/* static */
-unsigned fl_cmap[256] = {
-#include "fl_cmap.h" // this is a file produced by "cmap.cxx":
-};
-
 /**
  Returns the RGB value(s) for the given FLTK color index.
 
-- 
cgit v1.2.3