Fixed VC++.NET project files (FLTK, FLTKDLL, FLUID).

Fixed Cygwin FLUID compile problem (STR #772)


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4192 ea41ed52-d2ee-0310-a9c1-e6b18d33e121

fluid/fluid.cxx

@@ -46,7 +46,7 @@
 #include "alignment_panel.h"
 #include "function_panel.h"
 #include "template_panel.h"
-#ifndef WIN32
+#if !defined(WIN32) || defined(__CYGWIN__)
 #  include "print_panel.h"
 #endif // !WIN32
 
@@ -251,7 +251,11 @@ void save_template_cb(Fl_Widget *, void *) {
   fluid_prefs.getUserdataPath(filename, sizeof(filename));
 
   strlcat(filename, "templates", sizeof(filename));
+#if defined(WIN32) && !defined(__CYGWIN__)
+  if (access(filename, 0)) mkdir(filename);
+#else
   if (access(filename, 0)) mkdir(filename, 0777);
+#endif // WIN32 && !__CYGWIN__
 
   strlcat(filename, "/", sizeof(filename));
   strlcat(filename, safename, sizeof(filename));
@@ -848,7 +852,7 @@ void manual_cb(Fl_Widget *, void *) {
 
 // Load and show the print dialog...
 void print_menu_cb(Fl_Widget *, void *) {
-#ifdef WIN32
+#if defined(WIN32) && !defined(__CYGWIN__)
   fl_message("Sorry, printing is not yet implemented on Windows...");
 }
 #else
@@ -1300,7 +1304,7 @@ void print_cb(Fl_Return_Button *, void *) {
   print_progress->hide();
   print_panel->hide();
 }
-#endif // WIN32
+#endif // WIN32 && !__CYGWIN__
 
 ////////////////////////////////////////////////////////////////
 

fluid/template_panel.cxx

@@ -36,11 +36,11 @@
 #include <FL/fl_ask.H>
 #include <FL/Fl_Shared_Image.H>
 #include <FL/Fl_Preferences.H>
-#ifdef WIN32
+#if defined(WIN32) && !defined(__CYGWIN__)
 #include <io.h>
 #else
 #include <unistd.h>
-#endif // WIN32
+#endif // WIN32 && !__CYGWIN__
 extern Fl_Preferences fluid_prefs;
 
 Fl_Double_Window *template_panel=(Fl_Double_Window *)0;

fluid/template_panel.fl

@@ -47,7 +47,7 @@ decl {\#include <FL/Fl_Shared_Image.H>} {}
 
 decl {\#include <FL/Fl_Preferences.H>} {} 
 
-declblock {\#ifdef WIN32} {after {\#endif // WIN32}
+declblock {\#if defined(WIN32) && !defined(__CYGWIN__)} {selected after {\#endif // WIN32 && !__CYGWIN__}
 } {
   decl {\#include <io.h>} {}
   decl {\#else} {}
@@ -115,7 +115,7 @@ img = Fl_Shared_Image::get(pngfile);
 if (img) {
   template_preview->image(img);
   template_preview->redraw();
-}} selected
+}}
       xywh {10 28 180 250} type Hold labelfont 1 align 5 when 3
     }
     Fl_Box template_preview {

vcnet/fltk.lib.vcproj

@@ -1732,6 +1732,9 @@
 					PreprocessorDefinitions=""/>
 			</FileConfiguration>
 		</File>
+		<File
+			RelativePath="..\src\fl_read_image.cxx">
+		</File>
 		<File
 			RelativePath="..\src\fl_rect.cxx">
 			<FileConfiguration

vcnet/fltkdll.vcproj

@@ -1781,6 +1781,9 @@
 					PreprocessorDefinitions="FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN;$(NoInherit)"/>
 			</FileConfiguration>
 		</File>
+		<File
+			RelativePath="..\src\fl_read_image.cxx">
+		</File>
 		<File
 			RelativePath="..\src\fl_rect.cxx">
 			<FileConfiguration

vcnet/fluid.vcproj

@@ -20,7 +20,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".,.."
+				AdditionalIncludeDirectories=".,..,..\zlib,..\png"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="2"
@@ -87,7 +87,7 @@
 				InlineFunctionExpansion="2"
 				ImproveFloatingPointConsistency="TRUE"
 				FavorSizeOrSpeed="0"
-				AdditionalIncludeDirectories=".,.."
+				AdditionalIncludeDirectories=".,..,..\zlib,..\png"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="2"
@@ -219,6 +219,25 @@
 					PreprocessorDefinitions=""/>
 			</FileConfiguration>
 		</File>
+		<File
+			RelativePath="..\fluid\CodeEditor.cxx">
+			<FileConfiguration
+				Name="Debug|Win32">
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32">
+				<Tool
+					Name="VCCLCompilerTool"
+					FavorSizeOrSpeed="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""/>
+			</FileConfiguration>
+		</File>
 		<File
 			RelativePath="..\fluid\factory.cxx">
 			<FileConfiguration
@@ -428,6 +447,9 @@
 					PreprocessorDefinitions=""/>
 			</FileConfiguration>
 		</File>
+		<File
+			RelativePath="..\fluid\template_panel.cxx">
+		</File>
 		<File
 			RelativePath="..\fluid\undo.cxx">
 			<FileConfiguration
@@ -466,25 +488,6 @@
 					PreprocessorDefinitions=""/>
 			</FileConfiguration>
 		</File>
-		<File
-			RelativePath="..\fluid\CodeEditor.cxx">
-			<FileConfiguration
-				Name="Debug|Win32">
-				<Tool
-					Name="VCCLCompilerTool"
-					Optimization="0"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32">
-				<Tool
-					Name="VCCLCompilerTool"
-					FavorSizeOrSpeed="0"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""/>
-			</FileConfiguration>
-		</File>
 	</Files>
 	<Globals>
 	</Globals>