| |
Author: matt
Date: 2011-08-22 12:53:15 -0700 (Mon, 22 Aug 2011)
New Revision: 8996
Log:
FLTK3: VisualC 6 project seems to compile fine now.
Modified:
branches/branch-3.0/fltk.flw
branches/branch-3.0/fluid/file_cmake.cxx
branches/branch-3.0/fluid/file_make.cxx
branches/branch-3.0/fluid/file_visualc_2008.cxx
branches/branch-3.0/fluid/file_visualc_2010.cxx
branches/branch-3.0/fluid/file_visualc_6.cxx
branches/branch-3.0/ide/VisualC2008/CubeView.vcproj
branches/branch-3.0/ide/VisualC2008/adjuster.vcproj
branches/branch-3.0/ide/VisualC2008/arc.vcproj
branches/branch-3.0/ide/VisualC2008/ask.vcproj
branches/branch-3.0/ide/VisualC2008/bitmap.vcproj
branches/branch-3.0/ide/VisualC2008/blocks.vcproj
branches/branch-3.0/ide/VisualC2008/boxtype.vcproj
branches/branch-3.0/ide/VisualC2008/browser.vcproj
branches/branch-3.0/ide/VisualC2008/button.vcproj
branches/branch-3.0/ide/VisualC2008/buttons.vcproj
branches/branch-3.0/ide/VisualC2008/checkers.vcproj
branches/branch-3.0/ide/VisualC2008/clock.vcproj
branches/branch-3.0/ide/VisualC2008/colbrowser.vcproj
branches/branch-3.0/ide/VisualC2008/color_chooser.vcproj
branches/branch-3.0/ide/VisualC2008/cube.vcproj
branches/branch-3.0/ide/VisualC2008/cursor.vcproj
branches/branch-3.0/ide/VisualC2008/curve.vcproj
branches/branch-3.0/ide/VisualC2008/demo.vcproj
branches/branch-3.0/ide/VisualC2008/device.vcproj
branches/branch-3.0/ide/VisualC2008/doublebuffer.vcproj
branches/branch-3.0/ide/VisualC2008/editor.vcproj
branches/branch-3.0/ide/VisualC2008/fast_slow.vcproj
branches/branch-3.0/ide/VisualC2008/file_chooser.vcproj
branches/branch-3.0/ide/VisualC2008/fltk.sln
branches/branch-3.0/ide/VisualC2008/fltk3.vcproj
branches/branch-3.0/ide/VisualC2008/fltk3gl.vcproj
branches/branch-3.0/ide/VisualC2008/fltk3images.vcproj
branches/branch-3.0/ide/VisualC2008/fltk3jpeg.vcproj
branches/branch-3.0/ide/VisualC2008/fltk3png.vcproj
branches/branch-3.0/ide/VisualC2008/fltk3zlib.vcproj
branches/branch-3.0/ide/VisualC2008/fluid.vcproj
branches/branch-3.0/ide/VisualC2008/fonts.vcproj
branches/branch-3.0/ide/VisualC2008/fractals.vcproj
branches/branch-3.0/ide/VisualC2008/fullscreen.vcproj
branches/branch-3.0/ide/VisualC2008/gl_overlay.vcproj
branches/branch-3.0/ide/VisualC2008/glpuzzle.vcproj
branches/branch-3.0/ide/VisualC2008/hello.vcproj
branches/branch-3.0/ide/VisualC2008/help.vcproj
branches/branch-3.0/ide/VisualC2008/iconize.vcproj
branches/branch-3.0/ide/VisualC2008/image.vcproj
branches/branch-3.0/ide/VisualC2008/inactive.vcproj
branches/branch-3.0/ide/VisualC2008/input.vcproj
branches/branch-3.0/ide/VisualC2008/input_choice.vcproj
branches/branch-3.0/ide/VisualC2008/keyboard.vcproj
branches/branch-3.0/ide/VisualC2008/label.vcproj
branches/branch-3.0/ide/VisualC2008/line_style.vcproj
branches/branch-3.0/ide/VisualC2008/list_visuals.vcproj
branches/branch-3.0/ide/VisualC2008/mandelbrot.vcproj
branches/branch-3.0/ide/VisualC2008/menubar.vcproj
branches/branch-3.0/ide/VisualC2008/message.vcproj
branches/branch-3.0/ide/VisualC2008/minimum.vcproj
branches/branch-3.0/ide/VisualC2008/native-filechooser.vcproj
branches/branch-3.0/ide/VisualC2008/navigation.vcproj
branches/branch-3.0/ide/VisualC2008/output.vcproj
branches/branch-3.0/ide/VisualC2008/overlay.vcproj
branches/branch-3.0/ide/VisualC2008/pack.vcproj
branches/branch-3.0/ide/VisualC2008/pixmap.vcproj
branches/branch-3.0/ide/VisualC2008/pixmap_browser.vcproj
branches/branch-3.0/ide/VisualC2008/preferences.vcproj
branches/branch-3.0/ide/VisualC2008/radio.vcproj
branches/branch-3.0/ide/VisualC2008/resize.vcproj
branches/branch-3.0/ide/VisualC2008/resizebox.vcproj
branches/branch-3.0/ide/VisualC2008/rotated_text.vcproj
branches/branch-3.0/ide/VisualC2008/scroll.vcproj
branches/branch-3.0/ide/VisualC2008/shape.vcproj
branches/branch-3.0/ide/VisualC2008/subwindow.vcproj
branches/branch-3.0/ide/VisualC2008/sudoku.vcproj
branches/branch-3.0/ide/VisualC2008/symbols.vcproj
branches/branch-3.0/ide/VisualC2008/table.vcproj
branches/branch-3.0/ide/VisualC2008/tabs.vcproj
branches/branch-3.0/ide/VisualC2008/threads.vcproj
branches/branch-3.0/ide/VisualC2008/tile.vcproj
branches/branch-3.0/ide/VisualC2008/tiled_image.vcproj
branches/branch-3.0/ide/VisualC2008/tree.vcproj
branches/branch-3.0/ide/VisualC2008/unittests.vcproj
branches/branch-3.0/ide/VisualC2008/utf8.vcproj
branches/branch-3.0/ide/VisualC2008/valuators.vcproj
branches/branch-3.0/ide/VisualC2010/CubeView.vcxproj
branches/branch-3.0/ide/VisualC2010/adjuster.vcxproj
branches/branch-3.0/ide/VisualC2010/arc.vcxproj
branches/branch-3.0/ide/VisualC2010/ask.vcxproj
branches/branch-3.0/ide/VisualC2010/bitmap.vcxproj
branches/branch-3.0/ide/VisualC2010/blocks.vcxproj
branches/branch-3.0/ide/VisualC2010/boxtype.vcxproj
branches/branch-3.0/ide/VisualC2010/browser.vcxproj
branches/branch-3.0/ide/VisualC2010/button.vcxproj
branches/branch-3.0/ide/VisualC2010/buttons.vcxproj
branches/branch-3.0/ide/VisualC2010/checkers.vcxproj
branches/branch-3.0/ide/VisualC2010/clock.vcxproj
branches/branch-3.0/ide/VisualC2010/colbrowser.vcxproj
branches/branch-3.0/ide/VisualC2010/color_chooser.vcxproj
branches/branch-3.0/ide/VisualC2010/cube.vcxproj
branches/branch-3.0/ide/VisualC2010/cursor.vcxproj
branches/branch-3.0/ide/VisualC2010/curve.vcxproj
branches/branch-3.0/ide/VisualC2010/demo.vcxproj
branches/branch-3.0/ide/VisualC2010/device.vcxproj
branches/branch-3.0/ide/VisualC2010/doublebuffer.vcxproj
branches/branch-3.0/ide/VisualC2010/editor.vcxproj
branches/branch-3.0/ide/VisualC2010/fast_slow.vcxproj
branches/branch-3.0/ide/VisualC2010/file_chooser.vcxproj
branches/branch-3.0/ide/VisualC2010/fltk.sln
branches/branch-3.0/ide/VisualC2010/fltk3.vcxproj
branches/branch-3.0/ide/VisualC2010/fltk3gl.vcxproj
branches/branch-3.0/ide/VisualC2010/fltk3images.vcxproj
branches/branch-3.0/ide/VisualC2010/fltk3jpeg.vcxproj
branches/branch-3.0/ide/VisualC2010/fltk3png.vcxproj
branches/branch-3.0/ide/VisualC2010/fltk3zlib.vcxproj
branches/branch-3.0/ide/VisualC2010/fluid.vcxproj
branches/branch-3.0/ide/VisualC2010/fonts.vcxproj
branches/branch-3.0/ide/VisualC2010/fractals.vcxproj
branches/branch-3.0/ide/VisualC2010/fullscreen.vcxproj
branches/branch-3.0/ide/VisualC2010/gl_overlay.vcxproj
branches/branch-3.0/ide/VisualC2010/glpuzzle.vcxproj
branches/branch-3.0/ide/VisualC2010/hello.vcxproj
branches/branch-3.0/ide/VisualC2010/help.vcxproj
branches/branch-3.0/ide/VisualC2010/iconize.vcxproj
branches/branch-3.0/ide/VisualC2010/image.vcxproj
branches/branch-3.0/ide/VisualC2010/inactive.vcxproj
branches/branch-3.0/ide/VisualC2010/input.vcxproj
branches/branch-3.0/ide/VisualC2010/input_choice.vcxproj
branches/branch-3.0/ide/VisualC2010/keyboard.vcxproj
branches/branch-3.0/ide/VisualC2010/label.vcxproj
branches/branch-3.0/ide/VisualC2010/line_style.vcxproj
branches/branch-3.0/ide/VisualC2010/list_visuals.vcxproj
branches/branch-3.0/ide/VisualC2010/mandelbrot.vcxproj
branches/branch-3.0/ide/VisualC2010/menubar.vcxproj
branches/branch-3.0/ide/VisualC2010/message.vcxproj
branches/branch-3.0/ide/VisualC2010/minimum.vcxproj
branches/branch-3.0/ide/VisualC2010/native-filechooser.vcxproj
branches/branch-3.0/ide/VisualC2010/navigation.vcxproj
branches/branch-3.0/ide/VisualC2010/output.vcxproj
branches/branch-3.0/ide/VisualC2010/overlay.vcxproj
branches/branch-3.0/ide/VisualC2010/pack.vcxproj
branches/branch-3.0/ide/VisualC2010/pixmap.vcxproj
branches/branch-3.0/ide/VisualC2010/pixmap_browser.vcxproj
branches/branch-3.0/ide/VisualC2010/preferences.vcxproj
branches/branch-3.0/ide/VisualC2010/radio.vcxproj
branches/branch-3.0/ide/VisualC2010/resize.vcxproj
branches/branch-3.0/ide/VisualC2010/resizebox.vcxproj
branches/branch-3.0/ide/VisualC2010/rotated_text.vcxproj
branches/branch-3.0/ide/VisualC2010/scroll.vcxproj
branches/branch-3.0/ide/VisualC2010/shape.vcxproj
branches/branch-3.0/ide/VisualC2010/subwindow.vcxproj
branches/branch-3.0/ide/VisualC2010/sudoku.vcxproj
branches/branch-3.0/ide/VisualC2010/symbols.vcxproj
branches/branch-3.0/ide/VisualC2010/table.vcxproj
branches/branch-3.0/ide/VisualC2010/tabs.vcxproj
branches/branch-3.0/ide/VisualC2010/threads.vcxproj
branches/branch-3.0/ide/VisualC2010/tile.vcxproj
branches/branch-3.0/ide/VisualC2010/tiled_image.vcxproj
branches/branch-3.0/ide/VisualC2010/tree.vcxproj
branches/branch-3.0/ide/VisualC2010/unittests.vcxproj
branches/branch-3.0/ide/VisualC2010/utf8.vcxproj
branches/branch-3.0/ide/VisualC2010/valuators.vcxproj
branches/branch-3.0/ide/VisualC6/CubeView.dsp
branches/branch-3.0/ide/VisualC6/Demo.dsp
branches/branch-3.0/ide/VisualC6/Fluid.dsp
branches/branch-3.0/ide/VisualC6/adjuster.dsp
branches/branch-3.0/ide/VisualC6/arc.dsp
branches/branch-3.0/ide/VisualC6/ask.dsp
branches/branch-3.0/ide/VisualC6/bitmap.dsp
branches/branch-3.0/ide/VisualC6/blocks.dsp
branches/branch-3.0/ide/VisualC6/boxtype.dsp
branches/branch-3.0/ide/VisualC6/browser.dsp
branches/branch-3.0/ide/VisualC6/button.dsp
branches/branch-3.0/ide/VisualC6/buttons.dsp
branches/branch-3.0/ide/VisualC6/checkers.dsp
branches/branch-3.0/ide/VisualC6/clock.dsp
branches/branch-3.0/ide/VisualC6/colbrowser.dsp
branches/branch-3.0/ide/VisualC6/color_chooser.dsp
branches/branch-3.0/ide/VisualC6/cube.dsp
branches/branch-3.0/ide/VisualC6/cursor.dsp
branches/branch-3.0/ide/VisualC6/curve.dsp
branches/branch-3.0/ide/VisualC6/device.dsp
branches/branch-3.0/ide/VisualC6/doublebuffer.dsp
branches/branch-3.0/ide/VisualC6/editor.dsp
branches/branch-3.0/ide/VisualC6/fast_slow.dsp
branches/branch-3.0/ide/VisualC6/file_chooser.dsp
branches/branch-3.0/ide/VisualC6/fltk.dsw
branches/branch-3.0/ide/VisualC6/fltk3.dsp
branches/branch-3.0/ide/VisualC6/fltk3gl.dsp
branches/branch-3.0/ide/VisualC6/fltk3images.dsp
branches/branch-3.0/ide/VisualC6/fltk3jpeg.dsp
branches/branch-3.0/ide/VisualC6/fltk3png.dsp
branches/branch-3.0/ide/VisualC6/fltk3zlib.dsp
branches/branch-3.0/ide/VisualC6/fonts.dsp
branches/branch-3.0/ide/VisualC6/fractals.dsp
branches/branch-3.0/ide/VisualC6/fullscreen.dsp
branches/branch-3.0/ide/VisualC6/gl_overlay.dsp
branches/branch-3.0/ide/VisualC6/glpuzzle.dsp
branches/branch-3.0/ide/VisualC6/hello.dsp
branches/branch-3.0/ide/VisualC6/help.dsp
branches/branch-3.0/ide/VisualC6/iconize.dsp
branches/branch-3.0/ide/VisualC6/image.dsp
branches/branch-3.0/ide/VisualC6/inactive.dsp
branches/branch-3.0/ide/VisualC6/input.dsp
branches/branch-3.0/ide/VisualC6/input_choice.dsp
branches/branch-3.0/ide/VisualC6/keyboard.dsp
branches/branch-3.0/ide/VisualC6/label.dsp
branches/branch-3.0/ide/VisualC6/line_style.dsp
branches/branch-3.0/ide/VisualC6/list_visuals.dsp
branches/branch-3.0/ide/VisualC6/mandelbrot.dsp
branches/branch-3.0/ide/VisualC6/menubar.dsp
branches/branch-3.0/ide/VisualC6/message.dsp
branches/branch-3.0/ide/VisualC6/minimum.dsp
branches/branch-3.0/ide/VisualC6/native-filechooser.dsp
branches/branch-3.0/ide/VisualC6/navigation.dsp
branches/branch-3.0/ide/VisualC6/output.dsp
branches/branch-3.0/ide/VisualC6/overlay.dsp
branches/branch-3.0/ide/VisualC6/pack.dsp
branches/branch-3.0/ide/VisualC6/pixmap.dsp
branches/branch-3.0/ide/VisualC6/pixmap_browser.dsp
branches/branch-3.0/ide/VisualC6/preferences.dsp
branches/branch-3.0/ide/VisualC6/radio.dsp
branches/branch-3.0/ide/VisualC6/resize.dsp
branches/branch-3.0/ide/VisualC6/resizebox.dsp
branches/branch-3.0/ide/VisualC6/rotated_text.dsp
branches/branch-3.0/ide/VisualC6/scroll.dsp
branches/branch-3.0/ide/VisualC6/shape.dsp
branches/branch-3.0/ide/VisualC6/subwindow.dsp
branches/branch-3.0/ide/VisualC6/sudoku.dsp
branches/branch-3.0/ide/VisualC6/symbols.dsp
branches/branch-3.0/ide/VisualC6/table.dsp
branches/branch-3.0/ide/VisualC6/tabs.dsp
branches/branch-3.0/ide/VisualC6/threads.dsp
branches/branch-3.0/ide/VisualC6/tile.dsp
branches/branch-3.0/ide/VisualC6/tiled_image.dsp
branches/branch-3.0/ide/VisualC6/tree.dsp
branches/branch-3.0/ide/VisualC6/unittests.dsp
branches/branch-3.0/ide/VisualC6/utf8.dsp
branches/branch-3.0/ide/VisualC6/valuators.dsp
Modified: branches/branch-3.0/fltk.flw
===================================================================
--- branches/branch-3.0/fltk.flw 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/fltk.flw 2011-08-22 19:53:15 UTC (rev 8996)
@@ -2,7 +2,7 @@
version 3.0000
header_name {.h}
code_name {.cxx}
-workspace FLTK {open
+workspace FLTK {open selected
uuid_Xcode4_Root {2204C862-3EAB-44CD-B0A8-6DF16FFDC8F4}
uuid_Xcode4_ProductsGroup {A3B55F76-F5F9-4F9E-8A45-2778583213A1}
uuid_Xcode4_Group {341D2CD3-06FB-47E4-B35C-D1F9B51C7293}
@@ -12,7 +12,7 @@
uuid_Xcode4_ReleaseBuildConfiguration {C5259E66-FBF8-43A2-B30F-8D59BBE3CF16}
uuid_VC2008_Workspace {D21EA206-7BBC-4F5B-8518-A798E56EE0FC}
uuid_VC2010_Workspace {8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}
- build_env 1
+ build_env 28
} {
folder Applications {open
uuid_Xcode4_Group {137F861A-5702-45AC-821B-A2C51A17F780}
@@ -5880,7 +5880,7 @@
uuid_Xcode4_FileRef {45B471C7-8D57-4244-BD19-8C230A1A2CB9}
filename_and_path {test/sudoku.cxx}
}
- target_dependency fltk3images {selected
+ target_dependency fltk3images {
uuid_Xcode4_BuildFileInFrameworks {DF57BE2E-0AF6-4604-80F4-7C340B8D9141}
uuid_Xcode4_BuildFileInCopyFiles {0D0C53CA-958A-44CD-BCD8-6E23BD960020}
uuid_Xcode4_ContainerItemProxy {9AA4F2ED-945E-4EE8-AA00-A0A11E333E24}
Modified: branches/branch-3.0/fluid/file_cmake.cxx
===================================================================
--- branches/branch-3.0/fluid/file_cmake.cxx 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/fluid/file_cmake.cxx 2011-08-22 19:53:15 UTC (rev 8996)
@@ -34,7 +34,7 @@
#include <stdlib.h>
#include <stdarg.h>
#include "Fl_Type.h"
-#include "../fltk3/filename.h"
+#include <fltk3/filename.h>
// ------------ file conversion ------------------------------------------------
Modified: branches/branch-3.0/fluid/file_make.cxx
===================================================================
--- branches/branch-3.0/fluid/file_make.cxx 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/fluid/file_make.cxx 2011-08-22 19:53:15 UTC (rev 8996)
@@ -35,7 +35,7 @@
#include <stdarg.h>
#include <ctype.h>
#include "Fl_Type.h"
-#include "../fltk3/filename.h"
+#include <fltk3/filename.h>
// ------------ file conversion ------------------------------------------------
Modified: branches/branch-3.0/fluid/file_visualc_2008.cxx
===================================================================
--- branches/branch-3.0/fluid/file_visualc_2008.cxx 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/fluid/file_visualc_2008.cxx 2011-08-22 19:53:15 UTC (rev 8996)
@@ -34,7 +34,7 @@
#include <stdlib.h>
#include <stdarg.h>
#include "Fl_Type.h"
-#include "../fltk3/filename.h"
+#include <fltk3/filename.h>
extern const char *filename;
Modified: branches/branch-3.0/fluid/file_visualc_2010.cxx
===================================================================
--- branches/branch-3.0/fluid/file_visualc_2010.cxx 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/fluid/file_visualc_2010.cxx 2011-08-22 19:53:15 UTC (rev 8996)
@@ -34,7 +34,7 @@
#include <stdlib.h>
#include <stdarg.h>
#include "Fl_Type.h"
-#include "../fltk3/filename.h"
+#include <fltk3/filename.h>
static const char *VC2010_Workspace = "VC2010_Workspace";
Modified: branches/branch-3.0/fluid/file_visualc_6.cxx
===================================================================
--- branches/branch-3.0/fluid/file_visualc_6.cxx 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/fluid/file_visualc_6.cxx 2011-08-22 19:53:15 UTC (rev 8996)
@@ -34,7 +34,7 @@
#include <stdlib.h>
#include <stdarg.h>
#include "Fl_Type.h"
-#include "../fltk3/filename.h"
+#include <fltk3/filename.h>
extern const char *filename;
@@ -230,7 +230,7 @@
fprintf(out, "# PROP Intermediate_Dir \"Release\\%s\"\r\n", tgt->name());
fprintf(out, "# PROP Target_Dir \"\"\r\n");
fprintf(out, "# ADD BASE CPP /nologo /W3 /GX /O2 /D \"WIN32\" /D \"FL_LIBRARY\" /D \"NDEBUG\" /D \"_WINDOWS\" /YX /FD /c\r\n");
- fprintf(out, "# ADD CPP /nologo /MD /GX /Ot /Op /Ob2 /I \".\" /I \"..\\..\" /I \"..\\..\\zlib\" /I \"..\\..\\png\" /I \"..\\..\\jpeg\" /D \"WIN32\" /D \"FL_LIBRARY\" /D \"NDEBUG\" /D \"_WINDOWS\" /D \"_CRT_SECURE_NO_DEPRECATE\" /D \"_CRT_NONSTDC_NO_DEPRECATE\" /D \"WIN32_LEAN_AND_MEAN\" /D \"VC_EXTRA_LEAN\" /D \"WIN32_EXTRA_LEAN\" /YX /FD /c\r\n");
+ fprintf(out, "# ADD CPP /nologo /MD /GX /Ot /Op /Ob2 /I \".\" /I \"..\\..\\include\" /I \"..\\..\\include\\fltk3zlib\" /I \"..\\..\\include\\fltk3png\" /I \"..\\..\\include\\fltk3jpeg\" /D \"WIN32\" /D \"FL_LIBRARY\" /D \"NDEBUG\" /D \"_WINDOWS\" /D \"_CRT_SECURE_NO_DEPRECATE\" /D \"_CRT_NONSTDC_NO_DEPRECATE\" /D \"WIN32_LEAN_AND_MEAN\" /D \"VC_EXTRA_LEAN\" /D \"WIN32_EXTRA_LEAN\" /YX /FD /c\r\n");
fprintf(out, "# SUBTRACT CPP /Os\r\n");
fprintf(out, "# ADD BASE RSC /l 0x409\r\n");
fprintf(out, "# ADD RSC /l 0x409\r\n");
@@ -254,7 +254,7 @@
fprintf(out, "# PROP Intermediate_Dir \"Debug\\%s\"\r\n", tgt->name());
fprintf(out, "# PROP Target_Dir \"\"\r\n");
fprintf(out, "# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D \"WIN32\" /D \"FL_LIBRARY\" /D \"_DEBUG\" /D \"_WINDOWS\" /YX /FD /c\r\n");
- fprintf(out, "# ADD CPP /nologo /MDd /GX /Z7 /Od /I \".\" /I \"..\\..\" /I \"..\\..\\zlib\" /I \"..\\..\\png\" /I \"..\\..\\jpeg\" /D \"WIN32\" /D \"FL_LIBRARY\" /D \"_DEBUG\" /D \"_WINDOWS\" /D \"_CRT_SECURE_NO_DEPRECATE\" /D \"_CRT_NONSTDC_NO_DEPRECATE\" /D \"WIN32_LEAN_AND_MEAN\" /D \"VC_EXTRA_LEAN\" /D \"WIN32_EXTRA_LEAN\" /FR /YX /FD /c\r\n");
+ fprintf(out, "# ADD CPP /nologo /MDd /GX /Z7 /Od /I \".\" /I \"..\\..\\include\" /I \"..\\..\\include\\fltk3zlib\" /I \"..\\..\\include\\fltk3png\" /I \"..\\..\\include\\fltk3jpeg\" /D \"WIN32\" /D \"FL_LIBRARY\" /D \"_DEBUG\" /D \"_WINDOWS\" /D \"_CRT_SECURE_NO_DEPRECATE\" /D \"_CRT_NONSTDC_NO_DEPRECATE\" /D \"WIN32_LEAN_AND_MEAN\" /D \"VC_EXTRA_LEAN\" /D \"WIN32_EXTRA_LEAN\" /FR /YX /FD /c\r\n");
fprintf(out, "# ADD BASE RSC /l 0x409\r\n");
fprintf(out, "# ADD RSC /l 0x409\r\n");
fprintf(out, "BSC32=bscmake.exe\r\n");
@@ -335,7 +335,7 @@
fprintf(out, "# PROP Ignore_Export_Lib 0\r\n");
fprintf(out, "# PROP Target_Dir \"\"\r\n");
fprintf(out, "# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D \"WIN32\" /D \"NDEBUG\" /D \"_WINDOWS\" /YX /FD /c\r\n");
- fprintf(out, "# ADD CPP /nologo /MD /W3 /GX /Os /Ob2 /I \"..\\..\\zlib\" /I \"..\\..\\png\" /I \"..\\..\\jpeg\" /I \".\" /D \"FL_DLL\" /D \"FL_LIBRARY\" /D \"WIN32\" /D \"NDEBUG\" /D \"_WINDOWS\" /D \"_CRT_SECURE_NO_DEPRECATE\" /D \"_CRT_NONSTDC_NO_DEPRECATE\" /D \"WIN32_LEAN_AND_MEAN\" /D \"VC_EXTRA_LEAN\" /D \"WIN32_EXTRA_LEAN\" /YX /c\r\n");
+ fprintf(out, "# ADD CPP /nologo /MD /W3 /GX /Os /Ob2 /I \"..\\..\\include\\fltk3zlib\" /I \"..\\..\\include\\fltk3png\" /I \"..\\..\\include\\fltk3jpeg\" /I \".\" /D \"FL_DLL\" /D \"FL_LIBRARY\" /D \"WIN32\" /D \"NDEBUG\" /D \"_WINDOWS\" /D \"_CRT_SECURE_NO_DEPRECATE\" /D \"_CRT_NONSTDC_NO_DEPRECATE\" /D \"WIN32_LEAN_AND_MEAN\" /D \"VC_EXTRA_LEAN\" /D \"WIN32_EXTRA_LEAN\" /YX /c\r\n");
fprintf(out, "# ADD BASE MTL /nologo /D \"NDEBUG\" /mktyplib203 /o /win32 \"NUL\"\r\n");
fprintf(out, "# ADD MTL /nologo /D \"NDEBUG\" /mktyplib203 /o /win32 \"NUL\"\r\n");
fprintf(out, "# ADD BASE RSC /l 0x409 /d \"NDEBUG\"\r\n");
@@ -366,7 +366,7 @@
fprintf(out, "# PROP Ignore_Export_Lib 0\r\n");
fprintf(out, "# PROP Target_Dir \"\"\r\n");
fprintf(out, "# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D \"WIN32\" /D \"_DEBUG\" /D \"_WINDOWS\" /YX /FD /c\r\n");
- fprintf(out, "# ADD CPP /nologo /MDd /GX /ZI /Od /I \".\" /I \"..\\..\" /I \"..\\..\\zlib\" /I \"..\\..\\png\" /I \"..\\..\\jpeg\" /D \"FL_DLL\" /D \"FL_LIBRARY\" /D \"WIN32\" /D \"_DEBUG\" /D \"_WINDOWS\" /D \"_CRT_SECURE_NO_DEPRECATE\" /D \"_CRT_NONSTDC_NO_DEPRECATE\" /D \"WIN32_LEAN_AND_MEAN\" /D \"VC_EXTRA_LEAN\" /D \"WIN32_EXTRA_LEAN\" /YX /c\r\n");
+ fprintf(out, "# ADD CPP /nologo /MDd /GX /ZI /Od /I \".\" /I \"..\\..\\include\" /I \"..\\..\\include\\fltk3zlib\" /I \"..\\..\\include\\fltk3png\" /I \"..\\..\\include\\fltk3jpeg\" /D \"FL_DLL\" /D \"FL_LIBRARY\" /D \"WIN32\" /D \"_DEBUG\" /D \"_WINDOWS\" /D \"_CRT_SECURE_NO_DEPRECATE\" /D \"_CRT_NONSTDC_NO_DEPRECATE\" /D \"WIN32_LEAN_AND_MEAN\" /D \"VC_EXTRA_LEAN\" /D \"WIN32_EXTRA_LEAN\" /YX /c\r\n");
fprintf(out, "# ADD BASE MTL /nologo /D \"_DEBUG\" /mktyplib203 /o /win32 \"NUL\"\r\n");
fprintf(out, "# ADD MTL /nologo /D \"_DEBUG\" /mktyplib203 /o /win32 \"NUL\"\r\n");
fprintf(out, "# ADD BASE RSC /l 0x409 /d \"_DEBUG\"\r\n");
@@ -452,7 +452,7 @@
fprintf(out, "# PROP Ignore_Export_Lib 0\r\n");
fprintf(out, "# PROP Target_Dir \"\"\r\n");
fprintf(out, "# ADD BASE CPP /nologo /W3 /GX /O2 /D \"WIN32\" /D \"NDEBUG\" /D \"_WINDOWS\" /YX /FD /c\r\n");
- fprintf(out, "# ADD CPP /nologo /MD /GX /Os /Ob2 /I \".\" /I \"..\\..\" /I \"..\\..\\zlib\" /I \"..\\..\\png\" /I \"..\\..\\jpeg\" /D \"WIN32\" /D \"NDEBUG\" /D \"_WINDOWS\" /D \"_CRT_SECURE_NO_DEPRECATE\" /D \"_CRT_NONSTDC_NO_DEPRECATE\" /D \"WIN32_LEAN_AND_MEAN\" /D \"VC_EXTRA_LEAN\" /D \"WIN32_EXTRA_LEAN\" /YX /FD /c\r\n");
+ fprintf(out, "# ADD CPP /nologo /MD /GX /Os /Ob2 /I \".\" /I \"..\\..\\include\" /I \"..\\..\\include\\fltk3zlib\" /I \"..\\..\\include\\fltk3png\" /I \"..\\..\\include\\fltk3jpeg\" /D \"WIN32\" /D \"NDEBUG\" /D \"_WINDOWS\" /D \"_CRT_SECURE_NO_DEPRECATE\" /D \"_CRT_NONSTDC_NO_DEPRECATE\" /D \"WIN32_LEAN_AND_MEAN\" /D \"VC_EXTRA_LEAN\" /D \"WIN32_EXTRA_LEAN\" /YX /FD /c\r\n");
fprintf(out, "# ADD BASE MTL /nologo /D \"NDEBUG\" /mktyplib203 /o \"NUL\" /win32\r\n");
fprintf(out, "# ADD MTL /nologo /D \"NDEBUG\" /mktyplib203 /o \"NUL\" /win32\r\n");
fprintf(out, "# ADD BASE RSC /l 0x409 /d \"NDEBUG\"\r\n");
@@ -483,7 +483,7 @@
fprintf(out, "# PROP Ignore_Export_Lib 0\r\n");
fprintf(out, "# PROP Target_Dir \"\"\r\n");
fprintf(out, "# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D \"WIN32\" /D \"_DEBUG\" /D \"_WINDOWS\" /YX /FD /c\r\n");
- fprintf(out, "# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I \".\" /I \"..\\..\" /I \"..\\../zlib\" /I \"..\\../png\" /I \"..\\../jpeg\" /D \"WIN32\" /D \"_DEBUG\" /D \"_WINDOWS\" /D \"_CRT_SECURE_NO_DEPRECATE\" /D \"_CRT_NONSTDC_NO_DEPRECATE\" /D \"WIN32_LEAN_AND_MEAN\" /D \"VC_EXTRA_LEAN\" /D \"WIN32_EXTRA_LEAN\" /YX /FD /c\r\n");
+ fprintf(out, "# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I \".\" /I \"..\\..\\include\" /I \"..\\..\\include\\fltk3zlib\" /I \"..\\..\\include\\fltk3png\" /I \"..\\..\\include\\fltk3jpeg\" /D \"WIN32\" /D \"_DEBUG\" /D \"_WINDOWS\" /D \"_CRT_SECURE_NO_DEPRECATE\" /D \"_CRT_NONSTDC_NO_DEPRECATE\" /D \"WIN32_LEAN_AND_MEAN\" /D \"VC_EXTRA_LEAN\" /D \"WIN32_EXTRA_LEAN\" /YX /FD /c\r\n");
fprintf(out, "# ADD BASE MTL /nologo /D \"_DEBUG\" /mktyplib203 /o \"NUL\" /win32\r\n");
fprintf(out, "# ADD MTL /nologo /D \"_DEBUG\" /mktyplib203 /o \"NUL\" /win32\r\n");
fprintf(out, "# ADD BASE RSC /l 0x409 /d \"_DEBUG\"\r\n");
Modified: branches/branch-3.0/ide/VisualC2008/CubeView.vcproj
===================================================================
--- branches/branch-3.0/ide/VisualC2008/CubeView.vcproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2008/CubeView.vcproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltkd.lib fltk_gld.lib glu32.lib opengl32.lib comctl32.lib"
+ AdditionalDependencies="fltk3d.lib fltk3gld.lib glu32.lib opengl32.lib comctl32.lib"
OutputFile="..\..\test\CubeViewd.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
@@ -161,7 +161,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltk.lib fltk_gl.lib glu32.lib opengl32.lib comctl32.lib"
+ AdditionalDependencies="fltk3.lib fltk3gl.lib glu32.lib opengl32.lib comctl32.lib"
OutputFile="..\..\test\CubeView.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
Modified: branches/branch-3.0/ide/VisualC2008/adjuster.vcproj
===================================================================
--- branches/branch-3.0/ide/VisualC2008/adjuster.vcproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2008/adjuster.vcproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltkd.lib comctl32.lib"
+ AdditionalDependencies="fltk3d.lib comctl32.lib"
OutputFile="..\..\test\adjusterd.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
@@ -161,7 +161,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltk.lib comctl32.lib"
+ AdditionalDependencies="fltk3.lib comctl32.lib"
OutputFile="..\..\test\adjuster.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
Modified: branches/branch-3.0/ide/VisualC2008/arc.vcproj
===================================================================
--- branches/branch-3.0/ide/VisualC2008/arc.vcproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2008/arc.vcproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltkd.lib comctl32.lib"
+ AdditionalDependencies="fltk3d.lib comctl32.lib"
OutputFile="..\..\test\arcd.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
@@ -161,7 +161,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltk.lib comctl32.lib"
+ AdditionalDependencies="fltk3.lib comctl32.lib"
OutputFile="..\..\test\arc.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
Modified: branches/branch-3.0/ide/VisualC2008/ask.vcproj
===================================================================
--- branches/branch-3.0/ide/VisualC2008/ask.vcproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2008/ask.vcproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltkd.lib comctl32.lib"
+ AdditionalDependencies="fltk3d.lib comctl32.lib"
OutputFile="..\..\test\askd.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
@@ -161,7 +161,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltk.lib comctl32.lib"
+ AdditionalDependencies="fltk3.lib comctl32.lib"
OutputFile="..\..\test\ask.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
Modified: branches/branch-3.0/ide/VisualC2008/bitmap.vcproj
===================================================================
--- branches/branch-3.0/ide/VisualC2008/bitmap.vcproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2008/bitmap.vcproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltkd.lib comctl32.lib"
+ AdditionalDependencies="fltk3d.lib comctl32.lib"
OutputFile="..\..\test\bitmapd.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
@@ -161,7 +161,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltk.lib comctl32.lib"
+ AdditionalDependencies="fltk3.lib comctl32.lib"
OutputFile="..\..\test\bitmap.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
Modified: branches/branch-3.0/ide/VisualC2008/blocks.vcproj
===================================================================
--- branches/branch-3.0/ide/VisualC2008/blocks.vcproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2008/blocks.vcproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltkd.lib winmm.lib comctl32.lib"
+ AdditionalDependencies="fltk3d.lib winmm.lib comctl32.lib"
OutputFile="..\..\test\blocksd.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
@@ -161,7 +161,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltk.lib winmm.lib comctl32.lib"
+ AdditionalDependencies="fltk3.lib winmm.lib comctl32.lib"
OutputFile="..\..\test\blocks.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
Modified: branches/branch-3.0/ide/VisualC2008/boxtype.vcproj
===================================================================
--- branches/branch-3.0/ide/VisualC2008/boxtype.vcproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2008/boxtype.vcproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltkd.lib comctl32.lib"
+ AdditionalDependencies="fltk3d.lib comctl32.lib"
OutputFile="..\..\test\boxtyped.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
@@ -161,7 +161,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltk.lib comctl32.lib"
+ AdditionalDependencies="fltk3.lib comctl32.lib"
OutputFile="..\..\test\boxtype.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
Modified: branches/branch-3.0/ide/VisualC2008/browser.vcproj
===================================================================
--- branches/branch-3.0/ide/VisualC2008/browser.vcproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2008/browser.vcproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltkd.lib comctl32.lib"
+ AdditionalDependencies="fltk3d.lib comctl32.lib"
OutputFile="..\..\test\browserd.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
@@ -161,7 +161,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltk.lib comctl32.lib"
+ AdditionalDependencies="fltk3.lib comctl32.lib"
OutputFile="..\..\test\browser.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
Modified: branches/branch-3.0/ide/VisualC2008/button.vcproj
===================================================================
--- branches/branch-3.0/ide/VisualC2008/button.vcproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2008/button.vcproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltkd.lib comctl32.lib"
+ AdditionalDependencies="fltk3d.lib comctl32.lib"
OutputFile="..\..\test\buttond.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
@@ -161,7 +161,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltk.lib comctl32.lib"
+ AdditionalDependencies="fltk3.lib comctl32.lib"
OutputFile="..\..\test\button.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
Modified: branches/branch-3.0/ide/VisualC2008/buttons.vcproj
===================================================================
--- branches/branch-3.0/ide/VisualC2008/buttons.vcproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2008/buttons.vcproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltkd.lib comctl32.lib"
+ AdditionalDependencies="fltk3d.lib comctl32.lib"
OutputFile="..\..\test\buttonsd.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
@@ -161,7 +161,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltk.lib comctl32.lib"
+ AdditionalDependencies="fltk3.lib comctl32.lib"
OutputFile="..\..\test\buttons.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
Modified: branches/branch-3.0/ide/VisualC2008/checkers.vcproj
===================================================================
--- branches/branch-3.0/ide/VisualC2008/checkers.vcproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2008/checkers.vcproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltkd.lib comctl32.lib"
+ AdditionalDependencies="fltk3d.lib comctl32.lib"
OutputFile="..\..\test\checkersd.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
@@ -161,7 +161,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltk.lib comctl32.lib"
+ AdditionalDependencies="fltk3.lib comctl32.lib"
OutputFile="..\..\test\checkers.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
Modified: branches/branch-3.0/ide/VisualC2008/clock.vcproj
===================================================================
--- branches/branch-3.0/ide/VisualC2008/clock.vcproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2008/clock.vcproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltkd.lib comctl32.lib"
+ AdditionalDependencies="fltk3d.lib comctl32.lib"
OutputFile="..\..\test\clockd.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
@@ -161,7 +161,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltk.lib comctl32.lib"
+ AdditionalDependencies="fltk3.lib comctl32.lib"
OutputFile="..\..\test\clock.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
Modified: branches/branch-3.0/ide/VisualC2008/colbrowser.vcproj
===================================================================
--- branches/branch-3.0/ide/VisualC2008/colbrowser.vcproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2008/colbrowser.vcproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltkd.lib comctl32.lib"
+ AdditionalDependencies="fltk3d.lib comctl32.lib"
OutputFile="..\..\test\colbrowserd.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
@@ -161,7 +161,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltk.lib comctl32.lib"
+ AdditionalDependencies="fltk3.lib comctl32.lib"
OutputFile="..\..\test\colbrowser.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
Modified: branches/branch-3.0/ide/VisualC2008/color_chooser.vcproj
===================================================================
--- branches/branch-3.0/ide/VisualC2008/color_chooser.vcproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2008/color_chooser.vcproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltkd.lib comctl32.lib"
+ AdditionalDependencies="fltk3d.lib comctl32.lib"
OutputFile="..\..\test\color_chooserd.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
@@ -161,7 +161,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltk.lib comctl32.lib"
+ AdditionalDependencies="fltk3.lib comctl32.lib"
OutputFile="..\..\test\color_chooser.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
Modified: branches/branch-3.0/ide/VisualC2008/cube.vcproj
===================================================================
--- branches/branch-3.0/ide/VisualC2008/cube.vcproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2008/cube.vcproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltkd.lib fltk_gld.lib glu32.lib opengl32.lib comctl32.lib"
+ AdditionalDependencies="fltk3d.lib fltk3gld.lib glu32.lib opengl32.lib comctl32.lib"
OutputFile="..\..\test\cubed.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
@@ -161,7 +161,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltk.lib fltk_gl.lib glu32.lib opengl32.lib comctl32.lib"
+ AdditionalDependencies="fltk3.lib fltk3gl.lib glu32.lib opengl32.lib comctl32.lib"
OutputFile="..\..\test\cube.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
Modified: branches/branch-3.0/ide/VisualC2008/cursor.vcproj
===================================================================
--- branches/branch-3.0/ide/VisualC2008/cursor.vcproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2008/cursor.vcproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltkd.lib comctl32.lib"
+ AdditionalDependencies="fltk3d.lib comctl32.lib"
OutputFile="..\..\test\cursord.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
@@ -161,7 +161,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltk.lib comctl32.lib"
+ AdditionalDependencies="fltk3.lib comctl32.lib"
OutputFile="..\..\test\cursor.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
Modified: branches/branch-3.0/ide/VisualC2008/curve.vcproj
===================================================================
--- branches/branch-3.0/ide/VisualC2008/curve.vcproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2008/curve.vcproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltkd.lib comctl32.lib"
+ AdditionalDependencies="fltk3d.lib comctl32.lib"
OutputFile="..\..\test\curved.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
@@ -161,7 +161,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltk.lib comctl32.lib"
+ AdditionalDependencies="fltk3.lib comctl32.lib"
OutputFile="..\..\test\curve.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
Modified: branches/branch-3.0/ide/VisualC2008/demo.vcproj
===================================================================
--- branches/branch-3.0/ide/VisualC2008/demo.vcproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2008/demo.vcproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltkd.lib comctl32.lib"
+ AdditionalDependencies="fltk3d.lib comctl32.lib"
OutputFile="..\..\test\Demod.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
@@ -161,7 +161,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltk.lib comctl32.lib"
+ AdditionalDependencies="fltk3.lib comctl32.lib"
OutputFile="..\..\test\Demo.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
Modified: branches/branch-3.0/ide/VisualC2008/device.vcproj
===================================================================
--- branches/branch-3.0/ide/VisualC2008/device.vcproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2008/device.vcproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltkd.lib fltk_imagesd.lib fltk_pngd.lib fltk_jpegd.lib fltk_zlibd.lib comctl32.lib"
+ AdditionalDependencies="fltk3imagesd.lib fltk3d.lib fltk3pngd.lib fltk3jpegd.lib fltk3zlibd.lib comctl32.lib"
OutputFile="..\..\test\deviced.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
@@ -161,7 +161,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltk.lib fltk_images.lib fltk_png.lib fltk_jpeg.lib fltk_zlib.lib comctl32.lib"
+ AdditionalDependencies="fltk3images.lib fltk3.lib fltk3png.lib fltk3jpeg.lib fltk3zlib.lib comctl32.lib"
OutputFile="..\..\test\device.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
Modified: branches/branch-3.0/ide/VisualC2008/doublebuffer.vcproj
===================================================================
--- branches/branch-3.0/ide/VisualC2008/doublebuffer.vcproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2008/doublebuffer.vcproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltkd.lib comctl32.lib"
+ AdditionalDependencies="fltk3d.lib comctl32.lib"
OutputFile="..\..\test\doublebufferd.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
@@ -161,7 +161,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltk.lib comctl32.lib"
+ AdditionalDependencies="fltk3.lib comctl32.lib"
OutputFile="..\..\test\doublebuffer.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
Modified: branches/branch-3.0/ide/VisualC2008/editor.vcproj
===================================================================
--- branches/branch-3.0/ide/VisualC2008/editor.vcproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2008/editor.vcproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltkd.lib comctl32.lib"
+ AdditionalDependencies="fltk3imagesd.lib fltk3d.lib fltk3pngd.lib fltk3jpegd.lib fltk3zlibd.lib comctl32.lib"
OutputFile="..\..\test\editord.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
@@ -161,7 +161,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltk.lib comctl32.lib"
+ AdditionalDependencies="fltk3images.lib fltk3.lib fltk3png.lib fltk3jpeg.lib fltk3zlib.lib comctl32.lib"
OutputFile="..\..\test\editor.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
Modified: branches/branch-3.0/ide/VisualC2008/fast_slow.vcproj
===================================================================
--- branches/branch-3.0/ide/VisualC2008/fast_slow.vcproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2008/fast_slow.vcproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltkd.lib comctl32.lib"
+ AdditionalDependencies="fltk3d.lib comctl32.lib"
OutputFile="..\..\test\fast_slowd.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
@@ -161,7 +161,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltk.lib comctl32.lib"
+ AdditionalDependencies="fltk3.lib comctl32.lib"
OutputFile="..\..\test\fast_slow.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
Modified: branches/branch-3.0/ide/VisualC2008/file_chooser.vcproj
===================================================================
--- branches/branch-3.0/ide/VisualC2008/file_chooser.vcproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2008/file_chooser.vcproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltkd.lib fltk_imagesd.lib fltk_pngd.lib fltk_jpegd.lib fltk_zlibd.lib comctl32.lib"
+ AdditionalDependencies="fltk3imagesd.lib fltk3d.lib fltk3pngd.lib fltk3jpegd.lib fltk3zlibd.lib comctl32.lib"
OutputFile="..\..\test\file_chooserd.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
@@ -161,7 +161,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltk.lib fltk_images.lib fltk_png.lib fltk_jpeg.lib fltk_zlib.lib comctl32.lib"
+ AdditionalDependencies="fltk3images.lib fltk3.lib fltk3png.lib fltk3jpeg.lib fltk3zlib.lib comctl32.lib"
OutputFile="..\..\test\file_chooser.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
Modified: branches/branch-3.0/ide/VisualC2008/fltk.sln
===================================================================
--- branches/branch-3.0/ide/VisualC2008/fltk.sln 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2008/fltk.sln 2011-08-22 19:53:15 UTC (rev 8996)
@@ -9,34 +9,34 @@
{2F487ADB-AB3A-44B1-A824-D25C00A2D30A} = {2F487ADB-AB3A-44B1-A824-D25C00A2D30A}
EndProjectSection
EndProject
-Project("{D21EA206-7BBC-4F5B-8518-A798E56EE0FC}") = "fltk", "fltk.vcproj", "{57369729-6B61-4DCD-9289-79E0E2A168E8}"
+Project("{D21EA206-7BBC-4F5B-8518-A798E56EE0FC}") = "fltk3", "fltk3.vcproj", "{57369729-6B61-4DCD-9289-79E0E2A168E8}"
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
EndProject
-Project("{D21EA206-7BBC-4F5B-8518-A798E56EE0FC}") = "fltk_gl", "fltk_gl.vcproj", "{F0B23DD8-B4C3-4DB7-A879-3250CFAC686B}"
+Project("{D21EA206-7BBC-4F5B-8518-A798E56EE0FC}") = "fltk3gl", "fltk3gl.vcproj", "{F0B23DD8-B4C3-4DB7-A879-3250CFAC686B}"
ProjectSection(ProjectDependencies) = postProject
{57369729-6B61-4DCD-9289-79E0E2A168E8} = {57369729-6B61-4DCD-9289-79E0E2A168E8}
EndProjectSection
EndProject
-Project("{D21EA206-7BBC-4F5B-8518-A798E56EE0FC}") = "fltk_images", "fltk_images.vcproj", "{9BDDFD0A-6B25-4532-8AAF-897D526A845D}"
+Project("{D21EA206-7BBC-4F5B-8518-A798E56EE0FC}") = "fltk3images", "fltk3images.vcproj", "{9BDDFD0A-6B25-4532-8AAF-897D526A845D}"
ProjectSection(ProjectDependencies) = postProject
{57369729-6B61-4DCD-9289-79E0E2A168E8} = {57369729-6B61-4DCD-9289-79E0E2A168E8}
{AF7CC2D4-BBC7-4995-B18D-6A590C267527} = {AF7CC2D4-BBC7-4995-B18D-6A590C267527}
{417DB0F9-647A-4A36-ADFF-4196F7C1963D} = {417DB0F9-647A-4A36-ADFF-4196F7C1963D}
EndProjectSection
EndProject
-Project("{D21EA206-7BBC-4F5B-8518-A798E56EE0FC}") = "fltk_png", "fltk_png.vcproj", "{AF7CC2D4-BBC7-4995-B18D-6A590C267527}"
+Project("{D21EA206-7BBC-4F5B-8518-A798E56EE0FC}") = "fltk3png", "fltk3png.vcproj", "{AF7CC2D4-BBC7-4995-B18D-6A590C267527}"
ProjectSection(ProjectDependencies) = postProject
{57369729-6B61-4DCD-9289-79E0E2A168E8} = {57369729-6B61-4DCD-9289-79E0E2A168E8}
{2F487ADB-AB3A-44B1-A824-D25C00A2D30A} = {2F487ADB-AB3A-44B1-A824-D25C00A2D30A}
EndProjectSection
EndProject
-Project("{D21EA206-7BBC-4F5B-8518-A798E56EE0FC}") = "fltk_jpeg", "fltk_jpeg.vcproj", "{417DB0F9-647A-4A36-ADFF-4196F7C1963D}"
+Project("{D21EA206-7BBC-4F5B-8518-A798E56EE0FC}") = "fltk3jpeg", "fltk3jpeg.vcproj", "{417DB0F9-647A-4A36-ADFF-4196F7C1963D}"
ProjectSection(ProjectDependencies) = postProject
{57369729-6B61-4DCD-9289-79E0E2A168E8} = {57369729-6B61-4DCD-9289-79E0E2A168E8}
EndProjectSection
EndProject
-Project("{D21EA206-7BBC-4F5B-8518-A798E56EE0FC}") = "fltk_zlib", "fltk_zlib.vcproj", "{2F487ADB-AB3A-44B1-A824-D25C00A2D30A}"
+Project("{D21EA206-7BBC-4F5B-8518-A798E56EE0FC}") = "fltk3zlib", "fltk3zlib.vcproj", "{2F487ADB-AB3A-44B1-A824-D25C00A2D30A}"
ProjectSection(ProjectDependencies) = postProject
{57369729-6B61-4DCD-9289-79E0E2A168E8} = {57369729-6B61-4DCD-9289-79E0E2A168E8}
EndProjectSection
@@ -204,8 +204,8 @@
EndProject
Project("{D21EA206-7BBC-4F5B-8518-A798E56EE0FC}") = "device", "device.vcproj", "{81262FB6-1DCC-42BE-90DE-552036188129}"
ProjectSection(ProjectDependencies) = postProject
+ {9BDDFD0A-6B25-4532-8AAF-897D526A845D} = {9BDDFD0A-6B25-4532-8AAF-897D526A845D}
{57369729-6B61-4DCD-9289-79E0E2A168E8} = {57369729-6B61-4DCD-9289-79E0E2A168E8}
- {9BDDFD0A-6B25-4532-8AAF-897D526A845D} = {9BDDFD0A-6B25-4532-8AAF-897D526A845D}
{AF7CC2D4-BBC7-4995-B18D-6A590C267527} = {AF7CC2D4-BBC7-4995-B18D-6A590C267527}
{417DB0F9-647A-4A36-ADFF-4196F7C1963D} = {417DB0F9-647A-4A36-ADFF-4196F7C1963D}
{2F487ADB-AB3A-44B1-A824-D25C00A2D30A} = {2F487ADB-AB3A-44B1-A824-D25C00A2D30A}
@@ -218,7 +218,11 @@
EndProject
Project("{D21EA206-7BBC-4F5B-8518-A798E56EE0FC}") = "editor", "editor.vcproj", "{AE6C6316-F27C-49AB-9AE7-B5B1C76E7158}"
ProjectSection(ProjectDependencies) = postProject
+ {9BDDFD0A-6B25-4532-8AAF-897D526A845D} = {9BDDFD0A-6B25-4532-8AAF-897D526A845D}
{57369729-6B61-4DCD-9289-79E0E2A168E8} = {57369729-6B61-4DCD-9289-79E0E2A168E8}
+ {AF7CC2D4-BBC7-4995-B18D-6A590C267527} = {AF7CC2D4-BBC7-4995-B18D-6A590C267527}
+ {417DB0F9-647A-4A36-ADFF-4196F7C1963D} = {417DB0F9-647A-4A36-ADFF-4196F7C1963D}
+ {2F487ADB-AB3A-44B1-A824-D25C00A2D30A} = {2F487ADB-AB3A-44B1-A824-D25C00A2D30A}
EndProjectSection
EndProject
Project("{D21EA206-7BBC-4F5B-8518-A798E56EE0FC}") = "fast_slow", "fast_slow.vcproj", "{B63B4333-146D-4878-97DF-2B288E1D6AFB}"
@@ -229,8 +233,8 @@
EndProject
Project("{D21EA206-7BBC-4F5B-8518-A798E56EE0FC}") = "file_chooser", "file_chooser.vcproj", "{74C90FEF-F138-4A72-B3B6-F2D2D8A114E6}"
ProjectSection(ProjectDependencies) = postProject
+ {9BDDFD0A-6B25-4532-8AAF-897D526A845D} = {9BDDFD0A-6B25-4532-8AAF-897D526A845D}
{57369729-6B61-4DCD-9289-79E0E2A168E8} = {57369729-6B61-4DCD-9289-79E0E2A168E8}
- {9BDDFD0A-6B25-4532-8AAF-897D526A845D} = {9BDDFD0A-6B25-4532-8AAF-897D526A845D}
{AF7CC2D4-BBC7-4995-B18D-6A590C267527} = {AF7CC2D4-BBC7-4995-B18D-6A590C267527}
{417DB0F9-647A-4A36-ADFF-4196F7C1963D} = {417DB0F9-647A-4A36-ADFF-4196F7C1963D}
{2F487ADB-AB3A-44B1-A824-D25C00A2D30A} = {2F487ADB-AB3A-44B1-A824-D25C00A2D30A}
@@ -243,8 +247,8 @@
EndProject
Project("{D21EA206-7BBC-4F5B-8518-A798E56EE0FC}") = "fractals", "fractals.vcproj", "{9C217068-6B33-4F5E-974E-D795185EBF6D}"
ProjectSection(ProjectDependencies) = postProject
+ {F0B23DD8-B4C3-4DB7-A879-3250CFAC686B} = {F0B23DD8-B4C3-4DB7-A879-3250CFAC686B}
{57369729-6B61-4DCD-9289-79E0E2A168E8} = {57369729-6B61-4DCD-9289-79E0E2A168E8}
- {F0B23DD8-B4C3-4DB7-A879-3250CFAC686B} = {F0B23DD8-B4C3-4DB7-A879-3250CFAC686B}
EndProjectSection
EndProject
Project("{D21EA206-7BBC-4F5B-8518-A798E56EE0FC}") = "fullscreen", "fullscreen.vcproj", "{9CFD2E83-D5C8-4789-8BBA-7F17DC9021F9}"
@@ -261,8 +265,8 @@
EndProject
Project("{D21EA206-7BBC-4F5B-8518-A798E56EE0FC}") = "glpuzzle", "glpuzzle.vcproj", "{A0506BCD-CFC0-4549-805F-170E85F570D3}"
ProjectSection(ProjectDependencies) = postProject
+ {F0B23DD8-B4C3-4DB7-A879-3250CFAC686B} = {F0B23DD8-B4C3-4DB7-A879-3250CFAC686B}
{57369729-6B61-4DCD-9289-79E0E2A168E8} = {57369729-6B61-4DCD-9289-79E0E2A168E8}
- {F0B23DD8-B4C3-4DB7-A879-3250CFAC686B} = {F0B23DD8-B4C3-4DB7-A879-3250CFAC686B}
EndProjectSection
EndProject
Project("{D21EA206-7BBC-4F5B-8518-A798E56EE0FC}") = "hello", "hello.vcproj", "{8F0165D2-6107-49A0-BD35-B01A472A4062}"
@@ -272,8 +276,8 @@
EndProject
Project("{D21EA206-7BBC-4F5B-8518-A798E56EE0FC}") = "help", "help.vcproj", "{B846C052-53B2-4B99-9930-6C440E047FD8}"
ProjectSection(ProjectDependencies) = postProject
+ {9BDDFD0A-6B25-4532-8AAF-897D526A845D} = {9BDDFD0A-6B25-4532-8AAF-897D526A845D}
{57369729-6B61-4DCD-9289-79E0E2A168E8} = {57369729-6B61-4DCD-9289-79E0E2A168E8}
- {9BDDFD0A-6B25-4532-8AAF-897D526A845D} = {9BDDFD0A-6B25-4532-8AAF-897D526A845D}
{AF7CC2D4-BBC7-4995-B18D-6A590C267527} = {AF7CC2D4-BBC7-4995-B18D-6A590C267527}
{417DB0F9-647A-4A36-ADFF-4196F7C1963D} = {417DB0F9-647A-4A36-ADFF-4196F7C1963D}
{2F487ADB-AB3A-44B1-A824-D25C00A2D30A} = {2F487ADB-AB3A-44B1-A824-D25C00A2D30A}
@@ -353,7 +357,11 @@
EndProject
Project("{D21EA206-7BBC-4F5B-8518-A798E56EE0FC}") = "native-filechooser", "native-filechooser.vcproj", "{B0B9FC83-4878-4BBB-A9AE-F0BF6CB51BE7}"
ProjectSection(ProjectDependencies) = postProject
+ {9BDDFD0A-6B25-4532-8AAF-897D526A845D} = {9BDDFD0A-6B25-4532-8AAF-897D526A845D}
{57369729-6B61-4DCD-9289-79E0E2A168E8} = {57369729-6B61-4DCD-9289-79E0E2A168E8}
+ {AF7CC2D4-BBC7-4995-B18D-6A590C267527} = {AF7CC2D4-BBC7-4995-B18D-6A590C267527}
+ {417DB0F9-647A-4A36-ADFF-4196F7C1963D} = {417DB0F9-647A-4A36-ADFF-4196F7C1963D}
+ {2F487ADB-AB3A-44B1-A824-D25C00A2D30A} = {2F487ADB-AB3A-44B1-A824-D25C00A2D30A}
EndProjectSection
EndProject
Project("{D21EA206-7BBC-4F5B-8518-A798E56EE0FC}") = "output", "output.vcproj", "{9774BE9A-32B5-408D-A963-EE1ABEA49873}"
@@ -431,8 +439,8 @@
EndProject
Project("{D21EA206-7BBC-4F5B-8518-A798E56EE0FC}") = "sudoku", "sudoku.vcproj", "{29D907BD-7A6D-42D5-BDDE-6DEC41766F63}"
ProjectSection(ProjectDependencies) = postProject
+ {9BDDFD0A-6B25-4532-8AAF-897D526A845D} = {9BDDFD0A-6B25-4532-8AAF-897D526A845D}
{57369729-6B61-4DCD-9289-79E0E2A168E8} = {57369729-6B61-4DCD-9289-79E0E2A168E8}
- {9BDDFD0A-6B25-4532-8AAF-897D526A845D} = {9BDDFD0A-6B25-4532-8AAF-897D526A845D}
{AF7CC2D4-BBC7-4995-B18D-6A590C267527} = {AF7CC2D4-BBC7-4995-B18D-6A590C267527}
{417DB0F9-647A-4A36-ADFF-4196F7C1963D} = {417DB0F9-647A-4A36-ADFF-4196F7C1963D}
{2F487ADB-AB3A-44B1-A824-D25C00A2D30A} = {2F487ADB-AB3A-44B1-A824-D25C00A2D30A}
Modified: branches/branch-3.0/ide/VisualC2008/fltk3.vcproj
===================================================================
--- branches/branch-3.0/ide/VisualC2008/fltk3.vcproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2008/fltk3.vcproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -2,9 +2,9 @@
<VisualStudioProject
ProjectType="Visual C++"
Version="9,00"
- Name="fltk"
+ Name="fltk3"
ProjectGUID="{57369729-6B61-4DCD-9289-79E0E2A168E8}"
- RootNamespace="fltk"
+ RootNamespace="fltk3"
TargetFrameworkVersion="131072"
>
<Platforms>
@@ -18,7 +18,7 @@
<Configuration
Name="Debug|Win32"
OutputDirectory="..\..\lib"
- IntermediateDirectory=".\fltk_debug"
+ IntermediateDirectory=".\fltk3_debug"
ConfigurationType="4"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
@@ -44,10 +44,10 @@
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;FL_LIBRARY;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
- PrecompiledHeaderFile=".\fltk_debug\fltk.pch"
- AssemblerListingLocation=".\fltk_debug\"
- ObjectFile=".\fltk_debug\"
- ProgramDataBaseFileName=".\fltk_debug\"
+ PrecompiledHeaderFile=".\fltk3_debug\fltk3.pch"
+ AssemblerListingLocation=".\fltk3_debug\"
+ ObjectFile=".\fltk3_debug\"
+ ProgramDataBaseFileName=".\fltk3_debug\"
BrowseInformation="1"
SuppressStartupBanner="true"
DebugInformationFormat="3"
@@ -66,7 +66,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\lib\fltkd.lib"
+ OutputFile="..\..\lib\fltk3d.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -88,7 +88,7 @@
<Configuration
Name="Release|Win32"
OutputDirectory="..\..\lib"
- IntermediateDirectory=".\fltk_release"
+ IntermediateDirectory=".\fltk3_release"
ConfigurationType="4"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
@@ -116,10 +116,10 @@
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;FL_LIBRARY;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
- PrecompiledHeaderFile=".\fltk_release\fltk.pch"
- AssemblerListingLocation=".\fltk_release\"
- ObjectFile=".\fltk_release\"
- ProgramDataBaseFileName=".\fltk_release\"
+ PrecompiledHeaderFile=".\fltk3_release\fltk3.pch"
+ AssemblerListingLocation=".\fltk3_release\"
+ ObjectFile=".\fltk3_release\"
+ ProgramDataBaseFileName=".\fltk3_release\"
BrowseInformation="1"
SuppressStartupBanner="true"
CompileAs="0"
@@ -137,7 +137,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\lib\fltk.lib"
+ OutputFile="..\..\lib\fltk3.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -161,7 +161,7 @@
</References>
<Files>
<File
- RelativePath="..\..\src\Fl.cxx"
+ RelativePath="..\..\src\core\Fl.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -184,7 +184,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\Fl_Adjuster.cxx"
+ RelativePath="..\..\src\core\Fl_Adjuster.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -207,7 +207,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\Fl_Bitmap.cxx"
+ RelativePath="..\..\src\core\Fl_Bitmap.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -230,7 +230,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\Fl_Box.cxx"
+ RelativePath="..\..\src\core\Fl_Box.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -253,7 +253,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\Fl_Browser.cxx"
+ RelativePath="..\..\src\core\Fl_Browser.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -276,7 +276,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\Fl_Browser_.cxx"
+ RelativePath="..\..\src\core\Fl_Browser_.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -299,7 +299,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\Fl_Browser_load.cxx"
+ RelativePath="..\..\src\core\Fl_Browser_load.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -322,7 +322,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\Fl_Button.cxx"
+ RelativePath="..\..\src\core\Fl_Button.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -345,7 +345,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\Fl_Chart.cxx"
+ RelativePath="..\..\src\core\Fl_Chart.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -368,7 +368,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\Fl_Check_Browser.cxx"
+ RelativePath="..\..\src\core\Fl_Check_Browser.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -391,7 +391,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\Fl_Check_Button.cxx"
+ RelativePath="..\..\src\core\Fl_Check_Button.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -414,7 +414,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\Fl_Choice.cxx"
+ RelativePath="..\..\src\core\Fl_Choice.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -437,7 +437,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\Fl_Clock.cxx"
+ RelativePath="..\..\src\core\Fl_Clock.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -460,7 +460,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\Fl_Color_Chooser.cxx"
+ RelativePath="..\..\src\core\Fl_Color_Chooser.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -483,7 +483,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\Fl_Counter.cxx"
+ RelativePath="..\..\src\core\Fl_Counter.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -506,7 +506,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\Fl_Device.cxx"
+ RelativePath="..\..\src\core\Fl_Device.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -529,7 +529,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\Fl_Dial.cxx"
+ RelativePath="..\..\src\core\Fl_Dial.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -552,7 +552,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\Fl_Double_Window.cxx"
+ RelativePath="..\..\src\core\Fl_Double_Window.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -575,7 +575,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\Fl_File_Browser.cxx"
+ RelativePath="..\..\src\core\Fl_File_Browser.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -598,7 +598,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\Fl_File_Chooser.cxx"
+ RelativePath="..\..\src\core\Fl_File_Chooser.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -621,7 +621,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\Fl_File_Chooser2.cxx"
+ RelativePath="..\..\src\core\Fl_File_Chooser2.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -644,7 +644,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\Fl_File_Icon.cxx"
+ RelativePath="..\..\src\core\Fl_File_Icon.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -667,7 +667,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\Fl_File_Input.cxx"
+ RelativePath="..\..\src\core\Fl_File_Input.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -690,7 +690,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\Fl_Group.cxx"
+ RelativePath="..\..\src\core\Fl_Group.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -713,7 +713,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\Fl_Help_View.cxx"
+ RelativePath="..\..\src\core\Fl_Help_View.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -736,7 +736,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\Fl_Image.cxx"
+ RelativePath="..\..\src\core\Fl_Image.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -759,7 +759,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\Fl_Input.cxx"
+ RelativePath="..\..\src\core\Fl_Input.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -782,7 +782,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\Fl_Input_.cxx"
+ RelativePath="..\..\src\core\Fl_Input_.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -805,7 +805,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\Fl_Light_Button.cxx"
+ RelativePath="..\..\src\core\Fl_Light_Button.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -828,7 +828,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\Fl_Menu.cxx"
+ RelativePath="..\..\src\core\Fl_Menu.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -851,7 +851,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\Fl_Menu_.cxx"
+ RelativePath="..\..\src\core\Fl_Menu_.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -874,7 +874,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\Fl_Menu_Bar.cxx"
+ RelativePath="..\..\src\core\Fl_Menu_Bar.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -897,7 +897,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\Fl_Menu_Button.cxx"
+ RelativePath="..\..\src\core\Fl_Menu_Button.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -920,7 +920,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\Fl_Menu_Window.cxx"
+ RelativePath="..\..\src\core\Fl_Menu_Window.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -943,7 +943,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\Fl_Menu_add.cxx"
+ RelativePath="..\..\src\core\Fl_Menu_add.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -966,7 +966,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\Fl_Menu_global.cxx"
+ RelativePath="..\..\src\core\Fl_Menu_global.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -989,7 +989,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\Fl_Multi_Label.cxx"
+ RelativePath="..\..\src\core\Fl_Multi_Label.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -1012,7 +1012,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\Fl_Native_File_Chooser.cxx"
+ RelativePath="..\..\src\core\Fl_Native_File_Chooser.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -1035,7 +1035,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\Fl_Overlay_Window.cxx"
+ RelativePath="..\..\src\core\Fl_Overlay_Window.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -1058,7 +1058,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\Fl_Pack.cxx"
+ RelativePath="..\..\src\core\Fl_Pack.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -1081,7 +1081,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\Fl_Paged_Device.cxx"
+ RelativePath="..\..\src\core\Fl_Paged_Device.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -1104,7 +1104,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\Fl_Pixmap.cxx"
+ RelativePath="..\..\src\core\Fl_Pixmap.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -1127,7 +1127,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\Fl_Positioner.cxx"
+ RelativePath="..\..\src\core\Fl_Positioner.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -1150,7 +1150,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\Fl_Printer.cxx"
+ RelativePath="..\..\src\core\Fl_Printer.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -1173,7 +1173,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\Fl_Preferences.cxx"
+ RelativePath="..\..\src\core\Fl_Preferences.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -1196,7 +1196,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\Fl_Progress.cxx"
+ RelativePath="..\..\src\core\Fl_Progress.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -1219,7 +1219,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\Fl_Repeat_Button.cxx"
+ RelativePath="..\..\src\core\Fl_Repeat_Button.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -1242,7 +1242,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\Fl_Return_Button.cxx"
+ RelativePath="..\..\src\core\Fl_Return_Button.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -1265,7 +1265,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\Fl_Roller.cxx"
+ RelativePath="..\..\src\core\Fl_Roller.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -1288,7 +1288,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\Fl_Round_Button.cxx"
+ RelativePath="..\..\src\core\Fl_Round_Button.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -1311,7 +1311,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\Fl_Scroll.cxx"
+ RelativePath="..\..\src\core\Fl_Scroll.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -1334,7 +1334,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\Fl_Scrollbar.cxx"
+ RelativePath="..\..\src\core\Fl_Scrollbar.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -1357,7 +1357,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\Fl_Shared_Image.cxx"
+ RelativePath="..\..\src\core\Fl_Shared_Image.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -1380,7 +1380,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\Fl_Single_Window.cxx"
+ RelativePath="..\..\src\core\Fl_Single_Window.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -1403,7 +1403,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\Fl_Slider.cxx"
+ RelativePath="..\..\src\core\Fl_Slider.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -1426,7 +1426,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\Style.cxx"
+ RelativePath="..\..\src\core\Style.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -1449,7 +1449,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\Fl_Sys_Menu_Bar.cxx"
+ RelativePath="..\..\src\core\Fl_Sys_Menu_Bar.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -1472,7 +1472,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\Fl_Table.cxx"
+ RelativePath="..\..\src\core\Fl_Table.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -1495,7 +1495,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\Fl_Table_Row.cxx"
+ RelativePath="..\..\src\core\Fl_Table_Row.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -1518,7 +1518,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\Fl_Tabs.cxx"
+ RelativePath="..\..\src\core\Fl_Tabs.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -1541,7 +1541,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\Fl_Text_Buffer.cxx"
+ RelativePath="..\..\src\core\Fl_Text_Buffer.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -1564,7 +1564,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\Fl_Text_Display.cxx"
+ RelativePath="..\..\src\core\Fl_Text_Display.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -1587,7 +1587,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\Fl_Text_Editor.cxx"
+ RelativePath="..\..\src\core\Fl_Text_Editor.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -1610,7 +1610,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\Fl_Tile.cxx"
+ RelativePath="..\..\src\core\Fl_Tile.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -1633,7 +1633,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\Fl_Tiled_Image.cxx"
+ RelativePath="..\..\src\core\Fl_Tiled_Image.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -1656,7 +1656,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\Fl_Tooltip.cxx"
+ RelativePath="..\..\src\core\Fl_Tooltip.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -1679,7 +1679,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\Fl_Tree.cxx"
+ RelativePath="..\..\src\core\Fl_Tree.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -1702,7 +1702,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\Fl_Tree_Item.cxx"
+ RelativePath="..\..\src\core\Fl_Tree_Item.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -1725,7 +1725,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\Fl_Tree_Item_Array.cxx"
+ RelativePath="..\..\src\core\Fl_Tree_Item_Array.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -1748,7 +1748,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\Fl_Tree_Prefs.cxx"
+ RelativePath="..\..\src\core\Fl_Tree_Prefs.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -1771,7 +1771,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\Fl_Valuator.cxx"
+ RelativePath="..\..\src\core\Fl_Valuator.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -1794,7 +1794,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\Fl_Value_Input.cxx"
+ RelativePath="..\..\src\core\Fl_Value_Input.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -1817,7 +1817,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\Fl_Value_Output.cxx"
+ RelativePath="..\..\src\core\Fl_Value_Output.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -1840,7 +1840,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\Fl_Value_Slider.cxx"
+ RelativePath="..\..\src\core\Fl_Value_Slider.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -1863,7 +1863,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\Fl_Widget.cxx"
+ RelativePath="..\..\src\core\Fl_Widget.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -1886,7 +1886,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\Fl_Window.cxx"
+ RelativePath="..\..\src\core\Fl_Window.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -1909,7 +1909,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\Fl_Window_fullscreen.cxx"
+ RelativePath="..\..\src\core\Fl_Window_fullscreen.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -1932,7 +1932,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\Fl_Window_hotspot.cxx"
+ RelativePath="..\..\src\core\Fl_Window_hotspot.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -1955,7 +1955,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\Fl_Window_iconize.cxx"
+ RelativePath="..\..\src\core\Fl_Window_iconize.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -1978,7 +1978,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\Fl_Wizard.cxx"
+ RelativePath="..\..\src\core\Fl_Wizard.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -2001,7 +2001,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\Fl_XBM_Image.cxx"
+ RelativePath="..\..\src\core\Fl_XBM_Image.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -2024,7 +2024,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\Fl_XPM_Image.cxx"
+ RelativePath="..\..\src\core\Fl_XPM_Image.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -2047,7 +2047,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\Fl_abort.cxx"
+ RelativePath="..\..\src\core\Fl_abort.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -2070,7 +2070,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\Fl_add_idle.cxx"
+ RelativePath="..\..\src\core\Fl_add_idle.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -2093,7 +2093,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\Fl_arg.cxx"
+ RelativePath="..\..\src\core\Fl_arg.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -2116,7 +2116,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\Fl_compose.cxx"
+ RelativePath="..\..\src\core\Fl_compose.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -2139,7 +2139,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\Fl_display.cxx"
+ RelativePath="..\..\src\core\Fl_display.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -2162,7 +2162,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\Fl_get_key.cxx"
+ RelativePath="..\..\src\core\Fl_get_key.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -2185,7 +2185,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\Fl_get_system_colors.cxx"
+ RelativePath="..\..\src\core\Fl_get_system_colors.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -2208,7 +2208,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\Fl_grab.cxx"
+ RelativePath="..\..\src\core\Fl_grab.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -2231,7 +2231,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\Fl_lock.cxx"
+ RelativePath="..\..\src\core\Fl_lock.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -2254,7 +2254,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\Fl_own_colormap.cxx"
+ RelativePath="..\..\src\core\Fl_own_colormap.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -2277,7 +2277,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\Fl_visual.cxx"
+ RelativePath="..\..\src\core\Fl_visual.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -2300,7 +2300,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\Fl_x.cxx"
+ RelativePath="..\..\src\core\Fl_x.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -2323,7 +2323,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\filename_absolute.cxx"
+ RelativePath="..\..\src\core\filename_absolute.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -2346,7 +2346,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\filename_expand.cxx"
+ RelativePath="..\..\src\core\filename_expand.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -2369,7 +2369,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\filename_ext.cxx"
+ RelativePath="..\..\src\core\filename_ext.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -2392,7 +2392,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\filename_isdir.cxx"
+ RelativePath="..\..\src\core\filename_isdir.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -2415,7 +2415,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\filename_list.cxx"
+ RelativePath="..\..\src\core\filename_list.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -2438,7 +2438,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\filename_match.cxx"
+ RelativePath="..\..\src\core\filename_match.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -2461,7 +2461,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\filename_setext.cxx"
+ RelativePath="..\..\src\core\filename_setext.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -2484,7 +2484,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\fl_arc.cxx"
+ RelativePath="..\..\src\core\fl_arc.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -2507,7 +2507,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\fl_arci.cxx"
+ RelativePath="..\..\src\core\fl_arci.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -2530,7 +2530,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\fl_ask.cxx"
+ RelativePath="..\..\src\core\fl_ask.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -2553,7 +2553,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\fl_boxtype.cxx"
+ RelativePath="..\..\src\core\fl_boxtype.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -2576,7 +2576,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\fl_call_main.cxx"
+ RelativePath="..\..\src\core\fl_call_main.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -2599,7 +2599,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\fl_color.cxx"
+ RelativePath="..\..\src\core\fl_color.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -2622,7 +2622,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\fl_cursor.cxx"
+ RelativePath="..\..\src\core\fl_cursor.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -2645,7 +2645,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\fl_curve.cxx"
+ RelativePath="..\..\src\core\fl_curve.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -2668,7 +2668,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\fl_diamond_box.cxx"
+ RelativePath="..\..\src\core\fl_diamond_box.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -2691,7 +2691,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\fl_dnd.cxx"
+ RelativePath="..\..\src\core\fl_dnd.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -2714,7 +2714,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\fl_draw.cxx"
+ RelativePath="..\..\src\core\fl_draw.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -2737,7 +2737,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\fl_draw_image.cxx"
+ RelativePath="..\..\src\core\fl_draw_image.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -2760,7 +2760,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\fl_draw_pixmap.cxx"
+ RelativePath="..\..\src\core\fl_draw_pixmap.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -2783,7 +2783,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\fl_encoding_latin1.cxx"
+ RelativePath="..\..\src\core\fl_encoding_latin1.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -2806,7 +2806,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\fl_encoding_mac_roman.cxx"
+ RelativePath="..\..\src\core\fl_encoding_mac_roman.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -2829,7 +2829,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\fl_engraved_label.cxx"
+ RelativePath="..\..\src\core\fl_engraved_label.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -2852,7 +2852,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\fl_file_dir.cxx"
+ RelativePath="..\..\src\core\fl_file_dir.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -2875,7 +2875,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\fl_font.cxx"
+ RelativePath="..\..\src\core\fl_font.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -2898,7 +2898,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\fl_gtk.cxx"
+ RelativePath="..\..\src\core\fl_gtk.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -2921,7 +2921,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\fl_labeltype.cxx"
+ RelativePath="..\..\src\core\fl_labeltype.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -2944,7 +2944,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\fl_line_style.cxx"
+ RelativePath="..\..\src\core\fl_line_style.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -2967,7 +2967,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\fl_open_uri.cxx"
+ RelativePath="..\..\src\core\fl_open_uri.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -2990,7 +2990,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\fl_oval_box.cxx"
+ RelativePath="..\..\src\core\fl_oval_box.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -3013,7 +3013,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\fl_overlay.cxx"
+ RelativePath="..\..\src\core\fl_overlay.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -3036,7 +3036,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\fl_overlay_visual.cxx"
+ RelativePath="..\..\src\core\fl_overlay_visual.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -3059,7 +3059,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\fl_plastic.cxx"
+ RelativePath="..\..\src\core\fl_plastic.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -3082,7 +3082,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\fl_read_image.cxx"
+ RelativePath="..\..\src\core\fl_read_image.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -3105,7 +3105,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\fl_rect.cxx"
+ RelativePath="..\..\src\core\fl_rect.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -3128,7 +3128,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\fl_round_box.cxx"
+ RelativePath="..\..\src\core\fl_round_box.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -3151,7 +3151,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\fl_rounded_box.cxx"
+ RelativePath="..\..\src\core\fl_rounded_box.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -3174,7 +3174,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\fl_scroll_area.cxx"
+ RelativePath="..\..\src\core\fl_scroll_area.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -3197,7 +3197,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\fl_set_font.cxx"
+ RelativePath="..\..\src\core\fl_set_font.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -3220,7 +3220,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\fl_set_fonts.cxx"
+ RelativePath="..\..\src\core\fl_set_fonts.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -3243,7 +3243,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\fl_shadow_box.cxx"
+ RelativePath="..\..\src\core\fl_shadow_box.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -3266,7 +3266,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\fl_shortcut.cxx"
+ RelativePath="..\..\src\core\fl_shortcut.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -3289,7 +3289,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\fl_show_colormap.cxx"
+ RelativePath="..\..\src\core\fl_show_colormap.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -3312,7 +3312,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\fl_symbols.cxx"
+ RelativePath="..\..\src\core\fl_symbols.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -3335,7 +3335,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\fl_utf8.cxx"
+ RelativePath="..\..\src\core\fl_utf8.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -3358,7 +3358,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\fl_utf.cxx"
+ RelativePath="..\..\src\core\fl_utf.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -3381,7 +3381,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\fl_vertex.cxx"
+ RelativePath="..\..\src\core\fl_vertex.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -3404,7 +3404,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\numericsort.cxx"
+ RelativePath="..\..\src\core\numericsort.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -3427,7 +3427,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\ps_image.cxx"
+ RelativePath="..\..\src\core\ps_image.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -3450,7 +3450,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\scandir.cxx"
+ RelativePath="..\..\src\core\scandir.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -3473,7 +3473,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\screen_xywh.cxx"
+ RelativePath="..\..\src\core\screen_xywh.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -3496,7 +3496,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\flstring.c"
+ RelativePath="..\..\src\core\flstring.c"
>
<FileConfiguration
Name="Debug|Win32"
@@ -3519,7 +3519,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\vsnprintf.c"
+ RelativePath="..\..\src\core\vsnprintf.c"
>
<FileConfiguration
Name="Debug|Win32"
@@ -3542,7 +3542,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\xutf8\case.c"
+ RelativePath="..\..\src\core\xutf8\case.c"
>
<FileConfiguration
Name="Debug|Win32"
@@ -3565,7 +3565,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\xutf8\is_right2left.c"
+ RelativePath="..\..\src\core\xutf8\is_right2left.c"
>
<FileConfiguration
Name="Debug|Win32"
@@ -3588,7 +3588,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\xutf8\is_spacing.c"
+ RelativePath="..\..\src\core\xutf8\is_spacing.c"
>
<FileConfiguration
Name="Debug|Win32"
Modified: branches/branch-3.0/ide/VisualC2008/fltk3gl.vcproj
===================================================================
--- branches/branch-3.0/ide/VisualC2008/fltk3gl.vcproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2008/fltk3gl.vcproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -2,9 +2,9 @@
<VisualStudioProject
ProjectType="Visual C++"
Version="9,00"
- Name="fltk_gl"
+ Name="fltk3gl"
ProjectGUID="{F0B23DD8-B4C3-4DB7-A879-3250CFAC686B}"
- RootNamespace="fltk_gl"
+ RootNamespace="fltk3gl"
TargetFrameworkVersion="131072"
>
<Platforms>
@@ -18,7 +18,7 @@
<Configuration
Name="Debug|Win32"
OutputDirectory="..\..\lib"
- IntermediateDirectory=".\fltk_gl_debug"
+ IntermediateDirectory=".\fltk3gl_debug"
ConfigurationType="4"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
@@ -44,10 +44,10 @@
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;FL_LIBRARY;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
- PrecompiledHeaderFile=".\fltk_gl_debug\fltk_gl.pch"
- AssemblerListingLocation=".\fltk_gl_debug\"
- ObjectFile=".\fltk_gl_debug\"
- ProgramDataBaseFileName=".\fltk_gl_debug\"
+ PrecompiledHeaderFile=".\fltk3gl_debug\fltk3gl.pch"
+ AssemblerListingLocation=".\fltk3gl_debug\"
+ ObjectFile=".\fltk3gl_debug\"
+ ProgramDataBaseFileName=".\fltk3gl_debug\"
BrowseInformation="1"
SuppressStartupBanner="true"
DebugInformationFormat="3"
@@ -66,7 +66,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\lib\fltk_gld.lib"
+ OutputFile="..\..\lib\fltk3gld.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -88,7 +88,7 @@
<Configuration
Name="Release|Win32"
OutputDirectory="..\..\lib"
- IntermediateDirectory=".\fltk_gl_release"
+ IntermediateDirectory=".\fltk3gl_release"
ConfigurationType="4"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
@@ -116,10 +116,10 @@
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;FL_LIBRARY;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
- PrecompiledHeaderFile=".\fltk_gl_release\fltk_gl.pch"
- AssemblerListingLocation=".\fltk_gl_release\"
- ObjectFile=".\fltk_gl_release\"
- ProgramDataBaseFileName=".\fltk_gl_release\"
+ PrecompiledHeaderFile=".\fltk3gl_release\fltk3gl.pch"
+ AssemblerListingLocation=".\fltk3gl_release\"
+ ObjectFile=".\fltk3gl_release\"
+ ProgramDataBaseFileName=".\fltk3gl_release\"
BrowseInformation="1"
SuppressStartupBanner="true"
CompileAs="0"
@@ -137,7 +137,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\lib\fltk_gl.lib"
+ OutputFile="..\..\lib\fltk3gl.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -161,7 +161,7 @@
</References>
<Files>
<File
- RelativePath="..\..\src\Fl_Gl_Choice.cxx"
+ RelativePath="..\..\src\core\Fl_Gl_Choice.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -184,7 +184,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\Fl_Gl_Device_Plugin.cxx"
+ RelativePath="..\..\src\core\Fl_Gl_Device_Plugin.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -207,7 +207,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\Fl_Gl_Overlay.cxx"
+ RelativePath="..\..\src\core\Fl_Gl_Overlay.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -230,7 +230,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\Fl_Gl_Window.cxx"
+ RelativePath="..\..\src\core\Fl_Gl_Window.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -253,7 +253,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\freeglut_geometry.cxx"
+ RelativePath="..\..\src\core\freeglut_geometry.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -276,7 +276,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\freeglut_stroke_mono_roman.cxx"
+ RelativePath="..\..\src\core\freeglut_stroke_mono_roman.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -299,7 +299,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\freeglut_stroke_roman.cxx"
+ RelativePath="..\..\src\core\freeglut_stroke_roman.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -322,7 +322,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\freeglut_teapot.cxx"
+ RelativePath="..\..\src\core\freeglut_teapot.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -345,7 +345,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\gl_draw.cxx"
+ RelativePath="..\..\src\core\gl_draw.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -368,7 +368,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\glut_compatability.cxx"
+ RelativePath="..\..\src\core\glut_compatability.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -391,7 +391,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\glut_font.cxx"
+ RelativePath="..\..\src\core\glut_font.cxx"
>
<FileConfiguration
Name="Debug|Win32"
Modified: branches/branch-3.0/ide/VisualC2008/fltk3images.vcproj
===================================================================
--- branches/branch-3.0/ide/VisualC2008/fltk3images.vcproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2008/fltk3images.vcproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -2,9 +2,9 @@
<VisualStudioProject
ProjectType="Visual C++"
Version="9,00"
- Name="fltk_images"
+ Name="fltk3images"
ProjectGUID="{9BDDFD0A-6B25-4532-8AAF-897D526A845D}"
- RootNamespace="fltk_images"
+ RootNamespace="fltk3images"
TargetFrameworkVersion="131072"
>
<Platforms>
@@ -18,7 +18,7 @@
<Configuration
Name="Debug|Win32"
OutputDirectory="..\..\lib"
- IntermediateDirectory=".\fltk_images_debug"
+ IntermediateDirectory=".\fltk3images_debug"
ConfigurationType="4"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
@@ -44,10 +44,10 @@
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;FL_LIBRARY;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
- PrecompiledHeaderFile=".\fltk_images_debug\fltk_images.pch"
- AssemblerListingLocation=".\fltk_images_debug\"
- ObjectFile=".\fltk_images_debug\"
- ProgramDataBaseFileName=".\fltk_images_debug\"
+ PrecompiledHeaderFile=".\fltk3images_debug\fltk3images.pch"
+ AssemblerListingLocation=".\fltk3images_debug\"
+ ObjectFile=".\fltk3images_debug\"
+ ProgramDataBaseFileName=".\fltk3images_debug\"
BrowseInformation="1"
SuppressStartupBanner="true"
DebugInformationFormat="3"
@@ -66,7 +66,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\lib\fltk_imagesd.lib"
+ OutputFile="..\..\lib\fltk3imagesd.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -88,7 +88,7 @@
<Configuration
Name="Release|Win32"
OutputDirectory="..\..\lib"
- IntermediateDirectory=".\fltk_images_release"
+ IntermediateDirectory=".\fltk3images_release"
ConfigurationType="4"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
@@ -116,10 +116,10 @@
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;FL_LIBRARY;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
- PrecompiledHeaderFile=".\fltk_images_release\fltk_images.pch"
- AssemblerListingLocation=".\fltk_images_release\"
- ObjectFile=".\fltk_images_release\"
- ProgramDataBaseFileName=".\fltk_images_release\"
+ PrecompiledHeaderFile=".\fltk3images_release\fltk3images.pch"
+ AssemblerListingLocation=".\fltk3images_release\"
+ ObjectFile=".\fltk3images_release\"
+ ProgramDataBaseFileName=".\fltk3images_release\"
BrowseInformation="1"
SuppressStartupBanner="true"
CompileAs="0"
@@ -137,7 +137,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\lib\fltk_images.lib"
+ OutputFile="..\..\lib\fltk3images.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -161,7 +161,7 @@
</References>
<Files>
<File
- RelativePath="..\..\src\Fl_BMP_Image.cxx"
+ RelativePath="..\..\src\core\Fl_BMP_Image.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -184,7 +184,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\Fl_File_Icon2.cxx"
+ RelativePath="..\..\src\core\Fl_File_Icon2.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -207,7 +207,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\Fl_GIF_Image.cxx"
+ RelativePath="..\..\src\core\Fl_GIF_Image.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -230,7 +230,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\Fl_Help_Dialog.cxx"
+ RelativePath="..\..\src\core\Fl_Help_Dialog.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -253,7 +253,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\Fl_JPEG_Image.cxx"
+ RelativePath="..\..\src\core\Fl_JPEG_Image.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -276,7 +276,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\Fl_PNG_Image.cxx"
+ RelativePath="..\..\src\core\Fl_PNG_Image.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -299,7 +299,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\Fl_PNM_Image.cxx"
+ RelativePath="..\..\src\core\Fl_PNM_Image.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -322,7 +322,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\fl_images_core.cxx"
+ RelativePath="..\..\src\core\fl_images_core.cxx"
>
<FileConfiguration
Name="Debug|Win32"
Modified: branches/branch-3.0/ide/VisualC2008/fltk3jpeg.vcproj
===================================================================
--- branches/branch-3.0/ide/VisualC2008/fltk3jpeg.vcproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2008/fltk3jpeg.vcproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -2,9 +2,9 @@
<VisualStudioProject
ProjectType="Visual C++"
Version="9,00"
- Name="fltk_jpeg"
+ Name="fltk3jpeg"
ProjectGUID="{417DB0F9-647A-4A36-ADFF-4196F7C1963D}"
- RootNamespace="fltk_jpeg"
+ RootNamespace="fltk3jpeg"
TargetFrameworkVersion="131072"
>
<Platforms>
@@ -18,7 +18,7 @@
<Configuration
Name="Debug|Win32"
OutputDirectory="..\..\lib"
- IntermediateDirectory=".\fltk_jpeg_debug"
+ IntermediateDirectory=".\fltk3jpeg_debug"
ConfigurationType="4"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
@@ -44,10 +44,10 @@
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;FL_LIBRARY;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
- PrecompiledHeaderFile=".\fltk_jpeg_debug\fltk_jpeg.pch"
- AssemblerListingLocation=".\fltk_jpeg_debug\"
- ObjectFile=".\fltk_jpeg_debug\"
- ProgramDataBaseFileName=".\fltk_jpeg_debug\"
+ PrecompiledHeaderFile=".\fltk3jpeg_debug\fltk3jpeg.pch"
+ AssemblerListingLocation=".\fltk3jpeg_debug\"
+ ObjectFile=".\fltk3jpeg_debug\"
+ ProgramDataBaseFileName=".\fltk3jpeg_debug\"
BrowseInformation="1"
SuppressStartupBanner="true"
DebugInformationFormat="3"
@@ -66,7 +66,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\lib\fltk_jpegd.lib"
+ OutputFile="..\..\lib\fltk3jpegd.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -88,7 +88,7 @@
<Configuration
Name="Release|Win32"
OutputDirectory="..\..\lib"
- IntermediateDirectory=".\fltk_jpeg_release"
+ IntermediateDirectory=".\fltk3jpeg_release"
ConfigurationType="4"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
@@ -116,10 +116,10 @@
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;FL_LIBRARY;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
- PrecompiledHeaderFile=".\fltk_jpeg_release\fltk_jpeg.pch"
- AssemblerListingLocation=".\fltk_jpeg_release\"
- ObjectFile=".\fltk_jpeg_release\"
- ProgramDataBaseFileName=".\fltk_jpeg_release\"
+ PrecompiledHeaderFile=".\fltk3jpeg_release\fltk3jpeg.pch"
+ AssemblerListingLocation=".\fltk3jpeg_release\"
+ ObjectFile=".\fltk3jpeg_release\"
+ ProgramDataBaseFileName=".\fltk3jpeg_release\"
BrowseInformation="1"
SuppressStartupBanner="true"
CompileAs="0"
@@ -137,7 +137,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\lib\fltk_jpeg.lib"
+ OutputFile="..\..\lib\fltk3jpeg.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -161,7 +161,7 @@
</References>
<Files>
<File
- RelativePath="..\..\jpeg\jaricom.c"
+ RelativePath="..\..\src\jpeg\jaricom.c"
>
<FileConfiguration
Name="Debug|Win32"
@@ -184,7 +184,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\jpeg\jcarith.c"
+ RelativePath="..\..\src\jpeg\jcarith.c"
>
<FileConfiguration
Name="Debug|Win32"
@@ -207,7 +207,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\jpeg\jdarith.c"
+ RelativePath="..\..\src\jpeg\jdarith.c"
>
<FileConfiguration
Name="Debug|Win32"
@@ -230,7 +230,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\jpeg\jcapimin.c"
+ RelativePath="..\..\src\jpeg\jcapimin.c"
>
<FileConfiguration
Name="Debug|Win32"
@@ -253,7 +253,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\jpeg\jcapistd.c"
+ RelativePath="..\..\src\jpeg\jcapistd.c"
>
<FileConfiguration
Name="Debug|Win32"
@@ -276,7 +276,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\jpeg\jccoefct.c"
+ RelativePath="..\..\src\jpeg\jccoefct.c"
>
<FileConfiguration
Name="Debug|Win32"
@@ -299,7 +299,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\jpeg\jccolor.c"
+ RelativePath="..\..\src\jpeg\jccolor.c"
>
<FileConfiguration
Name="Debug|Win32"
@@ -322,7 +322,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\jpeg\jcdctmgr.c"
+ RelativePath="..\..\src\jpeg\jcdctmgr.c"
>
<FileConfiguration
Name="Debug|Win32"
@@ -345,7 +345,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\jpeg\jchuff.c"
+ RelativePath="..\..\src\jpeg\jchuff.c"
>
<FileConfiguration
Name="Debug|Win32"
@@ -368,7 +368,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\jpeg\jcinit.c"
+ RelativePath="..\..\src\jpeg\jcinit.c"
>
<FileConfiguration
Name="Debug|Win32"
@@ -391,7 +391,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\jpeg\jcmainct.c"
+ RelativePath="..\..\src\jpeg\jcmainct.c"
>
<FileConfiguration
Name="Debug|Win32"
@@ -414,7 +414,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\jpeg\jcmarker.c"
+ RelativePath="..\..\src\jpeg\jcmarker.c"
>
<FileConfiguration
Name="Debug|Win32"
@@ -437,7 +437,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\jpeg\jcmaster.c"
+ RelativePath="..\..\src\jpeg\jcmaster.c"
>
<FileConfiguration
Name="Debug|Win32"
@@ -460,7 +460,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\jpeg\jcomapi.c"
+ RelativePath="..\..\src\jpeg\jcomapi.c"
>
<FileConfiguration
Name="Debug|Win32"
@@ -483,7 +483,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\jpeg\jcparam.c"
+ RelativePath="..\..\src\jpeg\jcparam.c"
>
<FileConfiguration
Name="Debug|Win32"
@@ -506,7 +506,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\jpeg\jcprepct.c"
+ RelativePath="..\..\src\jpeg\jcprepct.c"
>
<FileConfiguration
Name="Debug|Win32"
@@ -529,7 +529,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\jpeg\jcsample.c"
+ RelativePath="..\..\src\jpeg\jcsample.c"
>
<FileConfiguration
Name="Debug|Win32"
@@ -552,7 +552,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\jpeg\jctrans.c"
+ RelativePath="..\..\src\jpeg\jctrans.c"
>
<FileConfiguration
Name="Debug|Win32"
@@ -575,7 +575,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\jpeg\jdapimin.c"
+ RelativePath="..\..\src\jpeg\jdapimin.c"
>
<FileConfiguration
Name="Debug|Win32"
@@ -598,7 +598,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\jpeg\jdapistd.c"
+ RelativePath="..\..\src\jpeg\jdapistd.c"
>
<FileConfiguration
Name="Debug|Win32"
@@ -621,7 +621,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\jpeg\jdatadst.c"
+ RelativePath="..\..\src\jpeg\jdatadst.c"
>
<FileConfiguration
Name="Debug|Win32"
@@ -644,7 +644,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\jpeg\jdatasrc.c"
+ RelativePath="..\..\src\jpeg\jdatasrc.c"
>
<FileConfiguration
Name="Debug|Win32"
@@ -667,7 +667,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\jpeg\jdcoefct.c"
+ RelativePath="..\..\src\jpeg\jdcoefct.c"
>
<FileConfiguration
Name="Debug|Win32"
@@ -690,7 +690,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\jpeg\jdcolor.c"
+ RelativePath="..\..\src\jpeg\jdcolor.c"
>
<FileConfiguration
Name="Debug|Win32"
@@ -713,7 +713,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\jpeg\jddctmgr.c"
+ RelativePath="..\..\src\jpeg\jddctmgr.c"
>
<FileConfiguration
Name="Debug|Win32"
@@ -736,7 +736,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\jpeg\jdhuff.c"
+ RelativePath="..\..\src\jpeg\jdhuff.c"
>
<FileConfiguration
Name="Debug|Win32"
@@ -759,7 +759,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\jpeg\jdinput.c"
+ RelativePath="..\..\src\jpeg\jdinput.c"
>
<FileConfiguration
Name="Debug|Win32"
@@ -782,7 +782,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\jpeg\jdmainct.c"
+ RelativePath="..\..\src\jpeg\jdmainct.c"
>
<FileConfiguration
Name="Debug|Win32"
@@ -805,7 +805,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\jpeg\jdmarker.c"
+ RelativePath="..\..\src\jpeg\jdmarker.c"
>
<FileConfiguration
Name="Debug|Win32"
@@ -828,7 +828,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\jpeg\jdmaster.c"
+ RelativePath="..\..\src\jpeg\jdmaster.c"
>
<FileConfiguration
Name="Debug|Win32"
@@ -851,7 +851,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\jpeg\jdmerge.c"
+ RelativePath="..\..\src\jpeg\jdmerge.c"
>
<FileConfiguration
Name="Debug|Win32"
@@ -874,7 +874,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\jpeg\jdpostct.c"
+ RelativePath="..\..\src\jpeg\jdpostct.c"
>
<FileConfiguration
Name="Debug|Win32"
@@ -897,7 +897,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\jpeg\jdsample.c"
+ RelativePath="..\..\src\jpeg\jdsample.c"
>
<FileConfiguration
Name="Debug|Win32"
@@ -920,7 +920,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\jpeg\jdtrans.c"
+ RelativePath="..\..\src\jpeg\jdtrans.c"
>
<FileConfiguration
Name="Debug|Win32"
@@ -943,7 +943,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\jpeg\jerror.c"
+ RelativePath="..\..\src\jpeg\jerror.c"
>
<FileConfiguration
Name="Debug|Win32"
@@ -966,7 +966,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\jpeg\jfdctflt.c"
+ RelativePath="..\..\src\jpeg\jfdctflt.c"
>
<FileConfiguration
Name="Debug|Win32"
@@ -989,7 +989,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\jpeg\jfdctfst.c"
+ RelativePath="..\..\src\jpeg\jfdctfst.c"
>
<FileConfiguration
Name="Debug|Win32"
@@ -1012,7 +1012,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\jpeg\jfdctint.c"
+ RelativePath="..\..\src\jpeg\jfdctint.c"
>
<FileConfiguration
Name="Debug|Win32"
@@ -1035,7 +1035,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\jpeg\jidctflt.c"
+ RelativePath="..\..\src\jpeg\jidctflt.c"
>
<FileConfiguration
Name="Debug|Win32"
@@ -1058,7 +1058,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\jpeg\jidctfst.c"
+ RelativePath="..\..\src\jpeg\jidctfst.c"
>
<FileConfiguration
Name="Debug|Win32"
@@ -1081,7 +1081,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\jpeg\jidctint.c"
+ RelativePath="..\..\src\jpeg\jidctint.c"
>
<FileConfiguration
Name="Debug|Win32"
@@ -1104,7 +1104,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\jpeg\jmemmgr.c"
+ RelativePath="..\..\src\jpeg\jmemmgr.c"
>
<FileConfiguration
Name="Debug|Win32"
@@ -1127,7 +1127,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\jpeg\jmemnobs.c"
+ RelativePath="..\..\src\jpeg\jmemnobs.c"
>
<FileConfiguration
Name="Debug|Win32"
@@ -1150,7 +1150,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\jpeg\jquant1.c"
+ RelativePath="..\..\src\jpeg\jquant1.c"
>
<FileConfiguration
Name="Debug|Win32"
@@ -1173,7 +1173,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\jpeg\jquant2.c"
+ RelativePath="..\..\src\jpeg\jquant2.c"
>
<FileConfiguration
Name="Debug|Win32"
@@ -1196,7 +1196,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\jpeg\jutils.c"
+ RelativePath="..\..\src\jpeg\jutils.c"
>
<FileConfiguration
Name="Debug|Win32"
Modified: branches/branch-3.0/ide/VisualC2008/fltk3png.vcproj
===================================================================
--- branches/branch-3.0/ide/VisualC2008/fltk3png.vcproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2008/fltk3png.vcproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -2,9 +2,9 @@
<VisualStudioProject
ProjectType="Visual C++"
Version="9,00"
- Name="fltk_png"
+ Name="fltk3png"
ProjectGUID="{AF7CC2D4-BBC7-4995-B18D-6A590C267527}"
- RootNamespace="fltk_png"
+ RootNamespace="fltk3png"
TargetFrameworkVersion="131072"
>
<Platforms>
@@ -18,7 +18,7 @@
<Configuration
Name="Debug|Win32"
OutputDirectory="..\..\lib"
- IntermediateDirectory=".\fltk_png_debug"
+ IntermediateDirectory=".\fltk3png_debug"
ConfigurationType="4"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
@@ -44,10 +44,10 @@
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;FL_LIBRARY;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
- PrecompiledHeaderFile=".\fltk_png_debug\fltk_png.pch"
- AssemblerListingLocation=".\fltk_png_debug\"
- ObjectFile=".\fltk_png_debug\"
- ProgramDataBaseFileName=".\fltk_png_debug\"
+ PrecompiledHeaderFile=".\fltk3png_debug\fltk3png.pch"
+ AssemblerListingLocation=".\fltk3png_debug\"
+ ObjectFile=".\fltk3png_debug\"
+ ProgramDataBaseFileName=".\fltk3png_debug\"
BrowseInformation="1"
SuppressStartupBanner="true"
DebugInformationFormat="3"
@@ -66,7 +66,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\lib\fltk_pngd.lib"
+ OutputFile="..\..\lib\fltk3pngd.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -88,7 +88,7 @@
<Configuration
Name="Release|Win32"
OutputDirectory="..\..\lib"
- IntermediateDirectory=".\fltk_png_release"
+ IntermediateDirectory=".\fltk3png_release"
ConfigurationType="4"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
@@ -116,10 +116,10 @@
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;FL_LIBRARY;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
- PrecompiledHeaderFile=".\fltk_png_release\fltk_png.pch"
- AssemblerListingLocation=".\fltk_png_release\"
- ObjectFile=".\fltk_png_release\"
- ProgramDataBaseFileName=".\fltk_png_release\"
+ PrecompiledHeaderFile=".\fltk3png_release\fltk3png.pch"
+ AssemblerListingLocation=".\fltk3png_release\"
+ ObjectFile=".\fltk3png_release\"
+ ProgramDataBaseFileName=".\fltk3png_release\"
BrowseInformation="1"
SuppressStartupBanner="true"
CompileAs="0"
@@ -137,7 +137,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\lib\fltk_png.lib"
+ OutputFile="..\..\lib\fltk3png.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -161,7 +161,7 @@
</References>
<Files>
<File
- RelativePath="..\..\png\png.c"
+ RelativePath="..\..\src\png\png.c"
>
<FileConfiguration
Name="Debug|Win32"
@@ -184,7 +184,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\png\pngerror.c"
+ RelativePath="..\..\src\png\pngerror.c"
>
<FileConfiguration
Name="Debug|Win32"
@@ -207,7 +207,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\png\pngget.c"
+ RelativePath="..\..\src\png\pngget.c"
>
<FileConfiguration
Name="Debug|Win32"
@@ -230,7 +230,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\png\pngmem.c"
+ RelativePath="..\..\src\png\pngmem.c"
>
<FileConfiguration
Name="Debug|Win32"
@@ -253,7 +253,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\png\pngpread.c"
+ RelativePath="..\..\src\png\pngpread.c"
>
<FileConfiguration
Name="Debug|Win32"
@@ -276,7 +276,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\png\pngread.c"
+ RelativePath="..\..\src\png\pngread.c"
>
<FileConfiguration
Name="Debug|Win32"
@@ -299,7 +299,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\png\pngrio.c"
+ RelativePath="..\..\src\png\pngrio.c"
>
<FileConfiguration
Name="Debug|Win32"
@@ -322,7 +322,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\png\pngrtran.c"
+ RelativePath="..\..\src\png\pngrtran.c"
>
<FileConfiguration
Name="Debug|Win32"
@@ -345,7 +345,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\png\pngrutil.c"
+ RelativePath="..\..\src\png\pngrutil.c"
>
<FileConfiguration
Name="Debug|Win32"
@@ -368,7 +368,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\png\pngset.c"
+ RelativePath="..\..\src\png\pngset.c"
>
<FileConfiguration
Name="Debug|Win32"
@@ -391,7 +391,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\png\pngtrans.c"
+ RelativePath="..\..\src\png\pngtrans.c"
>
<FileConfiguration
Name="Debug|Win32"
@@ -414,7 +414,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\png\pngwio.c"
+ RelativePath="..\..\src\png\pngwio.c"
>
<FileConfiguration
Name="Debug|Win32"
@@ -437,7 +437,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\png\pngwrite.c"
+ RelativePath="..\..\src\png\pngwrite.c"
>
<FileConfiguration
Name="Debug|Win32"
@@ -460,7 +460,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\png\pngwtran.c"
+ RelativePath="..\..\src\png\pngwtran.c"
>
<FileConfiguration
Name="Debug|Win32"
@@ -483,7 +483,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\png\pngwutil.c"
+ RelativePath="..\..\src\png\pngwutil.c"
>
<FileConfiguration
Name="Debug|Win32"
Modified: branches/branch-3.0/ide/VisualC2008/fltk3zlib.vcproj
===================================================================
--- branches/branch-3.0/ide/VisualC2008/fltk3zlib.vcproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2008/fltk3zlib.vcproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -2,9 +2,9 @@
<VisualStudioProject
ProjectType="Visual C++"
Version="9,00"
- Name="fltk_zlib"
+ Name="fltk3zlib"
ProjectGUID="{2F487ADB-AB3A-44B1-A824-D25C00A2D30A}"
- RootNamespace="fltk_zlib"
+ RootNamespace="fltk3zlib"
TargetFrameworkVersion="131072"
>
<Platforms>
@@ -18,7 +18,7 @@
<Configuration
Name="Debug|Win32"
OutputDirectory="..\..\lib"
- IntermediateDirectory=".\fltk_zlib_debug"
+ IntermediateDirectory=".\fltk3zlib_debug"
ConfigurationType="4"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
@@ -44,10 +44,10 @@
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;FL_LIBRARY;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
- PrecompiledHeaderFile=".\fltk_zlib_debug\fltk_zlib.pch"
- AssemblerListingLocation=".\fltk_zlib_debug\"
- ObjectFile=".\fltk_zlib_debug\"
- ProgramDataBaseFileName=".\fltk_zlib_debug\"
+ PrecompiledHeaderFile=".\fltk3zlib_debug\fltk3zlib.pch"
+ AssemblerListingLocation=".\fltk3zlib_debug\"
+ ObjectFile=".\fltk3zlib_debug\"
+ ProgramDataBaseFileName=".\fltk3zlib_debug\"
BrowseInformation="1"
SuppressStartupBanner="true"
DebugInformationFormat="3"
@@ -66,7 +66,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\lib\fltk_zlibd.lib"
+ OutputFile="..\..\lib\fltk3zlibd.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -88,7 +88,7 @@
<Configuration
Name="Release|Win32"
OutputDirectory="..\..\lib"
- IntermediateDirectory=".\fltk_zlib_release"
+ IntermediateDirectory=".\fltk3zlib_release"
ConfigurationType="4"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
@@ -116,10 +116,10 @@
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;FL_LIBRARY;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
- PrecompiledHeaderFile=".\fltk_zlib_release\fltk_zlib.pch"
- AssemblerListingLocation=".\fltk_zlib_release\"
- ObjectFile=".\fltk_zlib_release\"
- ProgramDataBaseFileName=".\fltk_zlib_release\"
+ PrecompiledHeaderFile=".\fltk3zlib_release\fltk3zlib.pch"
+ AssemblerListingLocation=".\fltk3zlib_release\"
+ ObjectFile=".\fltk3zlib_release\"
+ ProgramDataBaseFileName=".\fltk3zlib_release\"
BrowseInformation="1"
SuppressStartupBanner="true"
CompileAs="0"
@@ -137,7 +137,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\lib\fltk_zlib.lib"
+ OutputFile="..\..\lib\fltk3zlib.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -161,7 +161,7 @@
</References>
<Files>
<File
- RelativePath="..\..\zlib\adler32.c"
+ RelativePath="..\..\src\zlib\adler32.c"
>
<FileConfiguration
Name="Debug|Win32"
@@ -184,7 +184,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\zlib\compress.c"
+ RelativePath="..\..\src\zlib\compress.c"
>
<FileConfiguration
Name="Debug|Win32"
@@ -207,7 +207,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\zlib\crc32.c"
+ RelativePath="..\..\src\zlib\crc32.c"
>
<FileConfiguration
Name="Debug|Win32"
@@ -230,7 +230,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\zlib\deflate.c"
+ RelativePath="..\..\src\zlib\deflate.c"
>
<FileConfiguration
Name="Debug|Win32"
@@ -253,7 +253,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\zlib\gzclose.c"
+ RelativePath="..\..\src\zlib\gzclose.c"
>
<FileConfiguration
Name="Debug|Win32"
@@ -276,7 +276,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\zlib\gzlib.c"
+ RelativePath="..\..\src\zlib\gzlib.c"
>
<FileConfiguration
Name="Debug|Win32"
@@ -299,7 +299,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\zlib\gzread.c"
+ RelativePath="..\..\src\zlib\gzread.c"
>
<FileConfiguration
Name="Debug|Win32"
@@ -322,7 +322,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\zlib\gzwrite.c"
+ RelativePath="..\..\src\zlib\gzwrite.c"
>
<FileConfiguration
Name="Debug|Win32"
@@ -345,7 +345,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\zlib\infback.c"
+ RelativePath="..\..\src\zlib\infback.c"
>
<FileConfiguration
Name="Debug|Win32"
@@ -368,7 +368,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\zlib\inffast.c"
+ RelativePath="..\..\src\zlib\inffast.c"
>
<FileConfiguration
Name="Debug|Win32"
@@ -391,7 +391,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\zlib\inflate.c"
+ RelativePath="..\..\src\zlib\inflate.c"
>
<FileConfiguration
Name="Debug|Win32"
@@ -414,7 +414,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\zlib\inftrees.c"
+ RelativePath="..\..\src\zlib\inftrees.c"
>
<FileConfiguration
Name="Debug|Win32"
@@ -437,7 +437,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\zlib\trees.c"
+ RelativePath="..\..\src\zlib\trees.c"
>
<FileConfiguration
Name="Debug|Win32"
@@ -460,7 +460,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\zlib\uncompr.c"
+ RelativePath="..\..\src\zlib\uncompr.c"
>
<FileConfiguration
Name="Debug|Win32"
@@ -483,7 +483,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\zlib\zutil.c"
+ RelativePath="..\..\src\zlib\zutil.c"
>
<FileConfiguration
Name="Debug|Win32"
Modified: branches/branch-3.0/ide/VisualC2008/fluid.vcproj
===================================================================
--- branches/branch-3.0/ide/VisualC2008/fluid.vcproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2008/fluid.vcproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltkd.lib fltk_imagesd.lib fltk_pngd.lib fltk_jpegd.lib fltk_zlibd.lib comctl32.lib"
+ AdditionalDependencies="fltk3d.lib fltk3imagesd.lib fltk3pngd.lib fltk3jpegd.lib fltk3zlibd.lib comctl32.lib"
OutputFile="..\..\fluid\Fluidd.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
@@ -161,7 +161,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltk.lib fltk_images.lib fltk_png.lib fltk_jpeg.lib fltk_zlib.lib comctl32.lib"
+ AdditionalDependencies="fltk3.lib fltk3images.lib fltk3png.lib fltk3jpeg.lib fltk3zlib.lib comctl32.lib"
OutputFile="..\..\fluid\Fluid.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
Modified: branches/branch-3.0/ide/VisualC2008/fonts.vcproj
===================================================================
--- branches/branch-3.0/ide/VisualC2008/fonts.vcproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2008/fonts.vcproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltkd.lib comctl32.lib"
+ AdditionalDependencies="fltk3d.lib comctl32.lib"
OutputFile="..\..\test\fontsd.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
@@ -161,7 +161,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltk.lib comctl32.lib"
+ AdditionalDependencies="fltk3.lib comctl32.lib"
OutputFile="..\..\test\fonts.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
Modified: branches/branch-3.0/ide/VisualC2008/fractals.vcproj
===================================================================
--- branches/branch-3.0/ide/VisualC2008/fractals.vcproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2008/fractals.vcproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltkd.lib fltk_gld.lib glu32.lib opengl32.lib comctl32.lib"
+ AdditionalDependencies="fltk3gld.lib fltk3d.lib glu32.lib opengl32.lib comctl32.lib"
OutputFile="..\..\test\fractalsd.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
@@ -161,7 +161,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltk.lib fltk_gl.lib glu32.lib opengl32.lib comctl32.lib"
+ AdditionalDependencies="fltk3gl.lib fltk3.lib glu32.lib opengl32.lib comctl32.lib"
OutputFile="..\..\test\fractals.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
Modified: branches/branch-3.0/ide/VisualC2008/fullscreen.vcproj
===================================================================
--- branches/branch-3.0/ide/VisualC2008/fullscreen.vcproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2008/fullscreen.vcproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltkd.lib fltk_gld.lib glu32.lib opengl32.lib comctl32.lib"
+ AdditionalDependencies="fltk3d.lib fltk3gld.lib glu32.lib opengl32.lib comctl32.lib"
OutputFile="..\..\test\fullscreend.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
@@ -161,7 +161,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltk.lib fltk_gl.lib glu32.lib opengl32.lib comctl32.lib"
+ AdditionalDependencies="fltk3.lib fltk3gl.lib glu32.lib opengl32.lib comctl32.lib"
OutputFile="..\..\test\fullscreen.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
Modified: branches/branch-3.0/ide/VisualC2008/gl_overlay.vcproj
===================================================================
--- branches/branch-3.0/ide/VisualC2008/gl_overlay.vcproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2008/gl_overlay.vcproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltkd.lib fltk_gld.lib glu32.lib opengl32.lib comctl32.lib"
+ AdditionalDependencies="fltk3d.lib fltk3gld.lib glu32.lib opengl32.lib comctl32.lib"
OutputFile="..\..\test\gl_overlayd.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
@@ -161,7 +161,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltk.lib fltk_gl.lib glu32.lib opengl32.lib comctl32.lib"
+ AdditionalDependencies="fltk3.lib fltk3gl.lib glu32.lib opengl32.lib comctl32.lib"
OutputFile="..\..\test\gl_overlay.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
Modified: branches/branch-3.0/ide/VisualC2008/glpuzzle.vcproj
===================================================================
--- branches/branch-3.0/ide/VisualC2008/glpuzzle.vcproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2008/glpuzzle.vcproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltkd.lib fltk_gld.lib glu32.lib opengl32.lib comctl32.lib"
+ AdditionalDependencies="fltk3gld.lib fltk3d.lib glu32.lib opengl32.lib comctl32.lib"
OutputFile="..\..\test\glpuzzled.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
@@ -161,7 +161,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltk.lib fltk_gl.lib glu32.lib opengl32.lib comctl32.lib"
+ AdditionalDependencies="fltk3gl.lib fltk3.lib glu32.lib opengl32.lib comctl32.lib"
OutputFile="..\..\test\glpuzzle.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
Modified: branches/branch-3.0/ide/VisualC2008/hello.vcproj
===================================================================
--- branches/branch-3.0/ide/VisualC2008/hello.vcproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2008/hello.vcproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltkd.lib comctl32.lib"
+ AdditionalDependencies="fltk3d.lib comctl32.lib"
OutputFile="..\..\test\hellod.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
@@ -161,7 +161,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltk.lib comctl32.lib"
+ AdditionalDependencies="fltk3.lib comctl32.lib"
OutputFile="..\..\test\hello.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
Modified: branches/branch-3.0/ide/VisualC2008/help.vcproj
===================================================================
--- branches/branch-3.0/ide/VisualC2008/help.vcproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2008/help.vcproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltkd.lib fltk_imagesd.lib fltk_pngd.lib fltk_jpegd.lib fltk_zlibd.lib comctl32.lib"
+ AdditionalDependencies="fltk3imagesd.lib fltk3d.lib fltk3pngd.lib fltk3jpegd.lib fltk3zlibd.lib comctl32.lib"
OutputFile="..\..\test\helpd.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
@@ -161,7 +161,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltk.lib fltk_images.lib fltk_png.lib fltk_jpeg.lib fltk_zlib.lib comctl32.lib"
+ AdditionalDependencies="fltk3images.lib fltk3.lib fltk3png.lib fltk3jpeg.lib fltk3zlib.lib comctl32.lib"
OutputFile="..\..\test\help.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
Modified: branches/branch-3.0/ide/VisualC2008/iconize.vcproj
===================================================================
--- branches/branch-3.0/ide/VisualC2008/iconize.vcproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2008/iconize.vcproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltkd.lib comctl32.lib"
+ AdditionalDependencies="fltk3d.lib comctl32.lib"
OutputFile="..\..\test\iconized.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
@@ -161,7 +161,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltk.lib comctl32.lib"
+ AdditionalDependencies="fltk3.lib comctl32.lib"
OutputFile="..\..\test\iconize.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
Modified: branches/branch-3.0/ide/VisualC2008/image.vcproj
===================================================================
--- branches/branch-3.0/ide/VisualC2008/image.vcproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2008/image.vcproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltkd.lib comctl32.lib"
+ AdditionalDependencies="fltk3d.lib comctl32.lib"
OutputFile="..\..\test\imaged.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
@@ -161,7 +161,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltk.lib comctl32.lib"
+ AdditionalDependencies="fltk3.lib comctl32.lib"
OutputFile="..\..\test\image.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
Modified: branches/branch-3.0/ide/VisualC2008/inactive.vcproj
===================================================================
--- branches/branch-3.0/ide/VisualC2008/inactive.vcproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2008/inactive.vcproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltkd.lib comctl32.lib"
+ AdditionalDependencies="fltk3d.lib comctl32.lib"
OutputFile="..\..\test\inactived.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
@@ -161,7 +161,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltk.lib comctl32.lib"
+ AdditionalDependencies="fltk3.lib comctl32.lib"
OutputFile="..\..\test\inactive.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
Modified: branches/branch-3.0/ide/VisualC2008/input.vcproj
===================================================================
--- branches/branch-3.0/ide/VisualC2008/input.vcproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2008/input.vcproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltkd.lib comctl32.lib"
+ AdditionalDependencies="fltk3d.lib comctl32.lib"
OutputFile="..\..\test\inputd.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
@@ -161,7 +161,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltk.lib comctl32.lib"
+ AdditionalDependencies="fltk3.lib comctl32.lib"
OutputFile="..\..\test\input.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
Modified: branches/branch-3.0/ide/VisualC2008/input_choice.vcproj
===================================================================
--- branches/branch-3.0/ide/VisualC2008/input_choice.vcproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2008/input_choice.vcproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltkd.lib comctl32.lib"
+ AdditionalDependencies="fltk3d.lib comctl32.lib"
OutputFile="..\..\test\input_choiced.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
@@ -161,7 +161,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltk.lib comctl32.lib"
+ AdditionalDependencies="fltk3.lib comctl32.lib"
OutputFile="..\..\test\input_choice.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
Modified: branches/branch-3.0/ide/VisualC2008/keyboard.vcproj
===================================================================
--- branches/branch-3.0/ide/VisualC2008/keyboard.vcproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2008/keyboard.vcproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltkd.lib comctl32.lib"
+ AdditionalDependencies="fltk3d.lib comctl32.lib"
OutputFile="..\..\test\keyboardd.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
@@ -161,7 +161,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltk.lib comctl32.lib"
+ AdditionalDependencies="fltk3.lib comctl32.lib"
OutputFile="..\..\test\keyboard.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
Modified: branches/branch-3.0/ide/VisualC2008/label.vcproj
===================================================================
--- branches/branch-3.0/ide/VisualC2008/label.vcproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2008/label.vcproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltkd.lib comctl32.lib"
+ AdditionalDependencies="fltk3d.lib comctl32.lib"
OutputFile="..\..\test\labeld.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
@@ -161,7 +161,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltk.lib comctl32.lib"
+ AdditionalDependencies="fltk3.lib comctl32.lib"
OutputFile="..\..\test\label.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
Modified: branches/branch-3.0/ide/VisualC2008/line_style.vcproj
===================================================================
--- branches/branch-3.0/ide/VisualC2008/line_style.vcproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2008/line_style.vcproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltkd.lib comctl32.lib"
+ AdditionalDependencies="fltk3d.lib comctl32.lib"
OutputFile="..\..\test\line_styled.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
@@ -161,7 +161,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltk.lib comctl32.lib"
+ AdditionalDependencies="fltk3.lib comctl32.lib"
OutputFile="..\..\test\line_style.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
Modified: branches/branch-3.0/ide/VisualC2008/list_visuals.vcproj
===================================================================
--- branches/branch-3.0/ide/VisualC2008/list_visuals.vcproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2008/list_visuals.vcproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltkd.lib comctl32.lib"
+ AdditionalDependencies="fltk3d.lib comctl32.lib"
OutputFile="..\..\test\list_visualsd.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
@@ -161,7 +161,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltk.lib comctl32.lib"
+ AdditionalDependencies="fltk3.lib comctl32.lib"
OutputFile="..\..\test\list_visuals.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
Modified: branches/branch-3.0/ide/VisualC2008/mandelbrot.vcproj
===================================================================
--- branches/branch-3.0/ide/VisualC2008/mandelbrot.vcproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2008/mandelbrot.vcproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltkd.lib comctl32.lib"
+ AdditionalDependencies="fltk3d.lib comctl32.lib"
OutputFile="..\..\test\mandelbrotd.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
@@ -161,7 +161,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltk.lib comctl32.lib"
+ AdditionalDependencies="fltk3.lib comctl32.lib"
OutputFile="..\..\test\mandelbrot.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
Modified: branches/branch-3.0/ide/VisualC2008/menubar.vcproj
===================================================================
--- branches/branch-3.0/ide/VisualC2008/menubar.vcproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2008/menubar.vcproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltkd.lib comctl32.lib"
+ AdditionalDependencies="fltk3d.lib comctl32.lib"
OutputFile="..\..\test\menubard.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
@@ -161,7 +161,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltk.lib comctl32.lib"
+ AdditionalDependencies="fltk3.lib comctl32.lib"
OutputFile="..\..\test\menubar.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
Modified: branches/branch-3.0/ide/VisualC2008/message.vcproj
===================================================================
--- branches/branch-3.0/ide/VisualC2008/message.vcproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2008/message.vcproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltkd.lib comctl32.lib"
+ AdditionalDependencies="fltk3d.lib comctl32.lib"
OutputFile="..\..\test\messaged.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
@@ -161,7 +161,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltk.lib comctl32.lib"
+ AdditionalDependencies="fltk3.lib comctl32.lib"
OutputFile="..\..\test\message.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
Modified: branches/branch-3.0/ide/VisualC2008/minimum.vcproj
===================================================================
--- branches/branch-3.0/ide/VisualC2008/minimum.vcproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2008/minimum.vcproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltkd.lib comctl32.lib"
+ AdditionalDependencies="fltk3d.lib comctl32.lib"
OutputFile="..\..\test\minimumd.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
@@ -161,7 +161,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltk.lib comctl32.lib"
+ AdditionalDependencies="fltk3.lib comctl32.lib"
OutputFile="..\..\test\minimum.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
Modified: branches/branch-3.0/ide/VisualC2008/native-filechooser.vcproj
===================================================================
--- branches/branch-3.0/ide/VisualC2008/native-filechooser.vcproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2008/native-filechooser.vcproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltkd.lib comctl32.lib"
+ AdditionalDependencies="fltk3imagesd.lib fltk3d.lib fltk3pngd.lib fltk3jpegd.lib fltk3zlibd.lib comctl32.lib"
OutputFile="..\..\test\native-filechooserd.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
@@ -161,7 +161,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltk.lib comctl32.lib"
+ AdditionalDependencies="fltk3images.lib fltk3.lib fltk3png.lib fltk3jpeg.lib fltk3zlib.lib comctl32.lib"
OutputFile="..\..\test\native-filechooser.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
Modified: branches/branch-3.0/ide/VisualC2008/navigation.vcproj
===================================================================
--- branches/branch-3.0/ide/VisualC2008/navigation.vcproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2008/navigation.vcproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltkd.lib comctl32.lib"
+ AdditionalDependencies="fltk3d.lib comctl32.lib"
OutputFile="..\..\test\navigationd.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
@@ -161,7 +161,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltk.lib comctl32.lib"
+ AdditionalDependencies="fltk3.lib comctl32.lib"
OutputFile="..\..\test\navigation.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
Modified: branches/branch-3.0/ide/VisualC2008/output.vcproj
===================================================================
--- branches/branch-3.0/ide/VisualC2008/output.vcproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2008/output.vcproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltkd.lib comctl32.lib"
+ AdditionalDependencies="fltk3d.lib comctl32.lib"
OutputFile="..\..\test\outputd.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
@@ -161,7 +161,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltk.lib comctl32.lib"
+ AdditionalDependencies="fltk3.lib comctl32.lib"
OutputFile="..\..\test\output.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
Modified: branches/branch-3.0/ide/VisualC2008/overlay.vcproj
===================================================================
--- branches/branch-3.0/ide/VisualC2008/overlay.vcproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2008/overlay.vcproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltkd.lib comctl32.lib"
+ AdditionalDependencies="fltk3d.lib comctl32.lib"
OutputFile="..\..\test\overlayd.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
@@ -161,7 +161,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltk.lib comctl32.lib"
+ AdditionalDependencies="fltk3.lib comctl32.lib"
OutputFile="..\..\test\overlay.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
Modified: branches/branch-3.0/ide/VisualC2008/pack.vcproj
===================================================================
--- branches/branch-3.0/ide/VisualC2008/pack.vcproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2008/pack.vcproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltkd.lib comctl32.lib"
+ AdditionalDependencies="fltk3d.lib comctl32.lib"
OutputFile="..\..\test\packd.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
@@ -161,7 +161,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltk.lib comctl32.lib"
+ AdditionalDependencies="fltk3.lib comctl32.lib"
OutputFile="..\..\test\pack.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
Modified: branches/branch-3.0/ide/VisualC2008/pixmap.vcproj
===================================================================
--- branches/branch-3.0/ide/VisualC2008/pixmap.vcproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2008/pixmap.vcproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltkd.lib comctl32.lib"
+ AdditionalDependencies="fltk3d.lib comctl32.lib"
OutputFile="..\..\test\pixmapd.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
@@ -161,7 +161,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltk.lib comctl32.lib"
+ AdditionalDependencies="fltk3.lib comctl32.lib"
OutputFile="..\..\test\pixmap.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
Modified: branches/branch-3.0/ide/VisualC2008/pixmap_browser.vcproj
===================================================================
--- branches/branch-3.0/ide/VisualC2008/pixmap_browser.vcproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2008/pixmap_browser.vcproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltkd.lib fltk_imagesd.lib fltk_pngd.lib fltk_jpegd.lib fltk_zlibd.lib comctl32.lib"
+ AdditionalDependencies="fltk3d.lib fltk3imagesd.lib fltk3pngd.lib fltk3jpegd.lib fltk3zlibd.lib comctl32.lib"
OutputFile="..\..\test\pixmap_browserd.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
@@ -161,7 +161,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltk.lib fltk_images.lib fltk_png.lib fltk_jpeg.lib fltk_zlib.lib comctl32.lib"
+ AdditionalDependencies="fltk3.lib fltk3images.lib fltk3png.lib fltk3jpeg.lib fltk3zlib.lib comctl32.lib"
OutputFile="..\..\test\pixmap_browser.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
Modified: branches/branch-3.0/ide/VisualC2008/preferences.vcproj
===================================================================
--- branches/branch-3.0/ide/VisualC2008/preferences.vcproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2008/preferences.vcproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltkd.lib comctl32.lib"
+ AdditionalDependencies="fltk3d.lib comctl32.lib"
OutputFile="..\..\test\preferencesd.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
@@ -161,7 +161,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltk.lib comctl32.lib"
+ AdditionalDependencies="fltk3.lib comctl32.lib"
OutputFile="..\..\test\preferences.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
Modified: branches/branch-3.0/ide/VisualC2008/radio.vcproj
===================================================================
--- branches/branch-3.0/ide/VisualC2008/radio.vcproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2008/radio.vcproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltkd.lib comctl32.lib"
+ AdditionalDependencies="fltk3d.lib comctl32.lib"
OutputFile="..\..\test\radiod.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
@@ -161,7 +161,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltk.lib comctl32.lib"
+ AdditionalDependencies="fltk3.lib comctl32.lib"
OutputFile="..\..\test\radio.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
Modified: branches/branch-3.0/ide/VisualC2008/resize.vcproj
===================================================================
--- branches/branch-3.0/ide/VisualC2008/resize.vcproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2008/resize.vcproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltkd.lib comctl32.lib"
+ AdditionalDependencies="fltk3d.lib comctl32.lib"
OutputFile="..\..\test\resized.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
@@ -161,7 +161,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltk.lib comctl32.lib"
+ AdditionalDependencies="fltk3.lib comctl32.lib"
OutputFile="..\..\test\resize.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
Modified: branches/branch-3.0/ide/VisualC2008/resizebox.vcproj
===================================================================
--- branches/branch-3.0/ide/VisualC2008/resizebox.vcproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2008/resizebox.vcproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltkd.lib comctl32.lib"
+ AdditionalDependencies="fltk3d.lib comctl32.lib"
OutputFile="..\..\test\resizeboxd.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
@@ -161,7 +161,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltk.lib comctl32.lib"
+ AdditionalDependencies="fltk3.lib comctl32.lib"
OutputFile="..\..\test\resizebox.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
Modified: branches/branch-3.0/ide/VisualC2008/rotated_text.vcproj
===================================================================
--- branches/branch-3.0/ide/VisualC2008/rotated_text.vcproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2008/rotated_text.vcproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltkd.lib comctl32.lib"
+ AdditionalDependencies="fltk3d.lib comctl32.lib"
OutputFile="..\..\test\rotated_textd.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
@@ -161,7 +161,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltk.lib comctl32.lib"
+ AdditionalDependencies="fltk3.lib comctl32.lib"
OutputFile="..\..\test\rotated_text.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
Modified: branches/branch-3.0/ide/VisualC2008/scroll.vcproj
===================================================================
--- branches/branch-3.0/ide/VisualC2008/scroll.vcproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2008/scroll.vcproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltkd.lib comctl32.lib"
+ AdditionalDependencies="fltk3d.lib comctl32.lib"
OutputFile="..\..\test\scrolld.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
@@ -161,7 +161,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltk.lib comctl32.lib"
+ AdditionalDependencies="fltk3.lib comctl32.lib"
OutputFile="..\..\test\scroll.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
Modified: branches/branch-3.0/ide/VisualC2008/shape.vcproj
===================================================================
--- branches/branch-3.0/ide/VisualC2008/shape.vcproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2008/shape.vcproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltkd.lib fltk_gld.lib glu32.lib opengl32.lib comctl32.lib"
+ AdditionalDependencies="fltk3d.lib fltk3gld.lib glu32.lib opengl32.lib comctl32.lib"
OutputFile="..\..\test\shaped.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
@@ -161,7 +161,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltk.lib fltk_gl.lib glu32.lib opengl32.lib comctl32.lib"
+ AdditionalDependencies="fltk3.lib fltk3gl.lib glu32.lib opengl32.lib comctl32.lib"
OutputFile="..\..\test\shape.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
Modified: branches/branch-3.0/ide/VisualC2008/subwindow.vcproj
===================================================================
--- branches/branch-3.0/ide/VisualC2008/subwindow.vcproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2008/subwindow.vcproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltkd.lib comctl32.lib"
+ AdditionalDependencies="fltk3d.lib comctl32.lib"
OutputFile="..\..\test\subwindowd.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
@@ -161,7 +161,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltk.lib comctl32.lib"
+ AdditionalDependencies="fltk3.lib comctl32.lib"
OutputFile="..\..\test\subwindow.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
Modified: branches/branch-3.0/ide/VisualC2008/sudoku.vcproj
===================================================================
--- branches/branch-3.0/ide/VisualC2008/sudoku.vcproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2008/sudoku.vcproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltkd.lib fltk_imagesd.lib fltk_pngd.lib fltk_jpegd.lib fltk_zlibd.lib winmm.lib comctl32.lib"
+ AdditionalDependencies="fltk3imagesd.lib fltk3d.lib fltk3pngd.lib fltk3jpegd.lib fltk3zlibd.lib winmm.lib comctl32.lib"
OutputFile="..\..\test\sudokud.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
@@ -161,7 +161,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltk.lib fltk_images.lib fltk_png.lib fltk_jpeg.lib fltk_zlib.lib winmm.lib comctl32.lib"
+ AdditionalDependencies="fltk3images.lib fltk3.lib fltk3png.lib fltk3jpeg.lib fltk3zlib.lib winmm.lib comctl32.lib"
OutputFile="..\..\test\sudoku.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
Modified: branches/branch-3.0/ide/VisualC2008/symbols.vcproj
===================================================================
--- branches/branch-3.0/ide/VisualC2008/symbols.vcproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2008/symbols.vcproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltkd.lib comctl32.lib"
+ AdditionalDependencies="fltk3d.lib comctl32.lib"
OutputFile="..\..\test\symbolsd.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
@@ -161,7 +161,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltk.lib comctl32.lib"
+ AdditionalDependencies="fltk3.lib comctl32.lib"
OutputFile="..\..\test\symbols.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
Modified: branches/branch-3.0/ide/VisualC2008/table.vcproj
===================================================================
--- branches/branch-3.0/ide/VisualC2008/table.vcproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2008/table.vcproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltkd.lib comctl32.lib"
+ AdditionalDependencies="fltk3d.lib comctl32.lib"
OutputFile="..\..\test\tabled.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
@@ -161,7 +161,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltk.lib comctl32.lib"
+ AdditionalDependencies="fltk3.lib comctl32.lib"
OutputFile="..\..\test\table.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
Modified: branches/branch-3.0/ide/VisualC2008/tabs.vcproj
===================================================================
--- branches/branch-3.0/ide/VisualC2008/tabs.vcproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2008/tabs.vcproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltkd.lib comctl32.lib"
+ AdditionalDependencies="fltk3d.lib comctl32.lib"
OutputFile="..\..\test\tabsd.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
@@ -161,7 +161,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltk.lib comctl32.lib"
+ AdditionalDependencies="fltk3.lib comctl32.lib"
OutputFile="..\..\test\tabs.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
Modified: branches/branch-3.0/ide/VisualC2008/threads.vcproj
===================================================================
--- branches/branch-3.0/ide/VisualC2008/threads.vcproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2008/threads.vcproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltkd.lib comctl32.lib"
+ AdditionalDependencies="fltk3d.lib comctl32.lib"
OutputFile="..\..\test\threadsd.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
@@ -161,7 +161,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltk.lib comctl32.lib"
+ AdditionalDependencies="fltk3.lib comctl32.lib"
OutputFile="..\..\test\threads.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
Modified: branches/branch-3.0/ide/VisualC2008/tile.vcproj
===================================================================
--- branches/branch-3.0/ide/VisualC2008/tile.vcproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2008/tile.vcproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltkd.lib comctl32.lib"
+ AdditionalDependencies="fltk3d.lib comctl32.lib"
OutputFile="..\..\test\tiled.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
@@ -161,7 +161,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltk.lib comctl32.lib"
+ AdditionalDependencies="fltk3.lib comctl32.lib"
OutputFile="..\..\test\tile.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
Modified: branches/branch-3.0/ide/VisualC2008/tiled_image.vcproj
===================================================================
--- branches/branch-3.0/ide/VisualC2008/tiled_image.vcproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2008/tiled_image.vcproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltkd.lib fltk_imagesd.lib fltk_pngd.lib fltk_jpegd.lib fltk_zlibd.lib comctl32.lib"
+ AdditionalDependencies="fltk3d.lib fltk3imagesd.lib fltk3pngd.lib fltk3jpegd.lib fltk3zlibd.lib comctl32.lib"
OutputFile="..\..\test\tiled_imaged.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
@@ -161,7 +161,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltk.lib fltk_images.lib fltk_png.lib fltk_jpeg.lib fltk_zlib.lib comctl32.lib"
+ AdditionalDependencies="fltk3.lib fltk3images.lib fltk3png.lib fltk3jpeg.lib fltk3zlib.lib comctl32.lib"
OutputFile="..\..\test\tiled_image.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
Modified: branches/branch-3.0/ide/VisualC2008/tree.vcproj
===================================================================
--- branches/branch-3.0/ide/VisualC2008/tree.vcproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2008/tree.vcproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltkd.lib comctl32.lib"
+ AdditionalDependencies="fltk3d.lib comctl32.lib"
OutputFile="..\..\test\treed.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
@@ -161,7 +161,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltk.lib comctl32.lib"
+ AdditionalDependencies="fltk3.lib comctl32.lib"
OutputFile="..\..\test\tree.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
Modified: branches/branch-3.0/ide/VisualC2008/unittests.vcproj
===================================================================
--- branches/branch-3.0/ide/VisualC2008/unittests.vcproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2008/unittests.vcproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltkd.lib comctl32.lib"
+ AdditionalDependencies="fltk3d.lib comctl32.lib"
OutputFile="..\..\test\unittestsd.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
@@ -161,7 +161,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltk.lib comctl32.lib"
+ AdditionalDependencies="fltk3.lib comctl32.lib"
OutputFile="..\..\test\unittests.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
Modified: branches/branch-3.0/ide/VisualC2008/utf8.vcproj
===================================================================
--- branches/branch-3.0/ide/VisualC2008/utf8.vcproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2008/utf8.vcproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltkd.lib comctl32.lib"
+ AdditionalDependencies="fltk3d.lib comctl32.lib"
OutputFile="..\..\test\utf8d.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
@@ -161,7 +161,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltk.lib comctl32.lib"
+ AdditionalDependencies="fltk3.lib comctl32.lib"
OutputFile="..\..\test\utf8.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
Modified: branches/branch-3.0/ide/VisualC2008/valuators.vcproj
===================================================================
--- branches/branch-3.0/ide/VisualC2008/valuators.vcproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2008/valuators.vcproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltkd.lib comctl32.lib"
+ AdditionalDependencies="fltk3d.lib comctl32.lib"
OutputFile="..\..\test\valuatorsd.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
@@ -161,7 +161,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltk.lib comctl32.lib"
+ AdditionalDependencies="fltk3.lib comctl32.lib"
OutputFile="..\..\test\valuators.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
Modified: branches/branch-3.0/ide/VisualC2010/CubeView.vcxproj
===================================================================
--- branches/branch-3.0/ide/VisualC2010/CubeView.vcxproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2010/CubeView.vcxproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltkd.lib;fltk_gld.lib;glu32.lib;opengl32.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3d.lib;fltk3gld.lib;glu32.lib;opengl32.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\CubeViewd.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -114,7 +114,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltk.lib;fltk_gl.lib;glu32.lib;opengl32.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3.lib;fltk3gl.lib;glu32.lib;opengl32.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\CubeView.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -163,11 +163,11 @@
</CustomBuild>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="fltk.vcxproj">
+ <ProjectReference Include="fltk3.vcxproj">
<Project>{E070AAFC-9D03-41A3-BC7D-30887EA0D50F}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
- <ProjectReference Include="fltk_gl.vcxproj">
+ <ProjectReference Include="fltk3gl.vcxproj">
<Project>{42E7DB4F-8A12-431D-B651-4FADDD74F327}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
Modified: branches/branch-3.0/ide/VisualC2010/adjuster.vcxproj
===================================================================
--- branches/branch-3.0/ide/VisualC2010/adjuster.vcxproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2010/adjuster.vcxproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltkd.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3d.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\adjusterd.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -114,7 +114,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltk.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\adjuster.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -137,7 +137,7 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="fltk.vcxproj">
+ <ProjectReference Include="fltk3.vcxproj">
<Project>{E070AAFC-9D03-41A3-BC7D-30887EA0D50F}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
Modified: branches/branch-3.0/ide/VisualC2010/arc.vcxproj
===================================================================
--- branches/branch-3.0/ide/VisualC2010/arc.vcxproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2010/arc.vcxproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltkd.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3d.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\arcd.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -114,7 +114,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltk.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\arc.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -137,7 +137,7 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="fltk.vcxproj">
+ <ProjectReference Include="fltk3.vcxproj">
<Project>{E070AAFC-9D03-41A3-BC7D-30887EA0D50F}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
Modified: branches/branch-3.0/ide/VisualC2010/ask.vcxproj
===================================================================
--- branches/branch-3.0/ide/VisualC2010/ask.vcxproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2010/ask.vcxproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltkd.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3d.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\askd.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -114,7 +114,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltk.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\ask.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -137,7 +137,7 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="fltk.vcxproj">
+ <ProjectReference Include="fltk3.vcxproj">
<Project>{E070AAFC-9D03-41A3-BC7D-30887EA0D50F}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
Modified: branches/branch-3.0/ide/VisualC2010/bitmap.vcxproj
===================================================================
--- branches/branch-3.0/ide/VisualC2010/bitmap.vcxproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2010/bitmap.vcxproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltkd.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3d.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\bitmapd.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -114,7 +114,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltk.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\bitmap.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -137,7 +137,7 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="fltk.vcxproj">
+ <ProjectReference Include="fltk3.vcxproj">
<Project>{E070AAFC-9D03-41A3-BC7D-30887EA0D50F}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
Modified: branches/branch-3.0/ide/VisualC2010/blocks.vcxproj
===================================================================
--- branches/branch-3.0/ide/VisualC2010/blocks.vcxproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2010/blocks.vcxproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltkd.lib;winmm.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3d.lib;winmm.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\blocksd.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -114,7 +114,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltk.lib;winmm.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3.lib;winmm.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\blocks.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -137,7 +137,7 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="fltk.vcxproj">
+ <ProjectReference Include="fltk3.vcxproj">
<Project>{E070AAFC-9D03-41A3-BC7D-30887EA0D50F}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
Modified: branches/branch-3.0/ide/VisualC2010/boxtype.vcxproj
===================================================================
--- branches/branch-3.0/ide/VisualC2010/boxtype.vcxproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2010/boxtype.vcxproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltkd.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3d.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\boxtyped.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -114,7 +114,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltk.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\boxtype.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -137,7 +137,7 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="fltk.vcxproj">
+ <ProjectReference Include="fltk3.vcxproj">
<Project>{E070AAFC-9D03-41A3-BC7D-30887EA0D50F}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
Modified: branches/branch-3.0/ide/VisualC2010/browser.vcxproj
===================================================================
--- branches/branch-3.0/ide/VisualC2010/browser.vcxproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2010/browser.vcxproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltkd.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3d.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\browserd.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -114,7 +114,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltk.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\browser.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -137,7 +137,7 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="fltk.vcxproj">
+ <ProjectReference Include="fltk3.vcxproj">
<Project>{E070AAFC-9D03-41A3-BC7D-30887EA0D50F}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
Modified: branches/branch-3.0/ide/VisualC2010/button.vcxproj
===================================================================
--- branches/branch-3.0/ide/VisualC2010/button.vcxproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2010/button.vcxproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltkd.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3d.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\buttond.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -114,7 +114,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltk.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\button.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -137,7 +137,7 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="fltk.vcxproj">
+ <ProjectReference Include="fltk3.vcxproj">
<Project>{E070AAFC-9D03-41A3-BC7D-30887EA0D50F}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
Modified: branches/branch-3.0/ide/VisualC2010/buttons.vcxproj
===================================================================
--- branches/branch-3.0/ide/VisualC2010/buttons.vcxproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2010/buttons.vcxproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltkd.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3d.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\buttonsd.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -114,7 +114,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltk.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\buttons.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -137,7 +137,7 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="fltk.vcxproj">
+ <ProjectReference Include="fltk3.vcxproj">
<Project>{E070AAFC-9D03-41A3-BC7D-30887EA0D50F}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
Modified: branches/branch-3.0/ide/VisualC2010/checkers.vcxproj
===================================================================
--- branches/branch-3.0/ide/VisualC2010/checkers.vcxproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2010/checkers.vcxproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltkd.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3d.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\checkersd.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -114,7 +114,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltk.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\checkers.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -137,7 +137,7 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="fltk.vcxproj">
+ <ProjectReference Include="fltk3.vcxproj">
<Project>{E070AAFC-9D03-41A3-BC7D-30887EA0D50F}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
Modified: branches/branch-3.0/ide/VisualC2010/clock.vcxproj
===================================================================
--- branches/branch-3.0/ide/VisualC2010/clock.vcxproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2010/clock.vcxproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltkd.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3d.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\clockd.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -114,7 +114,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltk.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\clock.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -137,7 +137,7 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="fltk.vcxproj">
+ <ProjectReference Include="fltk3.vcxproj">
<Project>{E070AAFC-9D03-41A3-BC7D-30887EA0D50F}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
Modified: branches/branch-3.0/ide/VisualC2010/colbrowser.vcxproj
===================================================================
--- branches/branch-3.0/ide/VisualC2010/colbrowser.vcxproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2010/colbrowser.vcxproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltkd.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3d.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\colbrowserd.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -114,7 +114,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltk.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\colbrowser.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -137,7 +137,7 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="fltk.vcxproj">
+ <ProjectReference Include="fltk3.vcxproj">
<Project>{E070AAFC-9D03-41A3-BC7D-30887EA0D50F}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
Modified: branches/branch-3.0/ide/VisualC2010/color_chooser.vcxproj
===================================================================
--- branches/branch-3.0/ide/VisualC2010/color_chooser.vcxproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2010/color_chooser.vcxproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltkd.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3d.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\color_chooserd.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -114,7 +114,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltk.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\color_chooser.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -137,7 +137,7 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="fltk.vcxproj">
+ <ProjectReference Include="fltk3.vcxproj">
<Project>{E070AAFC-9D03-41A3-BC7D-30887EA0D50F}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
Modified: branches/branch-3.0/ide/VisualC2010/cube.vcxproj
===================================================================
--- branches/branch-3.0/ide/VisualC2010/cube.vcxproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2010/cube.vcxproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltkd.lib;fltk_gld.lib;glu32.lib;opengl32.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3d.lib;fltk3gld.lib;glu32.lib;opengl32.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\cubed.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -114,7 +114,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltk.lib;fltk_gl.lib;glu32.lib;opengl32.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3.lib;fltk3gl.lib;glu32.lib;opengl32.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\cube.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -137,11 +137,11 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="fltk.vcxproj">
+ <ProjectReference Include="fltk3.vcxproj">
<Project>{E070AAFC-9D03-41A3-BC7D-30887EA0D50F}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
- <ProjectReference Include="fltk_gl.vcxproj">
+ <ProjectReference Include="fltk3gl.vcxproj">
<Project>{42E7DB4F-8A12-431D-B651-4FADDD74F327}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
Modified: branches/branch-3.0/ide/VisualC2010/cursor.vcxproj
===================================================================
--- branches/branch-3.0/ide/VisualC2010/cursor.vcxproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2010/cursor.vcxproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltkd.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3d.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\cursord.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -114,7 +114,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltk.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\cursor.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -137,7 +137,7 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="fltk.vcxproj">
+ <ProjectReference Include="fltk3.vcxproj">
<Project>{E070AAFC-9D03-41A3-BC7D-30887EA0D50F}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
Modified: branches/branch-3.0/ide/VisualC2010/curve.vcxproj
===================================================================
--- branches/branch-3.0/ide/VisualC2010/curve.vcxproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2010/curve.vcxproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltkd.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3d.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\curved.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -114,7 +114,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltk.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\curve.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -137,7 +137,7 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="fltk.vcxproj">
+ <ProjectReference Include="fltk3.vcxproj">
<Project>{E070AAFC-9D03-41A3-BC7D-30887EA0D50F}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
Modified: branches/branch-3.0/ide/VisualC2010/demo.vcxproj
===================================================================
--- branches/branch-3.0/ide/VisualC2010/demo.vcxproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2010/demo.vcxproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltkd.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3d.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\Demod.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -114,7 +114,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltk.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\Demo.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -137,7 +137,7 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="fltk.vcxproj">
+ <ProjectReference Include="fltk3.vcxproj">
<Project>{E070AAFC-9D03-41A3-BC7D-30887EA0D50F}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
Modified: branches/branch-3.0/ide/VisualC2010/device.vcxproj
===================================================================
--- branches/branch-3.0/ide/VisualC2010/device.vcxproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2010/device.vcxproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltkd.lib;fltk_imagesd.lib;fltk_pngd.lib;fltk_jpegd.lib;fltk_zlibd.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3imagesd.lib;fltk3d.lib;fltk3pngd.lib;fltk3jpegd.lib;fltk3zlibd.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\deviced.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -114,7 +114,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltk.lib;fltk_images.lib;fltk_png.lib;fltk_jpeg.lib;fltk_zlib.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3images.lib;fltk3.lib;fltk3png.lib;fltk3jpeg.lib;fltk3zlib.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\device.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -137,23 +137,23 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="fltk.vcxproj">
- <Project>{E070AAFC-9D03-41A3-BC7D-30887EA0D50F}</Project>
+ <ProjectReference Include="fltk3images.vcxproj">
+ <Project>{4527AC02-4EB6-41C9-8ECA-819F7725A9BF}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
- <ProjectReference Include="fltk_images.vcxproj">
- <Project>{4527AC02-4EB6-41C9-8ECA-819F7725A9BF}</Project>
+ <ProjectReference Include="fltk3.vcxproj">
+ <Project>{E070AAFC-9D03-41A3-BC7D-30887EA0D50F}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
- <ProjectReference Include="fltk_png.vcxproj">
+ <ProjectReference Include="fltk3png.vcxproj">
<Project>{A6556097-732F-4D5C-9763-96A896DA0F8F}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
- <ProjectReference Include="fltk_jpeg.vcxproj">
+ <ProjectReference Include="fltk3jpeg.vcxproj">
<Project>{845449C0-BCC9-4404-89DC-52E53E80F8D0}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
- <ProjectReference Include="fltk_zlib.vcxproj">
+ <ProjectReference Include="fltk3zlib.vcxproj">
<Project>{8051E81E-8228-43EA-AABA-FE4E48CB10AD}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
Modified: branches/branch-3.0/ide/VisualC2010/doublebuffer.vcxproj
===================================================================
--- branches/branch-3.0/ide/VisualC2010/doublebuffer.vcxproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2010/doublebuffer.vcxproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltkd.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3d.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\doublebufferd.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -114,7 +114,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltk.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\doublebuffer.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -137,7 +137,7 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="fltk.vcxproj">
+ <ProjectReference Include="fltk3.vcxproj">
<Project>{E070AAFC-9D03-41A3-BC7D-30887EA0D50F}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
Modified: branches/branch-3.0/ide/VisualC2010/editor.vcxproj
===================================================================
--- branches/branch-3.0/ide/VisualC2010/editor.vcxproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2010/editor.vcxproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltkd.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3imagesd.lib;fltk3d.lib;fltk3pngd.lib;fltk3jpegd.lib;fltk3zlibd.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\editord.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -114,7 +114,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltk.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3images.lib;fltk3.lib;fltk3png.lib;fltk3jpeg.lib;fltk3zlib.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\editor.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -137,10 +137,26 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="fltk.vcxproj">
+ <ProjectReference Include="fltk3images.vcxproj">
+ <Project>{4527AC02-4EB6-41C9-8ECA-819F7725A9BF}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ <ProjectReference Include="fltk3.vcxproj">
<Project>{E070AAFC-9D03-41A3-BC7D-30887EA0D50F}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
+ <ProjectReference Include="fltk3png.vcxproj">
+ <Project>{A6556097-732F-4D5C-9763-96A896DA0F8F}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ <ProjectReference Include="fltk3jpeg.vcxproj">
+ <Project>{845449C0-BCC9-4404-89DC-52E53E80F8D0}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ <ProjectReference Include="fltk3zlib.vcxproj">
+ <Project>{8051E81E-8228-43EA-AABA-FE4E48CB10AD}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
Modified: branches/branch-3.0/ide/VisualC2010/fast_slow.vcxproj
===================================================================
--- branches/branch-3.0/ide/VisualC2010/fast_slow.vcxproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2010/fast_slow.vcxproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltkd.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3d.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\fast_slowd.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -114,7 +114,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltk.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\fast_slow.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -149,7 +149,7 @@
</CustomBuild>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="fltk.vcxproj">
+ <ProjectReference Include="fltk3.vcxproj">
<Project>{E070AAFC-9D03-41A3-BC7D-30887EA0D50F}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
Modified: branches/branch-3.0/ide/VisualC2010/file_chooser.vcxproj
===================================================================
--- branches/branch-3.0/ide/VisualC2010/file_chooser.vcxproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2010/file_chooser.vcxproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltkd.lib;fltk_imagesd.lib;fltk_pngd.lib;fltk_jpegd.lib;fltk_zlibd.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3imagesd.lib;fltk3d.lib;fltk3pngd.lib;fltk3jpegd.lib;fltk3zlibd.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\file_chooserd.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -114,7 +114,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltk.lib;fltk_images.lib;fltk_png.lib;fltk_jpeg.lib;fltk_zlib.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3images.lib;fltk3.lib;fltk3png.lib;fltk3jpeg.lib;fltk3zlib.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\file_chooser.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -137,23 +137,23 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="fltk.vcxproj">
- <Project>{E070AAFC-9D03-41A3-BC7D-30887EA0D50F}</Project>
+ <ProjectReference Include="fltk3images.vcxproj">
+ <Project>{4527AC02-4EB6-41C9-8ECA-819F7725A9BF}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
- <ProjectReference Include="fltk_images.vcxproj">
- <Project>{4527AC02-4EB6-41C9-8ECA-819F7725A9BF}</Project>
+ <ProjectReference Include="fltk3.vcxproj">
+ <Project>{E070AAFC-9D03-41A3-BC7D-30887EA0D50F}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
- <ProjectReference Include="fltk_png.vcxproj">
+ <ProjectReference Include="fltk3png.vcxproj">
<Project>{A6556097-732F-4D5C-9763-96A896DA0F8F}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
- <ProjectReference Include="fltk_jpeg.vcxproj">
+ <ProjectReference Include="fltk3jpeg.vcxproj">
<Project>{845449C0-BCC9-4404-89DC-52E53E80F8D0}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
- <ProjectReference Include="fltk_zlib.vcxproj">
+ <ProjectReference Include="fltk3zlib.vcxproj">
<Project>{8051E81E-8228-43EA-AABA-FE4E48CB10AD}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
Modified: branches/branch-3.0/ide/VisualC2010/fltk.sln
===================================================================
--- branches/branch-3.0/ide/VisualC2010/fltk.sln 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2010/fltk.sln 2011-08-22 19:53:15 UTC (rev 8996)
@@ -2,17 +2,17 @@
# Visual C++ Express 2010
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Fluid", "Fluid.vcxproj", "{C970F7AF-ABC8-41F6-A754-494B6B16BE8D}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fltk", "fltk.vcxproj", "{E070AAFC-9D03-41A3-BC7D-30887EA0D50F}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fltk3", "fltk3.vcxproj", "{E070AAFC-9D03-41A3-BC7D-30887EA0D50F}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fltk_gl", "fltk_gl.vcxproj", "{42E7DB4F-8A12-431D-B651-4FADDD74F327}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fltk3gl", "fltk3gl.vcxproj", "{42E7DB4F-8A12-431D-B651-4FADDD74F327}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fltk_images", "fltk_images.vcxproj", "{4527AC02-4EB6-41C9-8ECA-819F7725A9BF}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fltk3images", "fltk3images.vcxproj", "{4527AC02-4EB6-41C9-8ECA-819F7725A9BF}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fltk_png", "fltk_png.vcxproj", "{A6556097-732F-4D5C-9763-96A896DA0F8F}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fltk3png", "fltk3png.vcxproj", "{A6556097-732F-4D5C-9763-96A896DA0F8F}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fltk_jpeg", "fltk_jpeg.vcxproj", "{845449C0-BCC9-4404-89DC-52E53E80F8D0}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fltk3jpeg", "fltk3jpeg.vcxproj", "{845449C0-BCC9-4404-89DC-52E53E80F8D0}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fltk_zlib", "fltk_zlib.vcxproj", "{8051E81E-8228-43EA-AABA-FE4E48CB10AD}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fltk3zlib", "fltk3zlib.vcxproj", "{8051E81E-8228-43EA-AABA-FE4E48CB10AD}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Demo", "Demo.vcxproj", "{283CBEE7-44BE-4D32-9144-DA32275415D5}"
EndProject
Modified: branches/branch-3.0/ide/VisualC2010/fltk3.vcxproj
===================================================================
--- branches/branch-3.0/ide/VisualC2010/fltk3.vcxproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2010/fltk3.vcxproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -11,9 +11,9 @@
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
- <ProjectName>fltk</ProjectName>
+ <ProjectName>fltk3</ProjectName>
<ProjectGuid>{E070AAFC-9D03-41A3-BC7D-30887EA0D50F}</ProjectGuid>
- <RootNamespace>fltk</RootNamespace>
+ <RootNamespace>fltk3</RootNamespace>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
@@ -63,7 +63,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Lib>
- <OutputFile>..\..\lib\fltkd.lib</OutputFile>
+ <OutputFile>..\..\lib\fltk3d.lib</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
</Lib>
</ItemDefinitionGroup>
@@ -88,1055 +88,1055 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Lib>
- <OutputFile>..\..\lib\fltk.lib</OutputFile>
+ <OutputFile>..\..\lib\fltk3.lib</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
</Lib>
</ItemDefinitionGroup>
<ItemGroup>
- <ClCompile Include="..\..\src\Fl.cxx">
+ <ClCompile Include="..\..\src\core\Fl.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\Fl_Adjuster.cxx">
+ <ClCompile Include="..\..\src\core\Fl_Adjuster.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\Fl_Bitmap.cxx">
+ <ClCompile Include="..\..\src\core\Fl_Bitmap.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\Fl_Box.cxx">
+ <ClCompile Include="..\..\src\core\Fl_Box.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\Fl_Browser.cxx">
+ <ClCompile Include="..\..\src\core\Fl_Browser.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\Fl_Browser_.cxx">
+ <ClCompile Include="..\..\src\core\Fl_Browser_.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\Fl_Browser_load.cxx">
+ <ClCompile Include="..\..\src\core\Fl_Browser_load.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\Fl_Button.cxx">
+ <ClCompile Include="..\..\src\core\Fl_Button.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\Fl_Chart.cxx">
+ <ClCompile Include="..\..\src\core\Fl_Chart.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\Fl_Check_Browser.cxx">
+ <ClCompile Include="..\..\src\core\Fl_Check_Browser.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\Fl_Check_Button.cxx">
+ <ClCompile Include="..\..\src\core\Fl_Check_Button.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\Fl_Choice.cxx">
+ <ClCompile Include="..\..\src\core\Fl_Choice.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\Fl_Clock.cxx">
+ <ClCompile Include="..\..\src\core\Fl_Clock.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\Fl_Color_Chooser.cxx">
+ <ClCompile Include="..\..\src\core\Fl_Color_Chooser.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\Fl_Counter.cxx">
+ <ClCompile Include="..\..\src\core\Fl_Counter.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\Fl_Device.cxx">
+ <ClCompile Include="..\..\src\core\Fl_Device.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\Fl_Dial.cxx">
+ <ClCompile Include="..\..\src\core\Fl_Dial.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\Fl_Double_Window.cxx">
+ <ClCompile Include="..\..\src\core\Fl_Double_Window.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\Fl_File_Browser.cxx">
+ <ClCompile Include="..\..\src\core\Fl_File_Browser.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\Fl_File_Chooser.cxx">
+ <ClCompile Include="..\..\src\core\Fl_File_Chooser.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\Fl_File_Chooser2.cxx">
+ <ClCompile Include="..\..\src\core\Fl_File_Chooser2.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\Fl_File_Icon.cxx">
+ <ClCompile Include="..\..\src\core\Fl_File_Icon.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\Fl_File_Input.cxx">
+ <ClCompile Include="..\..\src\core\Fl_File_Input.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\Fl_Group.cxx">
+ <ClCompile Include="..\..\src\core\Fl_Group.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\Fl_Help_View.cxx">
+ <ClCompile Include="..\..\src\core\Fl_Help_View.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\Fl_Image.cxx">
+ <ClCompile Include="..\..\src\core\Fl_Image.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\Fl_Input.cxx">
+ <ClCompile Include="..\..\src\core\Fl_Input.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\Fl_Input_.cxx">
+ <ClCompile Include="..\..\src\core\Fl_Input_.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\Fl_Light_Button.cxx">
+ <ClCompile Include="..\..\src\core\Fl_Light_Button.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\Fl_Menu.cxx">
+ <ClCompile Include="..\..\src\core\Fl_Menu.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\Fl_Menu_.cxx">
+ <ClCompile Include="..\..\src\core\Fl_Menu_.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\Fl_Menu_Bar.cxx">
+ <ClCompile Include="..\..\src\core\Fl_Menu_Bar.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\Fl_Menu_Button.cxx">
+ <ClCompile Include="..\..\src\core\Fl_Menu_Button.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\Fl_Menu_Window.cxx">
+ <ClCompile Include="..\..\src\core\Fl_Menu_Window.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\Fl_Menu_add.cxx">
+ <ClCompile Include="..\..\src\core\Fl_Menu_add.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\Fl_Menu_global.cxx">
+ <ClCompile Include="..\..\src\core\Fl_Menu_global.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\Fl_Multi_Label.cxx">
+ <ClCompile Include="..\..\src\core\Fl_Multi_Label.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\Fl_Native_File_Chooser.cxx">
+ <ClCompile Include="..\..\src\core\Fl_Native_File_Chooser.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\Fl_Overlay_Window.cxx">
+ <ClCompile Include="..\..\src\core\Fl_Overlay_Window.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\Fl_Pack.cxx">
+ <ClCompile Include="..\..\src\core\Fl_Pack.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\Fl_Paged_Device.cxx">
+ <ClCompile Include="..\..\src\core\Fl_Paged_Device.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\Fl_Pixmap.cxx">
+ <ClCompile Include="..\..\src\core\Fl_Pixmap.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\Fl_Positioner.cxx">
+ <ClCompile Include="..\..\src\core\Fl_Positioner.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\Fl_Printer.cxx">
+ <ClCompile Include="..\..\src\core\Fl_Printer.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\Fl_Preferences.cxx">
+ <ClCompile Include="..\..\src\core\Fl_Preferences.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\Fl_Progress.cxx">
+ <ClCompile Include="..\..\src\core\Fl_Progress.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\Fl_Repeat_Button.cxx">
+ <ClCompile Include="..\..\src\core\Fl_Repeat_Button.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\Fl_Return_Button.cxx">
+ <ClCompile Include="..\..\src\core\Fl_Return_Button.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\Fl_Roller.cxx">
+ <ClCompile Include="..\..\src\core\Fl_Roller.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\Fl_Round_Button.cxx">
+ <ClCompile Include="..\..\src\core\Fl_Round_Button.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\Fl_Scroll.cxx">
+ <ClCompile Include="..\..\src\core\Fl_Scroll.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\Fl_Scrollbar.cxx">
+ <ClCompile Include="..\..\src\core\Fl_Scrollbar.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\Fl_Shared_Image.cxx">
+ <ClCompile Include="..\..\src\core\Fl_Shared_Image.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\Fl_Single_Window.cxx">
+ <ClCompile Include="..\..\src\core\Fl_Single_Window.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\Fl_Slider.cxx">
+ <ClCompile Include="..\..\src\core\Fl_Slider.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\Style.cxx">
+ <ClCompile Include="..\..\src\core\Style.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\Fl_Sys_Menu_Bar.cxx">
+ <ClCompile Include="..\..\src\core\Fl_Sys_Menu_Bar.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\Fl_Table.cxx">
+ <ClCompile Include="..\..\src\core\Fl_Table.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\Fl_Table_Row.cxx">
+ <ClCompile Include="..\..\src\core\Fl_Table_Row.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\Fl_Tabs.cxx">
+ <ClCompile Include="..\..\src\core\Fl_Tabs.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\Fl_Text_Buffer.cxx">
+ <ClCompile Include="..\..\src\core\Fl_Text_Buffer.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\Fl_Text_Display.cxx">
+ <ClCompile Include="..\..\src\core\Fl_Text_Display.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\Fl_Text_Editor.cxx">
+ <ClCompile Include="..\..\src\core\Fl_Text_Editor.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\Fl_Tile.cxx">
+ <ClCompile Include="..\..\src\core\Fl_Tile.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\Fl_Tiled_Image.cxx">
+ <ClCompile Include="..\..\src\core\Fl_Tiled_Image.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\Fl_Tooltip.cxx">
+ <ClCompile Include="..\..\src\core\Fl_Tooltip.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\Fl_Tree.cxx">
+ <ClCompile Include="..\..\src\core\Fl_Tree.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\Fl_Tree_Item.cxx">
+ <ClCompile Include="..\..\src\core\Fl_Tree_Item.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\Fl_Tree_Item_Array.cxx">
+ <ClCompile Include="..\..\src\core\Fl_Tree_Item_Array.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\Fl_Tree_Prefs.cxx">
+ <ClCompile Include="..\..\src\core\Fl_Tree_Prefs.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\Fl_Valuator.cxx">
+ <ClCompile Include="..\..\src\core\Fl_Valuator.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\Fl_Value_Input.cxx">
+ <ClCompile Include="..\..\src\core\Fl_Value_Input.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\Fl_Value_Output.cxx">
+ <ClCompile Include="..\..\src\core\Fl_Value_Output.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\Fl_Value_Slider.cxx">
+ <ClCompile Include="..\..\src\core\Fl_Value_Slider.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\Fl_Widget.cxx">
+ <ClCompile Include="..\..\src\core\Fl_Widget.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\Fl_Window.cxx">
+ <ClCompile Include="..\..\src\core\Fl_Window.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\Fl_Window_fullscreen.cxx">
+ <ClCompile Include="..\..\src\core\Fl_Window_fullscreen.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\Fl_Window_hotspot.cxx">
+ <ClCompile Include="..\..\src\core\Fl_Window_hotspot.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\Fl_Window_iconize.cxx">
+ <ClCompile Include="..\..\src\core\Fl_Window_iconize.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\Fl_Wizard.cxx">
+ <ClCompile Include="..\..\src\core\Fl_Wizard.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\Fl_XBM_Image.cxx">
+ <ClCompile Include="..\..\src\core\Fl_XBM_Image.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\Fl_XPM_Image.cxx">
+ <ClCompile Include="..\..\src\core\Fl_XPM_Image.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\Fl_abort.cxx">
+ <ClCompile Include="..\..\src\core\Fl_abort.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\Fl_add_idle.cxx">
+ <ClCompile Include="..\..\src\core\Fl_add_idle.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\Fl_arg.cxx">
+ <ClCompile Include="..\..\src\core\Fl_arg.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\Fl_compose.cxx">
+ <ClCompile Include="..\..\src\core\Fl_compose.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\Fl_display.cxx">
+ <ClCompile Include="..\..\src\core\Fl_display.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\Fl_get_key.cxx">
+ <ClCompile Include="..\..\src\core\Fl_get_key.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\Fl_get_system_colors.cxx">
+ <ClCompile Include="..\..\src\core\Fl_get_system_colors.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\Fl_grab.cxx">
+ <ClCompile Include="..\..\src\core\Fl_grab.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\Fl_lock.cxx">
+ <ClCompile Include="..\..\src\core\Fl_lock.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\Fl_own_colormap.cxx">
+ <ClCompile Include="..\..\src\core\Fl_own_colormap.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\Fl_visual.cxx">
+ <ClCompile Include="..\..\src\core\Fl_visual.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\Fl_x.cxx">
+ <ClCompile Include="..\..\src\core\Fl_x.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\filename_absolute.cxx">
+ <ClCompile Include="..\..\src\core\filename_absolute.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\filename_expand.cxx">
+ <ClCompile Include="..\..\src\core\filename_expand.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\filename_ext.cxx">
+ <ClCompile Include="..\..\src\core\filename_ext.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\filename_isdir.cxx">
+ <ClCompile Include="..\..\src\core\filename_isdir.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\filename_list.cxx">
+ <ClCompile Include="..\..\src\core\filename_list.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\filename_match.cxx">
+ <ClCompile Include="..\..\src\core\filename_match.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\filename_setext.cxx">
+ <ClCompile Include="..\..\src\core\filename_setext.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\fl_arc.cxx">
+ <ClCompile Include="..\..\src\core\fl_arc.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\fl_arci.cxx">
+ <ClCompile Include="..\..\src\core\fl_arci.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\fl_ask.cxx">
+ <ClCompile Include="..\..\src\core\fl_ask.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\fl_boxtype.cxx">
+ <ClCompile Include="..\..\src\core\fl_boxtype.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\fl_call_main.cxx">
+ <ClCompile Include="..\..\src\core\fl_call_main.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\fl_color.cxx">
+ <ClCompile Include="..\..\src\core\fl_color.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\fl_cursor.cxx">
+ <ClCompile Include="..\..\src\core\fl_cursor.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\fl_curve.cxx">
+ <ClCompile Include="..\..\src\core\fl_curve.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\fl_diamond_box.cxx">
+ <ClCompile Include="..\..\src\core\fl_diamond_box.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\fl_dnd.cxx">
+ <ClCompile Include="..\..\src\core\fl_dnd.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\fl_draw.cxx">
+ <ClCompile Include="..\..\src\core\fl_draw.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\fl_draw_image.cxx">
+ <ClCompile Include="..\..\src\core\fl_draw_image.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\fl_draw_pixmap.cxx">
+ <ClCompile Include="..\..\src\core\fl_draw_pixmap.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\fl_encoding_latin1.cxx">
+ <ClCompile Include="..\..\src\core\fl_encoding_latin1.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\fl_encoding_mac_roman.cxx">
+ <ClCompile Include="..\..\src\core\fl_encoding_mac_roman.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\fl_engraved_label.cxx">
+ <ClCompile Include="..\..\src\core\fl_engraved_label.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\fl_file_dir.cxx">
+ <ClCompile Include="..\..\src\core\fl_file_dir.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\fl_font.cxx">
+ <ClCompile Include="..\..\src\core\fl_font.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\fl_gtk.cxx">
+ <ClCompile Include="..\..\src\core\fl_gtk.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\fl_labeltype.cxx">
+ <ClCompile Include="..\..\src\core\fl_labeltype.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\fl_line_style.cxx">
+ <ClCompile Include="..\..\src\core\fl_line_style.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\fl_open_uri.cxx">
+ <ClCompile Include="..\..\src\core\fl_open_uri.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\fl_oval_box.cxx">
+ <ClCompile Include="..\..\src\core\fl_oval_box.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\fl_overlay.cxx">
+ <ClCompile Include="..\..\src\core\fl_overlay.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\fl_overlay_visual.cxx">
+ <ClCompile Include="..\..\src\core\fl_overlay_visual.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\fl_plastic.cxx">
+ <ClCompile Include="..\..\src\core\fl_plastic.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\fl_read_image.cxx">
+ <ClCompile Include="..\..\src\core\fl_read_image.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\fl_rect.cxx">
+ <ClCompile Include="..\..\src\core\fl_rect.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\fl_round_box.cxx">
+ <ClCompile Include="..\..\src\core\fl_round_box.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\fl_rounded_box.cxx">
+ <ClCompile Include="..\..\src\core\fl_rounded_box.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\fl_scroll_area.cxx">
+ <ClCompile Include="..\..\src\core\fl_scroll_area.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\fl_set_font.cxx">
+ <ClCompile Include="..\..\src\core\fl_set_font.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\fl_set_fonts.cxx">
+ <ClCompile Include="..\..\src\core\fl_set_fonts.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\fl_shadow_box.cxx">
+ <ClCompile Include="..\..\src\core\fl_shadow_box.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\fl_shortcut.cxx">
+ <ClCompile Include="..\..\src\core\fl_shortcut.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\fl_show_colormap.cxx">
+ <ClCompile Include="..\..\src\core\fl_show_colormap.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\fl_symbols.cxx">
+ <ClCompile Include="..\..\src\core\fl_symbols.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\fl_utf8.cxx">
+ <ClCompile Include="..\..\src\core\fl_utf8.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\fl_utf.cxx">
+ <ClCompile Include="..\..\src\core\fl_utf.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\fl_vertex.cxx">
+ <ClCompile Include="..\..\src\core\fl_vertex.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\numericsort.cxx">
+ <ClCompile Include="..\..\src\core\numericsort.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\ps_image.cxx">
+ <ClCompile Include="..\..\src\core\ps_image.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\scandir.cxx">
+ <ClCompile Include="..\..\src\core\scandir.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\screen_xywh.cxx">
+ <ClCompile Include="..\..\src\core\screen_xywh.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\flstring.c">
+ <ClCompile Include="..\..\src\core\flstring.c">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\vsnprintf.c">
+ <ClCompile Include="..\..\src\core\vsnprintf.c">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\xutf8\case.c">
+ <ClCompile Include="..\..\src\core\xutf8\case.c">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\xutf8\is_right2left.c">
+ <ClCompile Include="..\..\src\core\xutf8\is_right2left.c">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\xutf8\is_spacing.c">
+ <ClCompile Include="..\..\src\core\xutf8\is_spacing.c">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
Modified: branches/branch-3.0/ide/VisualC2010/fltk3gl.vcxproj
===================================================================
--- branches/branch-3.0/ide/VisualC2010/fltk3gl.vcxproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2010/fltk3gl.vcxproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -11,9 +11,9 @@
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
- <ProjectName>fltk_gl</ProjectName>
+ <ProjectName>fltk3gl</ProjectName>
<ProjectGuid>{42E7DB4F-8A12-431D-B651-4FADDD74F327}</ProjectGuid>
- <RootNamespace>fltk_gl</RootNamespace>
+ <RootNamespace>fltk3gl</RootNamespace>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
@@ -63,7 +63,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Lib>
- <OutputFile>..\..\lib\fltk_gld.lib</OutputFile>
+ <OutputFile>..\..\lib\fltk3gld.lib</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
</Lib>
</ItemDefinitionGroup>
@@ -88,82 +88,82 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Lib>
- <OutputFile>..\..\lib\fltk_gl.lib</OutputFile>
+ <OutputFile>..\..\lib\fltk3gl.lib</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
</Lib>
</ItemDefinitionGroup>
<ItemGroup>
- <ClCompile Include="..\..\src\Fl_Gl_Choice.cxx">
+ <ClCompile Include="..\..\src\core\Fl_Gl_Choice.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\Fl_Gl_Device_Plugin.cxx">
+ <ClCompile Include="..\..\src\core\Fl_Gl_Device_Plugin.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\Fl_Gl_Overlay.cxx">
+ <ClCompile Include="..\..\src\core\Fl_Gl_Overlay.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\Fl_Gl_Window.cxx">
+ <ClCompile Include="..\..\src\core\Fl_Gl_Window.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\freeglut_geometry.cxx">
+ <ClCompile Include="..\..\src\core\freeglut_geometry.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\freeglut_stroke_mono_roman.cxx">
+ <ClCompile Include="..\..\src\core\freeglut_stroke_mono_roman.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\freeglut_stroke_roman.cxx">
+ <ClCompile Include="..\..\src\core\freeglut_stroke_roman.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\freeglut_teapot.cxx">
+ <ClCompile Include="..\..\src\core\freeglut_teapot.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\gl_draw.cxx">
+ <ClCompile Include="..\..\src\core\gl_draw.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\glut_compatability.cxx">
+ <ClCompile Include="..\..\src\core\glut_compatability.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\glut_font.cxx">
+ <ClCompile Include="..\..\src\core\glut_font.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -172,7 +172,7 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="fltk.vcxproj">
+ <ProjectReference Include="fltk3.vcxproj">
<Project>{E070AAFC-9D03-41A3-BC7D-30887EA0D50F}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
Modified: branches/branch-3.0/ide/VisualC2010/fltk3images.vcxproj
===================================================================
--- branches/branch-3.0/ide/VisualC2010/fltk3images.vcxproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2010/fltk3images.vcxproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -11,9 +11,9 @@
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
- <ProjectName>fltk_images</ProjectName>
+ <ProjectName>fltk3images</ProjectName>
<ProjectGuid>{4527AC02-4EB6-41C9-8ECA-819F7725A9BF}</ProjectGuid>
- <RootNamespace>fltk_images</RootNamespace>
+ <RootNamespace>fltk3images</RootNamespace>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
@@ -63,7 +63,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Lib>
- <OutputFile>..\..\lib\fltk_imagesd.lib</OutputFile>
+ <OutputFile>..\..\lib\fltk3imagesd.lib</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
</Lib>
</ItemDefinitionGroup>
@@ -88,61 +88,61 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Lib>
- <OutputFile>..\..\lib\fltk_images.lib</OutputFile>
+ <OutputFile>..\..\lib\fltk3images.lib</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
</Lib>
</ItemDefinitionGroup>
<ItemGroup>
- <ClCompile Include="..\..\src\Fl_BMP_Image.cxx">
+ <ClCompile Include="..\..\src\core\Fl_BMP_Image.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\Fl_File_Icon2.cxx">
+ <ClCompile Include="..\..\src\core\Fl_File_Icon2.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\Fl_GIF_Image.cxx">
+ <ClCompile Include="..\..\src\core\Fl_GIF_Image.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\Fl_Help_Dialog.cxx">
+ <ClCompile Include="..\..\src\core\Fl_Help_Dialog.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\Fl_JPEG_Image.cxx">
+ <ClCompile Include="..\..\src\core\Fl_JPEG_Image.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\Fl_PNG_Image.cxx">
+ <ClCompile Include="..\..\src\core\Fl_PNG_Image.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\Fl_PNM_Image.cxx">
+ <ClCompile Include="..\..\src\core\Fl_PNM_Image.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\fl_images_core.cxx">
+ <ClCompile Include="..\..\src\core\fl_images_core.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -151,15 +151,15 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="fltk.vcxproj">
+ <ProjectReference Include="fltk3.vcxproj">
<Project>{E070AAFC-9D03-41A3-BC7D-30887EA0D50F}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
- <ProjectReference Include="fltk_png.vcxproj">
+ <ProjectReference Include="fltk3png.vcxproj">
<Project>{A6556097-732F-4D5C-9763-96A896DA0F8F}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
- <ProjectReference Include="fltk_jpeg.vcxproj">
+ <ProjectReference Include="fltk3jpeg.vcxproj">
<Project>{845449C0-BCC9-4404-89DC-52E53E80F8D0}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
Modified: branches/branch-3.0/ide/VisualC2010/fltk3jpeg.vcxproj
===================================================================
--- branches/branch-3.0/ide/VisualC2010/fltk3jpeg.vcxproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2010/fltk3jpeg.vcxproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -11,9 +11,9 @@
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
- <ProjectName>fltk_jpeg</ProjectName>
+ <ProjectName>fltk3jpeg</ProjectName>
<ProjectGuid>{845449C0-BCC9-4404-89DC-52E53E80F8D0}</ProjectGuid>
- <RootNamespace>fltk_jpeg</RootNamespace>
+ <RootNamespace>fltk3jpeg</RootNamespace>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
@@ -63,7 +63,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Lib>
- <OutputFile>..\..\lib\fltk_jpegd.lib</OutputFile>
+ <OutputFile>..\..\lib\fltk3jpegd.lib</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
</Lib>
</ItemDefinitionGroup>
@@ -88,327 +88,327 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Lib>
- <OutputFile>..\..\lib\fltk_jpeg.lib</OutputFile>
+ <OutputFile>..\..\lib\fltk3jpeg.lib</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
</Lib>
</ItemDefinitionGroup>
<ItemGroup>
- <ClCompile Include="..\..\jpeg\jaricom.c">
+ <ClCompile Include="..\..\src\jpeg\jaricom.c">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\jpeg\jcarith.c">
+ <ClCompile Include="..\..\src\jpeg\jcarith.c">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\jpeg\jdarith.c">
+ <ClCompile Include="..\..\src\jpeg\jdarith.c">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\jpeg\jcapimin.c">
+ <ClCompile Include="..\..\src\jpeg\jcapimin.c">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\jpeg\jcapistd.c">
+ <ClCompile Include="..\..\src\jpeg\jcapistd.c">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\jpeg\jccoefct.c">
+ <ClCompile Include="..\..\src\jpeg\jccoefct.c">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\jpeg\jccolor.c">
+ <ClCompile Include="..\..\src\jpeg\jccolor.c">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\jpeg\jcdctmgr.c">
+ <ClCompile Include="..\..\src\jpeg\jcdctmgr.c">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\jpeg\jchuff.c">
+ <ClCompile Include="..\..\src\jpeg\jchuff.c">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\jpeg\jcinit.c">
+ <ClCompile Include="..\..\src\jpeg\jcinit.c">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\jpeg\jcmainct.c">
+ <ClCompile Include="..\..\src\jpeg\jcmainct.c">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\jpeg\jcmarker.c">
+ <ClCompile Include="..\..\src\jpeg\jcmarker.c">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\jpeg\jcmaster.c">
+ <ClCompile Include="..\..\src\jpeg\jcmaster.c">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\jpeg\jcomapi.c">
+ <ClCompile Include="..\..\src\jpeg\jcomapi.c">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\jpeg\jcparam.c">
+ <ClCompile Include="..\..\src\jpeg\jcparam.c">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\jpeg\jcprepct.c">
+ <ClCompile Include="..\..\src\jpeg\jcprepct.c">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\jpeg\jcsample.c">
+ <ClCompile Include="..\..\src\jpeg\jcsample.c">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\jpeg\jctrans.c">
+ <ClCompile Include="..\..\src\jpeg\jctrans.c">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\jpeg\jdapimin.c">
+ <ClCompile Include="..\..\src\jpeg\jdapimin.c">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\jpeg\jdapistd.c">
+ <ClCompile Include="..\..\src\jpeg\jdapistd.c">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\jpeg\jdatadst.c">
+ <ClCompile Include="..\..\src\jpeg\jdatadst.c">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\jpeg\jdatasrc.c">
+ <ClCompile Include="..\..\src\jpeg\jdatasrc.c">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\jpeg\jdcoefct.c">
+ <ClCompile Include="..\..\src\jpeg\jdcoefct.c">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\jpeg\jdcolor.c">
+ <ClCompile Include="..\..\src\jpeg\jdcolor.c">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\jpeg\jddctmgr.c">
+ <ClCompile Include="..\..\src\jpeg\jddctmgr.c">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\jpeg\jdhuff.c">
+ <ClCompile Include="..\..\src\jpeg\jdhuff.c">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\jpeg\jdinput.c">
+ <ClCompile Include="..\..\src\jpeg\jdinput.c">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\jpeg\jdmainct.c">
+ <ClCompile Include="..\..\src\jpeg\jdmainct.c">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\jpeg\jdmarker.c">
+ <ClCompile Include="..\..\src\jpeg\jdmarker.c">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\jpeg\jdmaster.c">
+ <ClCompile Include="..\..\src\jpeg\jdmaster.c">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\jpeg\jdmerge.c">
+ <ClCompile Include="..\..\src\jpeg\jdmerge.c">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\jpeg\jdpostct.c">
+ <ClCompile Include="..\..\src\jpeg\jdpostct.c">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\jpeg\jdsample.c">
+ <ClCompile Include="..\..\src\jpeg\jdsample.c">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\jpeg\jdtrans.c">
+ <ClCompile Include="..\..\src\jpeg\jdtrans.c">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\jpeg\jerror.c">
+ <ClCompile Include="..\..\src\jpeg\jerror.c">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\jpeg\jfdctflt.c">
+ <ClCompile Include="..\..\src\jpeg\jfdctflt.c">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\jpeg\jfdctfst.c">
+ <ClCompile Include="..\..\src\jpeg\jfdctfst.c">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\jpeg\jfdctint.c">
+ <ClCompile Include="..\..\src\jpeg\jfdctint.c">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\jpeg\jidctflt.c">
+ <ClCompile Include="..\..\src\jpeg\jidctflt.c">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\jpeg\jidctfst.c">
+ <ClCompile Include="..\..\src\jpeg\jidctfst.c">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\jpeg\jidctint.c">
+ <ClCompile Include="..\..\src\jpeg\jidctint.c">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\jpeg\jmemmgr.c">
+ <ClCompile Include="..\..\src\jpeg\jmemmgr.c">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\jpeg\jmemnobs.c">
+ <ClCompile Include="..\..\src\jpeg\jmemnobs.c">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\jpeg\jquant1.c">
+ <ClCompile Include="..\..\src\jpeg\jquant1.c">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\jpeg\jquant2.c">
+ <ClCompile Include="..\..\src\jpeg\jquant2.c">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\jpeg\jutils.c">
+ <ClCompile Include="..\..\src\jpeg\jutils.c">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -417,7 +417,7 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="fltk.vcxproj">
+ <ProjectReference Include="fltk3.vcxproj">
<Project>{E070AAFC-9D03-41A3-BC7D-30887EA0D50F}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
Modified: branches/branch-3.0/ide/VisualC2010/fltk3png.vcxproj
===================================================================
--- branches/branch-3.0/ide/VisualC2010/fltk3png.vcxproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2010/fltk3png.vcxproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -11,9 +11,9 @@
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
- <ProjectName>fltk_png</ProjectName>
+ <ProjectName>fltk3png</ProjectName>
<ProjectGuid>{A6556097-732F-4D5C-9763-96A896DA0F8F}</ProjectGuid>
- <RootNamespace>fltk_png</RootNamespace>
+ <RootNamespace>fltk3png</RootNamespace>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
@@ -63,7 +63,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Lib>
- <OutputFile>..\..\lib\fltk_pngd.lib</OutputFile>
+ <OutputFile>..\..\lib\fltk3pngd.lib</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
</Lib>
</ItemDefinitionGroup>
@@ -88,110 +88,110 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Lib>
- <OutputFile>..\..\lib\fltk_png.lib</OutputFile>
+ <OutputFile>..\..\lib\fltk3png.lib</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
</Lib>
</ItemDefinitionGroup>
<ItemGroup>
- <ClCompile Include="..\..\png\png.c">
+ <ClCompile Include="..\..\src\png\png.c">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\png\pngerror.c">
+ <ClCompile Include="..\..\src\png\pngerror.c">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\png\pngget.c">
+ <ClCompile Include="..\..\src\png\pngget.c">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\png\pngmem.c">
+ <ClCompile Include="..\..\src\png\pngmem.c">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\png\pngpread.c">
+ <ClCompile Include="..\..\src\png\pngpread.c">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\png\pngread.c">
+ <ClCompile Include="..\..\src\png\pngread.c">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\png\pngrio.c">
+ <ClCompile Include="..\..\src\png\pngrio.c">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\png\pngrtran.c">
+ <ClCompile Include="..\..\src\png\pngrtran.c">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\png\pngrutil.c">
+ <ClCompile Include="..\..\src\png\pngrutil.c">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\png\pngset.c">
+ <ClCompile Include="..\..\src\png\pngset.c">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\png\pngtrans.c">
+ <ClCompile Include="..\..\src\png\pngtrans.c">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\png\pngwio.c">
+ <ClCompile Include="..\..\src\png\pngwio.c">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\png\pngwrite.c">
+ <ClCompile Include="..\..\src\png\pngwrite.c">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\png\pngwtran.c">
+ <ClCompile Include="..\..\src\png\pngwtran.c">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\png\pngwutil.c">
+ <ClCompile Include="..\..\src\png\pngwutil.c">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -200,11 +200,11 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="fltk.vcxproj">
+ <ProjectReference Include="fltk3.vcxproj">
<Project>{E070AAFC-9D03-41A3-BC7D-30887EA0D50F}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
- <ProjectReference Include="fltk_zlib.vcxproj">
+ <ProjectReference Include="fltk3zlib.vcxproj">
<Project>{8051E81E-8228-43EA-AABA-FE4E48CB10AD}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
Modified: branches/branch-3.0/ide/VisualC2010/fltk3zlib.vcxproj
===================================================================
--- branches/branch-3.0/ide/VisualC2010/fltk3zlib.vcxproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2010/fltk3zlib.vcxproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -11,9 +11,9 @@
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
- <ProjectName>fltk_zlib</ProjectName>
+ <ProjectName>fltk3zlib</ProjectName>
<ProjectGuid>{8051E81E-8228-43EA-AABA-FE4E48CB10AD}</ProjectGuid>
- <RootNamespace>fltk_zlib</RootNamespace>
+ <RootNamespace>fltk3zlib</RootNamespace>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
@@ -63,7 +63,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Lib>
- <OutputFile>..\..\lib\fltk_zlibd.lib</OutputFile>
+ <OutputFile>..\..\lib\fltk3zlibd.lib</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
</Lib>
</ItemDefinitionGroup>
@@ -88,110 +88,110 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Lib>
- <OutputFile>..\..\lib\fltk_zlib.lib</OutputFile>
+ <OutputFile>..\..\lib\fltk3zlib.lib</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
</Lib>
</ItemDefinitionGroup>
<ItemGroup>
- <ClCompile Include="..\..\zlib\adler32.c">
+ <ClCompile Include="..\..\src\zlib\adler32.c">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\zlib\compress.c">
+ <ClCompile Include="..\..\src\zlib\compress.c">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\zlib\crc32.c">
+ <ClCompile Include="..\..\src\zlib\crc32.c">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\zlib\deflate.c">
+ <ClCompile Include="..\..\src\zlib\deflate.c">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\zlib\gzclose.c">
+ <ClCompile Include="..\..\src\zlib\gzclose.c">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\zlib\gzlib.c">
+ <ClCompile Include="..\..\src\zlib\gzlib.c">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\zlib\gzread.c">
+ <ClCompile Include="..\..\src\zlib\gzread.c">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\zlib\gzwrite.c">
+ <ClCompile Include="..\..\src\zlib\gzwrite.c">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\zlib\infback.c">
+ <ClCompile Include="..\..\src\zlib\infback.c">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\zlib\inffast.c">
+ <ClCompile Include="..\..\src\zlib\inffast.c">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\zlib\inflate.c">
+ <ClCompile Include="..\..\src\zlib\inflate.c">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\zlib\inftrees.c">
+ <ClCompile Include="..\..\src\zlib\inftrees.c">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\zlib\trees.c">
+ <ClCompile Include="..\..\src\zlib\trees.c">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\zlib\uncompr.c">
+ <ClCompile Include="..\..\src\zlib\uncompr.c">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\zlib\zutil.c">
+ <ClCompile Include="..\..\src\zlib\zutil.c">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -200,7 +200,7 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="fltk.vcxproj">
+ <ProjectReference Include="fltk3.vcxproj">
<Project>{E070AAFC-9D03-41A3-BC7D-30887EA0D50F}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
Modified: branches/branch-3.0/ide/VisualC2010/fluid.vcxproj
===================================================================
--- branches/branch-3.0/ide/VisualC2010/fluid.vcxproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2010/fluid.vcxproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltkd.lib;fltk_imagesd.lib;fltk_pngd.lib;fltk_jpegd.lib;fltk_zlibd.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3d.lib;fltk3imagesd.lib;fltk3pngd.lib;fltk3jpegd.lib;fltk3zlibd.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\fluid\Fluidd.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -114,7 +114,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltk.lib;fltk_images.lib;fltk_png.lib;fltk_jpeg.lib;fltk_zlib.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3.lib;fltk3images.lib;fltk3png.lib;fltk3jpeg.lib;fltk3zlib.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\fluid\Fluid.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -312,23 +312,23 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="fltk.vcxproj">
+ <ProjectReference Include="fltk3.vcxproj">
<Project>{E070AAFC-9D03-41A3-BC7D-30887EA0D50F}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
- <ProjectReference Include="fltk_images.vcxproj">
+ <ProjectReference Include="fltk3images.vcxproj">
<Project>{4527AC02-4EB6-41C9-8ECA-819F7725A9BF}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
- <ProjectReference Include="fltk_png.vcxproj">
+ <ProjectReference Include="fltk3png.vcxproj">
<Project>{A6556097-732F-4D5C-9763-96A896DA0F8F}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
- <ProjectReference Include="fltk_jpeg.vcxproj">
+ <ProjectReference Include="fltk3jpeg.vcxproj">
<Project>{845449C0-BCC9-4404-89DC-52E53E80F8D0}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
- <ProjectReference Include="fltk_zlib.vcxproj">
+ <ProjectReference Include="fltk3zlib.vcxproj">
<Project>{8051E81E-8228-43EA-AABA-FE4E48CB10AD}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
Modified: branches/branch-3.0/ide/VisualC2010/fonts.vcxproj
===================================================================
--- branches/branch-3.0/ide/VisualC2010/fonts.vcxproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2010/fonts.vcxproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltkd.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3d.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\fontsd.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -114,7 +114,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltk.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\fonts.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -137,7 +137,7 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="fltk.vcxproj">
+ <ProjectReference Include="fltk3.vcxproj">
<Project>{E070AAFC-9D03-41A3-BC7D-30887EA0D50F}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
Modified: branches/branch-3.0/ide/VisualC2010/fractals.vcxproj
===================================================================
--- branches/branch-3.0/ide/VisualC2010/fractals.vcxproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2010/fractals.vcxproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltkd.lib;fltk_gld.lib;glu32.lib;opengl32.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3gld.lib;fltk3d.lib;glu32.lib;opengl32.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\fractalsd.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -114,7 +114,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltk.lib;fltk_gl.lib;glu32.lib;opengl32.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3gl.lib;fltk3.lib;glu32.lib;opengl32.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\fractals.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -144,12 +144,12 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="fltk.vcxproj">
- <Project>{E070AAFC-9D03-41A3-BC7D-30887EA0D50F}</Project>
+ <ProjectReference Include="fltk3gl.vcxproj">
+ <Project>{42E7DB4F-8A12-431D-B651-4FADDD74F327}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
- <ProjectReference Include="fltk_gl.vcxproj">
- <Project>{42E7DB4F-8A12-431D-B651-4FADDD74F327}</Project>
+ <ProjectReference Include="fltk3.vcxproj">
+ <Project>{E070AAFC-9D03-41A3-BC7D-30887EA0D50F}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
</ItemGroup>
Modified: branches/branch-3.0/ide/VisualC2010/fullscreen.vcxproj
===================================================================
--- branches/branch-3.0/ide/VisualC2010/fullscreen.vcxproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2010/fullscreen.vcxproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltkd.lib;fltk_gld.lib;glu32.lib;opengl32.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3d.lib;fltk3gld.lib;glu32.lib;opengl32.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\fullscreend.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -114,7 +114,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltk.lib;fltk_gl.lib;glu32.lib;opengl32.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3.lib;fltk3gl.lib;glu32.lib;opengl32.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\fullscreen.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -137,11 +137,11 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="fltk.vcxproj">
+ <ProjectReference Include="fltk3.vcxproj">
<Project>{E070AAFC-9D03-41A3-BC7D-30887EA0D50F}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
- <ProjectReference Include="fltk_gl.vcxproj">
+ <ProjectReference Include="fltk3gl.vcxproj">
<Project>{42E7DB4F-8A12-431D-B651-4FADDD74F327}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
Modified: branches/branch-3.0/ide/VisualC2010/gl_overlay.vcxproj
===================================================================
--- branches/branch-3.0/ide/VisualC2010/gl_overlay.vcxproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2010/gl_overlay.vcxproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltkd.lib;fltk_gld.lib;glu32.lib;opengl32.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3d.lib;fltk3gld.lib;glu32.lib;opengl32.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\gl_overlayd.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -114,7 +114,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltk.lib;fltk_gl.lib;glu32.lib;opengl32.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3.lib;fltk3gl.lib;glu32.lib;opengl32.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\gl_overlay.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -137,11 +137,11 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="fltk.vcxproj">
+ <ProjectReference Include="fltk3.vcxproj">
<Project>{E070AAFC-9D03-41A3-BC7D-30887EA0D50F}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
- <ProjectReference Include="fltk_gl.vcxproj">
+ <ProjectReference Include="fltk3gl.vcxproj">
<Project>{42E7DB4F-8A12-431D-B651-4FADDD74F327}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
Modified: branches/branch-3.0/ide/VisualC2010/glpuzzle.vcxproj
===================================================================
--- branches/branch-3.0/ide/VisualC2010/glpuzzle.vcxproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2010/glpuzzle.vcxproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltkd.lib;fltk_gld.lib;glu32.lib;opengl32.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3gld.lib;fltk3d.lib;glu32.lib;opengl32.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\glpuzzled.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -114,7 +114,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltk.lib;fltk_gl.lib;glu32.lib;opengl32.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3gl.lib;fltk3.lib;glu32.lib;opengl32.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\glpuzzle.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -137,12 +137,12 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="fltk.vcxproj">
- <Project>{E070AAFC-9D03-41A3-BC7D-30887EA0D50F}</Project>
+ <ProjectReference Include="fltk3gl.vcxproj">
+ <Project>{42E7DB4F-8A12-431D-B651-4FADDD74F327}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
- <ProjectReference Include="fltk_gl.vcxproj">
- <Project>{42E7DB4F-8A12-431D-B651-4FADDD74F327}</Project>
+ <ProjectReference Include="fltk3.vcxproj">
+ <Project>{E070AAFC-9D03-41A3-BC7D-30887EA0D50F}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
</ItemGroup>
Modified: branches/branch-3.0/ide/VisualC2010/hello.vcxproj
===================================================================
--- branches/branch-3.0/ide/VisualC2010/hello.vcxproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2010/hello.vcxproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltkd.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3d.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\hellod.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -114,7 +114,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltk.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\hello.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -137,7 +137,7 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="fltk.vcxproj">
+ <ProjectReference Include="fltk3.vcxproj">
<Project>{E070AAFC-9D03-41A3-BC7D-30887EA0D50F}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
Modified: branches/branch-3.0/ide/VisualC2010/help.vcxproj
===================================================================
--- branches/branch-3.0/ide/VisualC2010/help.vcxproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2010/help.vcxproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltkd.lib;fltk_imagesd.lib;fltk_pngd.lib;fltk_jpegd.lib;fltk_zlibd.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3imagesd.lib;fltk3d.lib;fltk3pngd.lib;fltk3jpegd.lib;fltk3zlibd.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\helpd.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -114,7 +114,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltk.lib;fltk_images.lib;fltk_png.lib;fltk_jpeg.lib;fltk_zlib.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3images.lib;fltk3.lib;fltk3png.lib;fltk3jpeg.lib;fltk3zlib.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\help.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -137,23 +137,23 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="fltk.vcxproj">
- <Project>{E070AAFC-9D03-41A3-BC7D-30887EA0D50F}</Project>
+ <ProjectReference Include="fltk3images.vcxproj">
+ <Project>{4527AC02-4EB6-41C9-8ECA-819F7725A9BF}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
- <ProjectReference Include="fltk_images.vcxproj">
- <Project>{4527AC02-4EB6-41C9-8ECA-819F7725A9BF}</Project>
+ <ProjectReference Include="fltk3.vcxproj">
+ <Project>{E070AAFC-9D03-41A3-BC7D-30887EA0D50F}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
- <ProjectReference Include="fltk_png.vcxproj">
+ <ProjectReference Include="fltk3png.vcxproj">
<Project>{A6556097-732F-4D5C-9763-96A896DA0F8F}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
- <ProjectReference Include="fltk_jpeg.vcxproj">
+ <ProjectReference Include="fltk3jpeg.vcxproj">
<Project>{845449C0-BCC9-4404-89DC-52E53E80F8D0}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
- <ProjectReference Include="fltk_zlib.vcxproj">
+ <ProjectReference Include="fltk3zlib.vcxproj">
<Project>{8051E81E-8228-43EA-AABA-FE4E48CB10AD}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
Modified: branches/branch-3.0/ide/VisualC2010/iconize.vcxproj
===================================================================
--- branches/branch-3.0/ide/VisualC2010/iconize.vcxproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2010/iconize.vcxproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltkd.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3d.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\iconized.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -114,7 +114,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltk.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\iconize.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -137,7 +137,7 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="fltk.vcxproj">
+ <ProjectReference Include="fltk3.vcxproj">
<Project>{E070AAFC-9D03-41A3-BC7D-30887EA0D50F}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
Modified: branches/branch-3.0/ide/VisualC2010/image.vcxproj
===================================================================
--- branches/branch-3.0/ide/VisualC2010/image.vcxproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2010/image.vcxproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltkd.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3d.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\imaged.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -114,7 +114,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltk.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\image.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -137,7 +137,7 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="fltk.vcxproj">
+ <ProjectReference Include="fltk3.vcxproj">
<Project>{E070AAFC-9D03-41A3-BC7D-30887EA0D50F}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
Modified: branches/branch-3.0/ide/VisualC2010/inactive.vcxproj
===================================================================
--- branches/branch-3.0/ide/VisualC2010/inactive.vcxproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2010/inactive.vcxproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltkd.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3d.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\inactived.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -114,7 +114,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltk.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\inactive.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -149,7 +149,7 @@
</CustomBuild>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="fltk.vcxproj">
+ <ProjectReference Include="fltk3.vcxproj">
<Project>{E070AAFC-9D03-41A3-BC7D-30887EA0D50F}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
Modified: branches/branch-3.0/ide/VisualC2010/input.vcxproj
===================================================================
--- branches/branch-3.0/ide/VisualC2010/input.vcxproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2010/input.vcxproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltkd.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3d.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\inputd.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -114,7 +114,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltk.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\input.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -137,7 +137,7 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="fltk.vcxproj">
+ <ProjectReference Include="fltk3.vcxproj">
<Project>{E070AAFC-9D03-41A3-BC7D-30887EA0D50F}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
Modified: branches/branch-3.0/ide/VisualC2010/input_choice.vcxproj
===================================================================
--- branches/branch-3.0/ide/VisualC2010/input_choice.vcxproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2010/input_choice.vcxproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltkd.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3d.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\input_choiced.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -114,7 +114,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltk.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\input_choice.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -137,7 +137,7 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="fltk.vcxproj">
+ <ProjectReference Include="fltk3.vcxproj">
<Project>{E070AAFC-9D03-41A3-BC7D-30887EA0D50F}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
Modified: branches/branch-3.0/ide/VisualC2010/keyboard.vcxproj
===================================================================
--- branches/branch-3.0/ide/VisualC2010/keyboard.vcxproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2010/keyboard.vcxproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltkd.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3d.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\keyboardd.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -114,7 +114,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltk.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\keyboard.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -156,7 +156,7 @@
</CustomBuild>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="fltk.vcxproj">
+ <ProjectReference Include="fltk3.vcxproj">
<Project>{E070AAFC-9D03-41A3-BC7D-30887EA0D50F}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
Modified: branches/branch-3.0/ide/VisualC2010/label.vcxproj
===================================================================
--- branches/branch-3.0/ide/VisualC2010/label.vcxproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2010/label.vcxproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltkd.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3d.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\labeld.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -114,7 +114,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltk.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\label.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -137,7 +137,7 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="fltk.vcxproj">
+ <ProjectReference Include="fltk3.vcxproj">
<Project>{E070AAFC-9D03-41A3-BC7D-30887EA0D50F}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
Modified: branches/branch-3.0/ide/VisualC2010/line_style.vcxproj
===================================================================
--- branches/branch-3.0/ide/VisualC2010/line_style.vcxproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2010/line_style.vcxproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltkd.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3d.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\line_styled.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -114,7 +114,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltk.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\line_style.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -137,7 +137,7 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="fltk.vcxproj">
+ <ProjectReference Include="fltk3.vcxproj">
<Project>{E070AAFC-9D03-41A3-BC7D-30887EA0D50F}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
Modified: branches/branch-3.0/ide/VisualC2010/list_visuals.vcxproj
===================================================================
--- branches/branch-3.0/ide/VisualC2010/list_visuals.vcxproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2010/list_visuals.vcxproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltkd.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3d.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\list_visualsd.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -114,7 +114,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltk.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\list_visuals.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -137,7 +137,7 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="fltk.vcxproj">
+ <ProjectReference Include="fltk3.vcxproj">
<Project>{E070AAFC-9D03-41A3-BC7D-30887EA0D50F}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
Modified: branches/branch-3.0/ide/VisualC2010/mandelbrot.vcxproj
===================================================================
--- branches/branch-3.0/ide/VisualC2010/mandelbrot.vcxproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2010/mandelbrot.vcxproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltkd.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3d.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\mandelbrotd.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -114,7 +114,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltk.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\mandelbrot.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -156,7 +156,7 @@
</CustomBuild>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="fltk.vcxproj">
+ <ProjectReference Include="fltk3.vcxproj">
<Project>{E070AAFC-9D03-41A3-BC7D-30887EA0D50F}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
Modified: branches/branch-3.0/ide/VisualC2010/menubar.vcxproj
===================================================================
--- branches/branch-3.0/ide/VisualC2010/menubar.vcxproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2010/menubar.vcxproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltkd.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3d.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\menubard.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -114,7 +114,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltk.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\menubar.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -137,7 +137,7 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="fltk.vcxproj">
+ <ProjectReference Include="fltk3.vcxproj">
<Project>{E070AAFC-9D03-41A3-BC7D-30887EA0D50F}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
Modified: branches/branch-3.0/ide/VisualC2010/message.vcxproj
===================================================================
--- branches/branch-3.0/ide/VisualC2010/message.vcxproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2010/message.vcxproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltkd.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3d.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\messaged.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -114,7 +114,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltk.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\message.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -137,7 +137,7 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="fltk.vcxproj">
+ <ProjectReference Include="fltk3.vcxproj">
<Project>{E070AAFC-9D03-41A3-BC7D-30887EA0D50F}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
Modified: branches/branch-3.0/ide/VisualC2010/minimum.vcxproj
===================================================================
--- branches/branch-3.0/ide/VisualC2010/minimum.vcxproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2010/minimum.vcxproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltkd.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3d.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\minimumd.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -114,7 +114,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltk.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\minimum.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -137,7 +137,7 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="fltk.vcxproj">
+ <ProjectReference Include="fltk3.vcxproj">
<Project>{E070AAFC-9D03-41A3-BC7D-30887EA0D50F}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
Modified: branches/branch-3.0/ide/VisualC2010/native-filechooser.vcxproj
===================================================================
--- branches/branch-3.0/ide/VisualC2010/native-filechooser.vcxproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2010/native-filechooser.vcxproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltkd.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3imagesd.lib;fltk3d.lib;fltk3pngd.lib;fltk3jpegd.lib;fltk3zlibd.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\native-filechooserd.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -114,7 +114,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltk.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3images.lib;fltk3.lib;fltk3png.lib;fltk3jpeg.lib;fltk3zlib.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\native-filechooser.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -137,10 +137,26 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="fltk.vcxproj">
+ <ProjectReference Include="fltk3images.vcxproj">
+ <Project>{4527AC02-4EB6-41C9-8ECA-819F7725A9BF}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ <ProjectReference Include="fltk3.vcxproj">
<Project>{E070AAFC-9D03-41A3-BC7D-30887EA0D50F}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
+ <ProjectReference Include="fltk3png.vcxproj">
+ <Project>{A6556097-732F-4D5C-9763-96A896DA0F8F}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ <ProjectReference Include="fltk3jpeg.vcxproj">
+ <Project>{845449C0-BCC9-4404-89DC-52E53E80F8D0}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ <ProjectReference Include="fltk3zlib.vcxproj">
+ <Project>{8051E81E-8228-43EA-AABA-FE4E48CB10AD}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
Modified: branches/branch-3.0/ide/VisualC2010/navigation.vcxproj
===================================================================
--- branches/branch-3.0/ide/VisualC2010/navigation.vcxproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2010/navigation.vcxproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltkd.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3d.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\navigationd.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -114,7 +114,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltk.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\navigation.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -137,7 +137,7 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="fltk.vcxproj">
+ <ProjectReference Include="fltk3.vcxproj">
<Project>{E070AAFC-9D03-41A3-BC7D-30887EA0D50F}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
Modified: branches/branch-3.0/ide/VisualC2010/output.vcxproj
===================================================================
--- branches/branch-3.0/ide/VisualC2010/output.vcxproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2010/output.vcxproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltkd.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3d.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\outputd.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -114,7 +114,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltk.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\output.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -137,7 +137,7 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="fltk.vcxproj">
+ <ProjectReference Include="fltk3.vcxproj">
<Project>{E070AAFC-9D03-41A3-BC7D-30887EA0D50F}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
Modified: branches/branch-3.0/ide/VisualC2010/overlay.vcxproj
===================================================================
--- branches/branch-3.0/ide/VisualC2010/overlay.vcxproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2010/overlay.vcxproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltkd.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3d.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\overlayd.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -114,7 +114,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltk.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\overlay.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -137,7 +137,7 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="fltk.vcxproj">
+ <ProjectReference Include="fltk3.vcxproj">
<Project>{E070AAFC-9D03-41A3-BC7D-30887EA0D50F}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
Modified: branches/branch-3.0/ide/VisualC2010/pack.vcxproj
===================================================================
--- branches/branch-3.0/ide/VisualC2010/pack.vcxproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2010/pack.vcxproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltkd.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3d.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\packd.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -114,7 +114,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltk.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\pack.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -137,7 +137,7 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="fltk.vcxproj">
+ <ProjectReference Include="fltk3.vcxproj">
<Project>{E070AAFC-9D03-41A3-BC7D-30887EA0D50F}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
Modified: branches/branch-3.0/ide/VisualC2010/pixmap.vcxproj
===================================================================
--- branches/branch-3.0/ide/VisualC2010/pixmap.vcxproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2010/pixmap.vcxproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltkd.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3d.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\pixmapd.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -114,7 +114,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltk.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\pixmap.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -137,7 +137,7 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="fltk.vcxproj">
+ <ProjectReference Include="fltk3.vcxproj">
<Project>{E070AAFC-9D03-41A3-BC7D-30887EA0D50F}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
Modified: branches/branch-3.0/ide/VisualC2010/pixmap_browser.vcxproj
===================================================================
--- branches/branch-3.0/ide/VisualC2010/pixmap_browser.vcxproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2010/pixmap_browser.vcxproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltkd.lib;fltk_imagesd.lib;fltk_pngd.lib;fltk_jpegd.lib;fltk_zlibd.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3d.lib;fltk3imagesd.lib;fltk3pngd.lib;fltk3jpegd.lib;fltk3zlibd.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\pixmap_browserd.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -114,7 +114,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltk.lib;fltk_images.lib;fltk_png.lib;fltk_jpeg.lib;fltk_zlib.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3.lib;fltk3images.lib;fltk3png.lib;fltk3jpeg.lib;fltk3zlib.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\pixmap_browser.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -137,23 +137,23 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="fltk.vcxproj">
+ <ProjectReference Include="fltk3.vcxproj">
<Project>{E070AAFC-9D03-41A3-BC7D-30887EA0D50F}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
- <ProjectReference Include="fltk_images.vcxproj">
+ <ProjectReference Include="fltk3images.vcxproj">
<Project>{4527AC02-4EB6-41C9-8ECA-819F7725A9BF}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
- <ProjectReference Include="fltk_png.vcxproj">
+ <ProjectReference Include="fltk3png.vcxproj">
<Project>{A6556097-732F-4D5C-9763-96A896DA0F8F}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
- <ProjectReference Include="fltk_jpeg.vcxproj">
+ <ProjectReference Include="fltk3jpeg.vcxproj">
<Project>{845449C0-BCC9-4404-89DC-52E53E80F8D0}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
- <ProjectReference Include="fltk_zlib.vcxproj">
+ <ProjectReference Include="fltk3zlib.vcxproj">
<Project>{8051E81E-8228-43EA-AABA-FE4E48CB10AD}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
Modified: branches/branch-3.0/ide/VisualC2010/preferences.vcxproj
===================================================================
--- branches/branch-3.0/ide/VisualC2010/preferences.vcxproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2010/preferences.vcxproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltkd.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3d.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\preferencesd.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -114,7 +114,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltk.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\preferences.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -149,7 +149,7 @@
</CustomBuild>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="fltk.vcxproj">
+ <ProjectReference Include="fltk3.vcxproj">
<Project>{E070AAFC-9D03-41A3-BC7D-30887EA0D50F}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
Modified: branches/branch-3.0/ide/VisualC2010/radio.vcxproj
===================================================================
--- branches/branch-3.0/ide/VisualC2010/radio.vcxproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2010/radio.vcxproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltkd.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3d.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\radiod.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -114,7 +114,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltk.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\radio.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -149,7 +149,7 @@
</CustomBuild>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="fltk.vcxproj">
+ <ProjectReference Include="fltk3.vcxproj">
<Project>{E070AAFC-9D03-41A3-BC7D-30887EA0D50F}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
Modified: branches/branch-3.0/ide/VisualC2010/resize.vcxproj
===================================================================
--- branches/branch-3.0/ide/VisualC2010/resize.vcxproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2010/resize.vcxproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltkd.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3d.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\resized.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -114,7 +114,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltk.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\resize.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -149,7 +149,7 @@
</CustomBuild>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="fltk.vcxproj">
+ <ProjectReference Include="fltk3.vcxproj">
<Project>{E070AAFC-9D03-41A3-BC7D-30887EA0D50F}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
Modified: branches/branch-3.0/ide/VisualC2010/resizebox.vcxproj
===================================================================
--- branches/branch-3.0/ide/VisualC2010/resizebox.vcxproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2010/resizebox.vcxproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltkd.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3d.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\resizeboxd.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -114,7 +114,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltk.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\resizebox.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -137,7 +137,7 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="fltk.vcxproj">
+ <ProjectReference Include="fltk3.vcxproj">
<Project>{E070AAFC-9D03-41A3-BC7D-30887EA0D50F}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
Modified: branches/branch-3.0/ide/VisualC2010/rotated_text.vcxproj
===================================================================
--- branches/branch-3.0/ide/VisualC2010/rotated_text.vcxproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2010/rotated_text.vcxproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltkd.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3d.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\rotated_textd.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -114,7 +114,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltk.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\rotated_text.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -137,7 +137,7 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="fltk.vcxproj">
+ <ProjectReference Include="fltk3.vcxproj">
<Project>{E070AAFC-9D03-41A3-BC7D-30887EA0D50F}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
Modified: branches/branch-3.0/ide/VisualC2010/scroll.vcxproj
===================================================================
--- branches/branch-3.0/ide/VisualC2010/scroll.vcxproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2010/scroll.vcxproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltkd.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3d.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\scrolld.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -114,7 +114,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltk.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\scroll.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -137,7 +137,7 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="fltk.vcxproj">
+ <ProjectReference Include="fltk3.vcxproj">
<Project>{E070AAFC-9D03-41A3-BC7D-30887EA0D50F}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
Modified: branches/branch-3.0/ide/VisualC2010/shape.vcxproj
===================================================================
--- branches/branch-3.0/ide/VisualC2010/shape.vcxproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2010/shape.vcxproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltkd.lib;fltk_gld.lib;glu32.lib;opengl32.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3d.lib;fltk3gld.lib;glu32.lib;opengl32.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\shaped.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -114,7 +114,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltk.lib;fltk_gl.lib;glu32.lib;opengl32.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3.lib;fltk3gl.lib;glu32.lib;opengl32.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\shape.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -137,11 +137,11 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="fltk.vcxproj">
+ <ProjectReference Include="fltk3.vcxproj">
<Project>{E070AAFC-9D03-41A3-BC7D-30887EA0D50F}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
- <ProjectReference Include="fltk_gl.vcxproj">
+ <ProjectReference Include="fltk3gl.vcxproj">
<Project>{42E7DB4F-8A12-431D-B651-4FADDD74F327}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
Modified: branches/branch-3.0/ide/VisualC2010/subwindow.vcxproj
===================================================================
--- branches/branch-3.0/ide/VisualC2010/subwindow.vcxproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2010/subwindow.vcxproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltkd.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3d.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\subwindowd.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -114,7 +114,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltk.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\subwindow.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -137,7 +137,7 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="fltk.vcxproj">
+ <ProjectReference Include="fltk3.vcxproj">
<Project>{E070AAFC-9D03-41A3-BC7D-30887EA0D50F}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
Modified: branches/branch-3.0/ide/VisualC2010/sudoku.vcxproj
===================================================================
--- branches/branch-3.0/ide/VisualC2010/sudoku.vcxproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2010/sudoku.vcxproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltkd.lib;fltk_imagesd.lib;fltk_pngd.lib;fltk_jpegd.lib;fltk_zlibd.lib;winmm.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3imagesd.lib;fltk3d.lib;fltk3pngd.lib;fltk3jpegd.lib;fltk3zlibd.lib;winmm.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\sudokud.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -114,7 +114,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltk.lib;fltk_images.lib;fltk_png.lib;fltk_jpeg.lib;fltk_zlib.lib;winmm.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3images.lib;fltk3.lib;fltk3png.lib;fltk3jpeg.lib;fltk3zlib.lib;winmm.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\sudoku.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -137,23 +137,23 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="fltk.vcxproj">
- <Project>{E070AAFC-9D03-41A3-BC7D-30887EA0D50F}</Project>
+ <ProjectReference Include="fltk3images.vcxproj">
+ <Project>{4527AC02-4EB6-41C9-8ECA-819F7725A9BF}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
- <ProjectReference Include="fltk_images.vcxproj">
- <Project>{4527AC02-4EB6-41C9-8ECA-819F7725A9BF}</Project>
+ <ProjectReference Include="fltk3.vcxproj">
+ <Project>{E070AAFC-9D03-41A3-BC7D-30887EA0D50F}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
- <ProjectReference Include="fltk_png.vcxproj">
+ <ProjectReference Include="fltk3png.vcxproj">
<Project>{A6556097-732F-4D5C-9763-96A896DA0F8F}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
- <ProjectReference Include="fltk_jpeg.vcxproj">
+ <ProjectReference Include="fltk3jpeg.vcxproj">
<Project>{845449C0-BCC9-4404-89DC-52E53E80F8D0}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
- <ProjectReference Include="fltk_zlib.vcxproj">
+ <ProjectReference Include="fltk3zlib.vcxproj">
<Project>{8051E81E-8228-43EA-AABA-FE4E48CB10AD}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
Modified: branches/branch-3.0/ide/VisualC2010/symbols.vcxproj
===================================================================
--- branches/branch-3.0/ide/VisualC2010/symbols.vcxproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2010/symbols.vcxproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltkd.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3d.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\symbolsd.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -114,7 +114,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltk.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\symbols.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -137,7 +137,7 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="fltk.vcxproj">
+ <ProjectReference Include="fltk3.vcxproj">
<Project>{E070AAFC-9D03-41A3-BC7D-30887EA0D50F}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
Modified: branches/branch-3.0/ide/VisualC2010/table.vcxproj
===================================================================
--- branches/branch-3.0/ide/VisualC2010/table.vcxproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2010/table.vcxproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltkd.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3d.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\tabled.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -114,7 +114,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltk.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\table.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -137,7 +137,7 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="fltk.vcxproj">
+ <ProjectReference Include="fltk3.vcxproj">
<Project>{E070AAFC-9D03-41A3-BC7D-30887EA0D50F}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
Modified: branches/branch-3.0/ide/VisualC2010/tabs.vcxproj
===================================================================
--- branches/branch-3.0/ide/VisualC2010/tabs.vcxproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2010/tabs.vcxproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltkd.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3d.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\tabsd.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -114,7 +114,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltk.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\tabs.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -149,7 +149,7 @@
</CustomBuild>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="fltk.vcxproj">
+ <ProjectReference Include="fltk3.vcxproj">
<Project>{E070AAFC-9D03-41A3-BC7D-30887EA0D50F}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
Modified: branches/branch-3.0/ide/VisualC2010/threads.vcxproj
===================================================================
--- branches/branch-3.0/ide/VisualC2010/threads.vcxproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2010/threads.vcxproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltkd.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3d.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\threadsd.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -114,7 +114,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltk.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\threads.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -137,7 +137,7 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="fltk.vcxproj">
+ <ProjectReference Include="fltk3.vcxproj">
<Project>{E070AAFC-9D03-41A3-BC7D-30887EA0D50F}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
Modified: branches/branch-3.0/ide/VisualC2010/tile.vcxproj
===================================================================
--- branches/branch-3.0/ide/VisualC2010/tile.vcxproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2010/tile.vcxproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltkd.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3d.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\tiled.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -114,7 +114,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltk.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\tile.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -137,7 +137,7 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="fltk.vcxproj">
+ <ProjectReference Include="fltk3.vcxproj">
<Project>{E070AAFC-9D03-41A3-BC7D-30887EA0D50F}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
Modified: branches/branch-3.0/ide/VisualC2010/tiled_image.vcxproj
===================================================================
--- branches/branch-3.0/ide/VisualC2010/tiled_image.vcxproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2010/tiled_image.vcxproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltkd.lib;fltk_imagesd.lib;fltk_pngd.lib;fltk_jpegd.lib;fltk_zlibd.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3d.lib;fltk3imagesd.lib;fltk3pngd.lib;fltk3jpegd.lib;fltk3zlibd.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\tiled_imaged.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -114,7 +114,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltk.lib;fltk_images.lib;fltk_png.lib;fltk_jpeg.lib;fltk_zlib.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3.lib;fltk3images.lib;fltk3png.lib;fltk3jpeg.lib;fltk3zlib.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\tiled_image.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -137,23 +137,23 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="fltk.vcxproj">
+ <ProjectReference Include="fltk3.vcxproj">
<Project>{E070AAFC-9D03-41A3-BC7D-30887EA0D50F}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
- <ProjectReference Include="fltk_images.vcxproj">
+ <ProjectReference Include="fltk3images.vcxproj">
<Project>{4527AC02-4EB6-41C9-8ECA-819F7725A9BF}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
- <ProjectReference Include="fltk_png.vcxproj">
+ <ProjectReference Include="fltk3png.vcxproj">
<Project>{A6556097-732F-4D5C-9763-96A896DA0F8F}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
- <ProjectReference Include="fltk_jpeg.vcxproj">
+ <ProjectReference Include="fltk3jpeg.vcxproj">
<Project>{845449C0-BCC9-4404-89DC-52E53E80F8D0}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
- <ProjectReference Include="fltk_zlib.vcxproj">
+ <ProjectReference Include="fltk3zlib.vcxproj">
<Project>{8051E81E-8228-43EA-AABA-FE4E48CB10AD}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
Modified: branches/branch-3.0/ide/VisualC2010/tree.vcxproj
===================================================================
--- branches/branch-3.0/ide/VisualC2010/tree.vcxproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2010/tree.vcxproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltkd.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3d.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\treed.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -114,7 +114,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltk.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\tree.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -149,7 +149,7 @@
</CustomBuild>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="fltk.vcxproj">
+ <ProjectReference Include="fltk3.vcxproj">
<Project>{E070AAFC-9D03-41A3-BC7D-30887EA0D50F}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
Modified: branches/branch-3.0/ide/VisualC2010/unittests.vcxproj
===================================================================
--- branches/branch-3.0/ide/VisualC2010/unittests.vcxproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2010/unittests.vcxproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltkd.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3d.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\unittestsd.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -114,7 +114,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltk.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\unittests.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -200,7 +200,7 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="fltk.vcxproj">
+ <ProjectReference Include="fltk3.vcxproj">
<Project>{E070AAFC-9D03-41A3-BC7D-30887EA0D50F}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
Modified: branches/branch-3.0/ide/VisualC2010/utf8.vcxproj
===================================================================
--- branches/branch-3.0/ide/VisualC2010/utf8.vcxproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2010/utf8.vcxproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltkd.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3d.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\utf8d.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -114,7 +114,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltk.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\utf8.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -137,7 +137,7 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="fltk.vcxproj">
+ <ProjectReference Include="fltk3.vcxproj">
<Project>{E070AAFC-9D03-41A3-BC7D-30887EA0D50F}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
Modified: branches/branch-3.0/ide/VisualC2010/valuators.vcxproj
===================================================================
--- branches/branch-3.0/ide/VisualC2010/valuators.vcxproj 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC2010/valuators.vcxproj 2011-08-22 19:53:15 UTC (rev 8996)
@@ -70,7 +70,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltkd.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3d.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\valuatorsd.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -114,7 +114,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>fltk.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>fltk3.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\test\valuators.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -149,7 +149,7 @@
</CustomBuild>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="fltk.vcxproj">
+ <ProjectReference Include="fltk3.vcxproj">
<Project>{E070AAFC-9D03-41A3-BC7D-30887EA0D50F}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
Modified: branches/branch-3.0/ide/VisualC6/CubeView.dsp
===================================================================
--- branches/branch-3.0/ide/VisualC6/CubeView.dsp 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC6/CubeView.dsp 2011-08-22 19:53:15 UTC (rev 8996)
@@ -43,7 +43,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\.." /I "..\..\zlib" /I "..\..\png" /I "..\..\jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 fltk.lib fltk_gl.lib glu32.lib opengl32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/CubeView.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3.lib fltk3gl.lib glu32.lib opengl32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/CubeView.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:yes
!ELSEIF "$(CFG)" == "CubeView - Win32 Debug"
@@ -70,7 +70,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\.." /I "..\../zlib" /I "..\../png" /I "..\../jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -80,7 +80,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 fltkd.lib fltk_gld.lib glu32.lib opengl32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/CubeViewd.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3d.lib fltk3gld.lib glu32.lib opengl32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/CubeViewd.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:no
!ENDIF
Modified: branches/branch-3.0/ide/VisualC6/Demo.dsp
===================================================================
--- branches/branch-3.0/ide/VisualC6/Demo.dsp 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC6/Demo.dsp 2011-08-22 19:53:15 UTC (rev 8996)
@@ -43,7 +43,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\.." /I "..\..\zlib" /I "..\..\png" /I "..\..\jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 fltk.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/Demo.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/Demo.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:yes
!ELSEIF "$(CFG)" == "Demo - Win32 Debug"
@@ -70,7 +70,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\.." /I "..\../zlib" /I "..\../png" /I "..\../jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -80,7 +80,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 fltkd.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/Demod.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3d.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/Demod.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:no
!ENDIF
Modified: branches/branch-3.0/ide/VisualC6/Fluid.dsp
===================================================================
--- branches/branch-3.0/ide/VisualC6/Fluid.dsp 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC6/Fluid.dsp 2011-08-22 19:53:15 UTC (rev 8996)
@@ -43,7 +43,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\.." /I "..\..\zlib" /I "..\..\png" /I "..\..\jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 fltk.lib fltk_images.lib fltk_png.lib fltk_jpeg.lib fltk_zlib.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../fluid/Fluid.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3.lib fltk3images.lib fltk3png.lib fltk3jpeg.lib fltk3zlib.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../fluid/Fluid.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:yes
!ELSEIF "$(CFG)" == "Fluid - Win32 Debug"
@@ -70,7 +70,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\.." /I "..\../zlib" /I "..\../png" /I "..\../jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -80,7 +80,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 fltkd.lib fltk_imagesd.lib fltk_pngd.lib fltk_jpegd.lib fltk_zlibd.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../fluid/Fluidd.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3d.lib fltk3imagesd.lib fltk3pngd.lib fltk3jpegd.lib fltk3zlibd.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../fluid/Fluidd.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:no
!ENDIF
Modified: branches/branch-3.0/ide/VisualC6/adjuster.dsp
===================================================================
--- branches/branch-3.0/ide/VisualC6/adjuster.dsp 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC6/adjuster.dsp 2011-08-22 19:53:15 UTC (rev 8996)
@@ -43,7 +43,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\.." /I "..\..\zlib" /I "..\..\png" /I "..\..\jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 fltk.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/adjuster.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/adjuster.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:yes
!ELSEIF "$(CFG)" == "adjuster - Win32 Debug"
@@ -70,7 +70,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\.." /I "..\../zlib" /I "..\../png" /I "..\../jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -80,7 +80,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 fltkd.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/adjusterd.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3d.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/adjusterd.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:no
!ENDIF
Modified: branches/branch-3.0/ide/VisualC6/arc.dsp
===================================================================
--- branches/branch-3.0/ide/VisualC6/arc.dsp 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC6/arc.dsp 2011-08-22 19:53:15 UTC (rev 8996)
@@ -43,7 +43,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\.." /I "..\..\zlib" /I "..\..\png" /I "..\..\jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 fltk.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/arc.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/arc.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:yes
!ELSEIF "$(CFG)" == "arc - Win32 Debug"
@@ -70,7 +70,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\.." /I "..\../zlib" /I "..\../png" /I "..\../jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -80,7 +80,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 fltkd.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/arcd.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3d.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/arcd.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:no
!ENDIF
Modified: branches/branch-3.0/ide/VisualC6/ask.dsp
===================================================================
--- branches/branch-3.0/ide/VisualC6/ask.dsp 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC6/ask.dsp 2011-08-22 19:53:15 UTC (rev 8996)
@@ -43,7 +43,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\.." /I "..\..\zlib" /I "..\..\png" /I "..\..\jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 fltk.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/ask.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/ask.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:yes
!ELSEIF "$(CFG)" == "ask - Win32 Debug"
@@ -70,7 +70,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\.." /I "..\../zlib" /I "..\../png" /I "..\../jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -80,7 +80,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 fltkd.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/askd.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3d.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/askd.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:no
!ENDIF
Modified: branches/branch-3.0/ide/VisualC6/bitmap.dsp
===================================================================
--- branches/branch-3.0/ide/VisualC6/bitmap.dsp 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC6/bitmap.dsp 2011-08-22 19:53:15 UTC (rev 8996)
@@ -43,7 +43,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\.." /I "..\..\zlib" /I "..\..\png" /I "..\..\jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 fltk.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/bitmap.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/bitmap.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:yes
!ELSEIF "$(CFG)" == "bitmap - Win32 Debug"
@@ -70,7 +70,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\.." /I "..\../zlib" /I "..\../png" /I "..\../jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -80,7 +80,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 fltkd.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/bitmapd.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3d.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/bitmapd.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:no
!ENDIF
Modified: branches/branch-3.0/ide/VisualC6/blocks.dsp
===================================================================
--- branches/branch-3.0/ide/VisualC6/blocks.dsp 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC6/blocks.dsp 2011-08-22 19:53:15 UTC (rev 8996)
@@ -43,7 +43,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\.." /I "..\..\zlib" /I "..\..\png" /I "..\..\jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 fltk.lib winmm.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/blocks.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3.lib winmm.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/blocks.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:yes
!ELSEIF "$(CFG)" == "blocks - Win32 Debug"
@@ -70,7 +70,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\.." /I "..\../zlib" /I "..\../png" /I "..\../jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -80,7 +80,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 fltkd.lib winmm.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/blocksd.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3d.lib winmm.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/blocksd.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:no
!ENDIF
Modified: branches/branch-3.0/ide/VisualC6/boxtype.dsp
===================================================================
--- branches/branch-3.0/ide/VisualC6/boxtype.dsp 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC6/boxtype.dsp 2011-08-22 19:53:15 UTC (rev 8996)
@@ -43,7 +43,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\.." /I "..\..\zlib" /I "..\..\png" /I "..\..\jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 fltk.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/boxtype.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/boxtype.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:yes
!ELSEIF "$(CFG)" == "boxtype - Win32 Debug"
@@ -70,7 +70,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\.." /I "..\../zlib" /I "..\../png" /I "..\../jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -80,7 +80,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 fltkd.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/boxtyped.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3d.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/boxtyped.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:no
!ENDIF
Modified: branches/branch-3.0/ide/VisualC6/browser.dsp
===================================================================
--- branches/branch-3.0/ide/VisualC6/browser.dsp 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC6/browser.dsp 2011-08-22 19:53:15 UTC (rev 8996)
@@ -43,7 +43,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\.." /I "..\..\zlib" /I "..\..\png" /I "..\..\jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 fltk.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/browser.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/browser.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:yes
!ELSEIF "$(CFG)" == "browser - Win32 Debug"
@@ -70,7 +70,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\.." /I "..\../zlib" /I "..\../png" /I "..\../jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -80,7 +80,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 fltkd.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/browserd.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3d.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/browserd.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:no
!ENDIF
Modified: branches/branch-3.0/ide/VisualC6/button.dsp
===================================================================
--- branches/branch-3.0/ide/VisualC6/button.dsp 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC6/button.dsp 2011-08-22 19:53:15 UTC (rev 8996)
@@ -43,7 +43,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\.." /I "..\..\zlib" /I "..\..\png" /I "..\..\jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 fltk.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/button.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/button.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:yes
!ELSEIF "$(CFG)" == "button - Win32 Debug"
@@ -70,7 +70,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\.." /I "..\../zlib" /I "..\../png" /I "..\../jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -80,7 +80,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 fltkd.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/buttond.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3d.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/buttond.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:no
!ENDIF
Modified: branches/branch-3.0/ide/VisualC6/buttons.dsp
===================================================================
--- branches/branch-3.0/ide/VisualC6/buttons.dsp 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC6/buttons.dsp 2011-08-22 19:53:15 UTC (rev 8996)
@@ -43,7 +43,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\.." /I "..\..\zlib" /I "..\..\png" /I "..\..\jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 fltk.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/buttons.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/buttons.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:yes
!ELSEIF "$(CFG)" == "buttons - Win32 Debug"
@@ -70,7 +70,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\.." /I "..\../zlib" /I "..\../png" /I "..\../jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -80,7 +80,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 fltkd.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/buttonsd.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3d.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/buttonsd.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:no
!ENDIF
Modified: branches/branch-3.0/ide/VisualC6/checkers.dsp
===================================================================
--- branches/branch-3.0/ide/VisualC6/checkers.dsp 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC6/checkers.dsp 2011-08-22 19:53:15 UTC (rev 8996)
@@ -43,7 +43,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\.." /I "..\..\zlib" /I "..\..\png" /I "..\..\jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 fltk.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/checkers.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/checkers.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:yes
!ELSEIF "$(CFG)" == "checkers - Win32 Debug"
@@ -70,7 +70,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\.." /I "..\../zlib" /I "..\../png" /I "..\../jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -80,7 +80,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 fltkd.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/checkersd.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3d.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/checkersd.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:no
!ENDIF
Modified: branches/branch-3.0/ide/VisualC6/clock.dsp
===================================================================
--- branches/branch-3.0/ide/VisualC6/clock.dsp 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC6/clock.dsp 2011-08-22 19:53:15 UTC (rev 8996)
@@ -43,7 +43,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\.." /I "..\..\zlib" /I "..\..\png" /I "..\..\jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 fltk.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/clock.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/clock.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:yes
!ELSEIF "$(CFG)" == "clock - Win32 Debug"
@@ -70,7 +70,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\.." /I "..\../zlib" /I "..\../png" /I "..\../jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -80,7 +80,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 fltkd.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/clockd.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3d.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/clockd.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:no
!ENDIF
Modified: branches/branch-3.0/ide/VisualC6/colbrowser.dsp
===================================================================
--- branches/branch-3.0/ide/VisualC6/colbrowser.dsp 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC6/colbrowser.dsp 2011-08-22 19:53:15 UTC (rev 8996)
@@ -43,7 +43,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\.." /I "..\..\zlib" /I "..\..\png" /I "..\..\jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 fltk.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/colbrowser.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/colbrowser.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:yes
!ELSEIF "$(CFG)" == "colbrowser - Win32 Debug"
@@ -70,7 +70,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\.." /I "..\../zlib" /I "..\../png" /I "..\../jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -80,7 +80,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 fltkd.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/colbrowserd.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3d.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/colbrowserd.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:no
!ENDIF
Modified: branches/branch-3.0/ide/VisualC6/color_chooser.dsp
===================================================================
--- branches/branch-3.0/ide/VisualC6/color_chooser.dsp 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC6/color_chooser.dsp 2011-08-22 19:53:15 UTC (rev 8996)
@@ -43,7 +43,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\.." /I "..\..\zlib" /I "..\..\png" /I "..\..\jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 fltk.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/color_chooser.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/color_chooser.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:yes
!ELSEIF "$(CFG)" == "color_chooser - Win32 Debug"
@@ -70,7 +70,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\.." /I "..\../zlib" /I "..\../png" /I "..\../jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -80,7 +80,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 fltkd.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/color_chooserd.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3d.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/color_chooserd.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:no
!ENDIF
Modified: branches/branch-3.0/ide/VisualC6/cube.dsp
===================================================================
--- branches/branch-3.0/ide/VisualC6/cube.dsp 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC6/cube.dsp 2011-08-22 19:53:15 UTC (rev 8996)
@@ -43,7 +43,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\.." /I "..\..\zlib" /I "..\..\png" /I "..\..\jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 fltk.lib fltk_gl.lib glu32.lib opengl32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/cube.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3.lib fltk3gl.lib glu32.lib opengl32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/cube.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:yes
!ELSEIF "$(CFG)" == "cube - Win32 Debug"
@@ -70,7 +70,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\.." /I "..\../zlib" /I "..\../png" /I "..\../jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -80,7 +80,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 fltkd.lib fltk_gld.lib glu32.lib opengl32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/cubed.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3d.lib fltk3gld.lib glu32.lib opengl32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/cubed.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:no
!ENDIF
Modified: branches/branch-3.0/ide/VisualC6/cursor.dsp
===================================================================
--- branches/branch-3.0/ide/VisualC6/cursor.dsp 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC6/cursor.dsp 2011-08-22 19:53:15 UTC (rev 8996)
@@ -43,7 +43,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\.." /I "..\..\zlib" /I "..\..\png" /I "..\..\jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 fltk.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/cursor.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/cursor.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:yes
!ELSEIF "$(CFG)" == "cursor - Win32 Debug"
@@ -70,7 +70,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\.." /I "..\../zlib" /I "..\../png" /I "..\../jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -80,7 +80,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 fltkd.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/cursord.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3d.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/cursord.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:no
!ENDIF
Modified: branches/branch-3.0/ide/VisualC6/curve.dsp
===================================================================
--- branches/branch-3.0/ide/VisualC6/curve.dsp 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC6/curve.dsp 2011-08-22 19:53:15 UTC (rev 8996)
@@ -43,7 +43,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\.." /I "..\..\zlib" /I "..\..\png" /I "..\..\jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 fltk.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/curve.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/curve.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:yes
!ELSEIF "$(CFG)" == "curve - Win32 Debug"
@@ -70,7 +70,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\.." /I "..\../zlib" /I "..\../png" /I "..\../jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -80,7 +80,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 fltkd.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/curved.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3d.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/curved.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:no
!ENDIF
Modified: branches/branch-3.0/ide/VisualC6/device.dsp
===================================================================
--- branches/branch-3.0/ide/VisualC6/device.dsp 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC6/device.dsp 2011-08-22 19:53:15 UTC (rev 8996)
@@ -43,7 +43,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\.." /I "..\..\zlib" /I "..\..\png" /I "..\..\jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 fltk.lib fltk_images.lib fltk_png.lib fltk_jpeg.lib fltk_zlib.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/device.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3images.lib fltk3.lib fltk3png.lib fltk3jpeg.lib fltk3zlib.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/device.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:yes
!ELSEIF "$(CFG)" == "device - Win32 Debug"
@@ -70,7 +70,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\.." /I "..\../zlib" /I "..\../png" /I "..\../jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -80,7 +80,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 fltkd.lib fltk_imagesd.lib fltk_pngd.lib fltk_jpegd.lib fltk_zlibd.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/deviced.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3imagesd.lib fltk3d.lib fltk3pngd.lib fltk3jpegd.lib fltk3zlibd.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/deviced.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:no
!ENDIF
Modified: branches/branch-3.0/ide/VisualC6/doublebuffer.dsp
===================================================================
--- branches/branch-3.0/ide/VisualC6/doublebuffer.dsp 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC6/doublebuffer.dsp 2011-08-22 19:53:15 UTC (rev 8996)
@@ -43,7 +43,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\.." /I "..\..\zlib" /I "..\..\png" /I "..\..\jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 fltk.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/doublebuffer.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/doublebuffer.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:yes
!ELSEIF "$(CFG)" == "doublebuffer - Win32 Debug"
@@ -70,7 +70,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\.." /I "..\../zlib" /I "..\../png" /I "..\../jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -80,7 +80,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 fltkd.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/doublebufferd.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3d.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/doublebufferd.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:no
!ENDIF
Modified: branches/branch-3.0/ide/VisualC6/editor.dsp
===================================================================
--- branches/branch-3.0/ide/VisualC6/editor.dsp 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC6/editor.dsp 2011-08-22 19:53:15 UTC (rev 8996)
@@ -43,7 +43,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\.." /I "..\..\zlib" /I "..\..\png" /I "..\..\jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 fltk.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/editor.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3images.lib fltk3.lib fltk3png.lib fltk3jpeg.lib fltk3zlib.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/editor.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:yes
!ELSEIF "$(CFG)" == "editor - Win32 Debug"
@@ -70,7 +70,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\.." /I "..\../zlib" /I "..\../png" /I "..\../jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -80,7 +80,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 fltkd.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/editord.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3imagesd.lib fltk3d.lib fltk3pngd.lib fltk3jpegd.lib fltk3zlibd.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/editord.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:no
!ENDIF
Modified: branches/branch-3.0/ide/VisualC6/fast_slow.dsp
===================================================================
--- branches/branch-3.0/ide/VisualC6/fast_slow.dsp 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC6/fast_slow.dsp 2011-08-22 19:53:15 UTC (rev 8996)
@@ -43,7 +43,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\.." /I "..\..\zlib" /I "..\..\png" /I "..\..\jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 fltk.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/fast_slow.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/fast_slow.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:yes
!ELSEIF "$(CFG)" == "fast_slow - Win32 Debug"
@@ -70,7 +70,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\.." /I "..\../zlib" /I "..\../png" /I "..\../jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -80,7 +80,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 fltkd.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/fast_slowd.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3d.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/fast_slowd.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:no
!ENDIF
Modified: branches/branch-3.0/ide/VisualC6/file_chooser.dsp
===================================================================
--- branches/branch-3.0/ide/VisualC6/file_chooser.dsp 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC6/file_chooser.dsp 2011-08-22 19:53:15 UTC (rev 8996)
@@ -43,7 +43,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\.." /I "..\..\zlib" /I "..\..\png" /I "..\..\jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 fltk.lib fltk_images.lib fltk_png.lib fltk_jpeg.lib fltk_zlib.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/file_chooser.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3images.lib fltk3.lib fltk3png.lib fltk3jpeg.lib fltk3zlib.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/file_chooser.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:yes
!ELSEIF "$(CFG)" == "file_chooser - Win32 Debug"
@@ -70,7 +70,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\.." /I "..\../zlib" /I "..\../png" /I "..\../jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -80,7 +80,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 fltkd.lib fltk_imagesd.lib fltk_pngd.lib fltk_jpegd.lib fltk_zlibd.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/file_chooserd.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3imagesd.lib fltk3d.lib fltk3pngd.lib fltk3jpegd.lib fltk3zlibd.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/file_chooserd.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:no
!ENDIF
Modified: branches/branch-3.0/ide/VisualC6/fltk.dsw
===================================================================
--- branches/branch-3.0/ide/VisualC6/fltk.dsw 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC6/fltk.dsw 2011-08-22 19:53:15 UTC (rev 8996)
@@ -12,25 +12,25 @@
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name fltk
+ Project_Dep_Name fltk3
End Project Dependency
Begin Project Dependency
- Project_Dep_Name fltk_images
+ Project_Dep_Name fltk3images
End Project Dependency
Begin Project Dependency
- Project_Dep_Name fltk_png
+ Project_Dep_Name fltk3png
End Project Dependency
Begin Project Dependency
- Project_Dep_Name fltk_jpeg
+ Project_Dep_Name fltk3jpeg
End Project Dependency
Begin Project Dependency
- Project_Dep_Name fltk_zlib
+ Project_Dep_Name fltk3zlib
End Project Dependency
}}}
###############################################################################
-Project: "fltk"=".\fltk.dsp" - Package Owner=<4>
+Project: "fltk3"=".\fltk3.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -42,7 +42,7 @@
###############################################################################
-Project: "fltkdll"=".\fltkdll.dsp" - Package Owner=<4>
+Project: "fltk3dll"=".\fltk3dll.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -54,7 +54,7 @@
###############################################################################
-Project: "fltk_gl"=".\fltk_gl.dsp" - Package Owner=<4>
+Project: "fltk3gl"=".\fltk3gl.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -66,7 +66,7 @@
###############################################################################
-Project: "fltk_gldll"=".\fltk_gldll.dsp" - Package Owner=<4>
+Project: "fltk3gldll"=".\fltk3gldll.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -78,7 +78,7 @@
###############################################################################
-Project: "fltk_images"=".\fltk_images.dsp" - Package Owner=<4>
+Project: "fltk3images"=".\fltk3images.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -90,7 +90,7 @@
###############################################################################
-Project: "fltk_imagesdll"=".\fltk_imagesdll.dsp" - Package Owner=<4>
+Project: "fltk3imagesdll"=".\fltk3imagesdll.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -102,7 +102,7 @@
###############################################################################
-Project: "fltk_png"=".\fltk_png.dsp" - Package Owner=<4>
+Project: "fltk3png"=".\fltk3png.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -114,7 +114,7 @@
###############################################################################
-Project: "fltk_pngdll"=".\fltk_pngdll.dsp" - Package Owner=<4>
+Project: "fltk3pngdll"=".\fltk3pngdll.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -126,7 +126,7 @@
###############################################################################
-Project: "fltk_jpeg"=".\fltk_jpeg.dsp" - Package Owner=<4>
+Project: "fltk3jpeg"=".\fltk3jpeg.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -138,7 +138,7 @@
###############################################################################
-Project: "fltk_jpegdll"=".\fltk_jpegdll.dsp" - Package Owner=<4>
+Project: "fltk3jpegdll"=".\fltk3jpegdll.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -150,7 +150,7 @@
###############################################################################
-Project: "fltk_zlib"=".\fltk_zlib.dsp" - Package Owner=<4>
+Project: "fltk3zlib"=".\fltk3zlib.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -162,7 +162,7 @@
###############################################################################
-Project: "fltk_zlibdll"=".\fltk_zlibdll.dsp" - Package Owner=<4>
+Project: "fltk3zlibdll"=".\fltk3zlibdll.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -183,7 +183,7 @@
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name fltk
+ Project_Dep_Name fltk3
End Project Dependency
Begin Project Dependency
Project_Dep_Name adjuster
@@ -402,7 +402,7 @@
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name fltk
+ Project_Dep_Name fltk3
End Project Dependency
}}}
@@ -417,7 +417,7 @@
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name fltk
+ Project_Dep_Name fltk3
End Project Dependency
}}}
@@ -432,7 +432,7 @@
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name fltk
+ Project_Dep_Name fltk3
End Project Dependency
}}}
@@ -447,7 +447,7 @@
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name fltk
+ Project_Dep_Name fltk3
End Project Dependency
}}}
@@ -462,7 +462,7 @@
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name fltk
+ Project_Dep_Name fltk3
End Project Dependency
}}}
@@ -477,7 +477,7 @@
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name fltk
+ Project_Dep_Name fltk3
End Project Dependency
}}}
@@ -492,7 +492,7 @@
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name fltk
+ Project_Dep_Name fltk3
End Project Dependency
}}}
@@ -507,7 +507,7 @@
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name fltk
+ Project_Dep_Name fltk3
End Project Dependency
}}}
@@ -522,7 +522,7 @@
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name fltk
+ Project_Dep_Name fltk3
End Project Dependency
}}}
@@ -537,7 +537,7 @@
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name fltk
+ Project_Dep_Name fltk3
End Project Dependency
}}}
@@ -552,7 +552,7 @@
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name fltk
+ Project_Dep_Name fltk3
End Project Dependency
}}}
@@ -567,7 +567,7 @@
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name fltk
+ Project_Dep_Name fltk3
End Project Dependency
}}}
@@ -582,7 +582,7 @@
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name fltk
+ Project_Dep_Name fltk3
End Project Dependency
}}}
@@ -597,10 +597,10 @@
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name fltk
+ Project_Dep_Name fltk3
End Project Dependency
Begin Project Dependency
- Project_Dep_Name fltk_gl
+ Project_Dep_Name fltk3gl
End Project Dependency
}}}
@@ -615,10 +615,10 @@
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name fltk
+ Project_Dep_Name fltk3
End Project Dependency
Begin Project Dependency
- Project_Dep_Name fltk_gl
+ Project_Dep_Name fltk3gl
End Project Dependency
Begin Project Dependency
Project_Dep_Name Fluid
@@ -636,7 +636,7 @@
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name fltk
+ Project_Dep_Name fltk3
End Project Dependency
}}}
@@ -651,7 +651,7 @@
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name fltk
+ Project_Dep_Name fltk3
End Project Dependency
}}}
@@ -666,19 +666,19 @@
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name fltk
+ Project_Dep_Name fltk3images
End Project Dependency
Begin Project Dependency
- Project_Dep_Name fltk_images
+ Project_Dep_Name fltk3
End Project Dependency
Begin Project Dependency
- Project_Dep_Name fltk_png
+ Project_Dep_Name fltk3png
End Project Dependency
Begin Project Dependency
- Project_Dep_Name fltk_jpeg
+ Project_Dep_Name fltk3jpeg
End Project Dependency
Begin Project Dependency
- Project_Dep_Name fltk_zlib
+ Project_Dep_Name fltk3zlib
End Project Dependency
}}}
@@ -693,7 +693,7 @@
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name fltk
+ Project_Dep_Name fltk3
End Project Dependency
}}}
@@ -708,8 +708,20 @@
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name fltk
+ Project_Dep_Name fltk3images
End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name fltk3
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name fltk3png
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name fltk3jpeg
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name fltk3zlib
+ End Project Dependency
}}}
###############################################################################
@@ -723,7 +735,7 @@
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name fltk
+ Project_Dep_Name fltk3
End Project Dependency
Begin Project Dependency
Project_Dep_Name Fluid
@@ -741,19 +753,19 @@
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name fltk
+ Project_Dep_Name fltk3images
End Project Dependency
Begin Project Dependency
- Project_Dep_Name fltk_images
+ Project_Dep_Name fltk3
End Project Dependency
Begin Project Dependency
- Project_Dep_Name fltk_png
+ Project_Dep_Name fltk3png
End Project Dependency
Begin Project Dependency
- Project_Dep_Name fltk_jpeg
+ Project_Dep_Name fltk3jpeg
End Project Dependency
Begin Project Dependency
- Project_Dep_Name fltk_zlib
+ Project_Dep_Name fltk3zlib
End Project Dependency
}}}
@@ -768,7 +780,7 @@
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name fltk
+ Project_Dep_Name fltk3
End Project Dependency
}}}
@@ -783,10 +795,10 @@
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name fltk
+ Project_Dep_Name fltk3gl
End Project Dependency
Begin Project Dependency
- Project_Dep_Name fltk_gl
+ Project_Dep_Name fltk3
End Project Dependency
}}}
@@ -801,10 +813,10 @@
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name fltk
+ Project_Dep_Name fltk3
End Project Dependency
Begin Project Dependency
- Project_Dep_Name fltk_gl
+ Project_Dep_Name fltk3gl
End Project Dependency
}}}
@@ -819,10 +831,10 @@
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name fltk
+ Project_Dep_Name fltk3
End Project Dependency
Begin Project Dependency
- Project_Dep_Name fltk_gl
+ Project_Dep_Name fltk3gl
End Project Dependency
}}}
@@ -837,10 +849,10 @@
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name fltk
+ Project_Dep_Name fltk3gl
End Project Dependency
Begin Project Dependency
- Project_Dep_Name fltk_gl
+ Project_Dep_Name fltk3
End Project Dependency
}}}
@@ -855,7 +867,7 @@
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name fltk
+ Project_Dep_Name fltk3
End Project Dependency
}}}
@@ -870,19 +882,19 @@
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name fltk
+ Project_Dep_Name fltk3images
End Project Dependency
Begin Project Dependency
- Project_Dep_Name fltk_images
+ Project_Dep_Name fltk3
End Project Dependency
Begin Project Dependency
- Project_Dep_Name fltk_png
+ Project_Dep_Name fltk3png
End Project Dependency
Begin Project Dependency
- Project_Dep_Name fltk_jpeg
+ Project_Dep_Name fltk3jpeg
End Project Dependency
Begin Project Dependency
- Project_Dep_Name fltk_zlib
+ Project_Dep_Name fltk3zlib
End Project Dependency
}}}
@@ -897,7 +909,7 @@
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name fltk
+ Project_Dep_Name fltk3
End Project Dependency
}}}
@@ -912,7 +924,7 @@
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name fltk
+ Project_Dep_Name fltk3
End Project Dependency
}}}
@@ -927,7 +939,7 @@
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name fltk
+ Project_Dep_Name fltk3
End Project Dependency
}}}
@@ -942,7 +954,7 @@
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name fltk
+ Project_Dep_Name fltk3
End Project Dependency
}}}
@@ -957,7 +969,7 @@
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name fltk
+ Project_Dep_Name fltk3
End Project Dependency
}}}
@@ -972,7 +984,7 @@
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name fltk
+ Project_Dep_Name fltk3
End Project Dependency
Begin Project Dependency
Project_Dep_Name Fluid
@@ -990,7 +1002,7 @@
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name fltk
+ Project_Dep_Name fltk3
End Project Dependency
}}}
@@ -1005,7 +1017,7 @@
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name fltk
+ Project_Dep_Name fltk3
End Project Dependency
}}}
@@ -1020,7 +1032,7 @@
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name fltk
+ Project_Dep_Name fltk3
End Project Dependency
}}}
@@ -1035,7 +1047,7 @@
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name fltk
+ Project_Dep_Name fltk3
End Project Dependency
Begin Project Dependency
Project_Dep_Name Fluid
@@ -1053,7 +1065,7 @@
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name fltk
+ Project_Dep_Name fltk3
End Project Dependency
}}}
@@ -1068,7 +1080,7 @@
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name fltk
+ Project_Dep_Name fltk3
End Project Dependency
}}}
@@ -1083,7 +1095,7 @@
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name fltk
+ Project_Dep_Name fltk3
End Project Dependency
}}}
@@ -1098,7 +1110,7 @@
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name fltk
+ Project_Dep_Name fltk3
End Project Dependency
}}}
@@ -1113,8 +1125,20 @@
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name fltk
+ Project_Dep_Name fltk3images
End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name fltk3
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name fltk3png
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name fltk3jpeg
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name fltk3zlib
+ End Project Dependency
}}}
###############################################################################
@@ -1128,7 +1152,7 @@
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name fltk
+ Project_Dep_Name fltk3
End Project Dependency
}}}
@@ -1143,7 +1167,7 @@
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name fltk
+ Project_Dep_Name fltk3
End Project Dependency
}}}
@@ -1158,7 +1182,7 @@
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name fltk
+ Project_Dep_Name fltk3
End Project Dependency
}}}
@@ -1173,19 +1197,19 @@
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name fltk
+ Project_Dep_Name fltk3
End Project Dependency
Begin Project Dependency
- Project_Dep_Name fltk_images
+ Project_Dep_Name fltk3images
End Project Dependency
Begin Project Dependency
- Project_Dep_Name fltk_png
+ Project_Dep_Name fltk3png
End Project Dependency
Begin Project Dependency
- Project_Dep_Name fltk_jpeg
+ Project_Dep_Name fltk3jpeg
End Project Dependency
Begin Project Dependency
- Project_Dep_Name fltk_zlib
+ Project_Dep_Name fltk3zlib
End Project Dependency
}}}
@@ -1200,7 +1224,7 @@
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name fltk
+ Project_Dep_Name fltk3
End Project Dependency
}}}
@@ -1215,7 +1239,7 @@
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name fltk
+ Project_Dep_Name fltk3
End Project Dependency
Begin Project Dependency
Project_Dep_Name Fluid
@@ -1233,7 +1257,7 @@
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name fltk
+ Project_Dep_Name fltk3
End Project Dependency
Begin Project Dependency
Project_Dep_Name Fluid
@@ -1251,7 +1275,7 @@
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name fltk
+ Project_Dep_Name fltk3
End Project Dependency
}}}
@@ -1266,7 +1290,7 @@
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name fltk
+ Project_Dep_Name fltk3
End Project Dependency
Begin Project Dependency
Project_Dep_Name Fluid
@@ -1284,7 +1308,7 @@
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name fltk
+ Project_Dep_Name fltk3
End Project Dependency
}}}
@@ -1299,7 +1323,7 @@
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name fltk
+ Project_Dep_Name fltk3
End Project Dependency
}}}
@@ -1314,10 +1338,10 @@
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name fltk
+ Project_Dep_Name fltk3
End Project Dependency
Begin Project Dependency
- Project_Dep_Name fltk_gl
+ Project_Dep_Name fltk3gl
End Project Dependency
}}}
@@ -1332,7 +1356,7 @@
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name fltk
+ Project_Dep_Name fltk3
End Project Dependency
}}}
@@ -1347,19 +1371,19 @@
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name fltk
+ Project_Dep_Name fltk3images
End Project Dependency
Begin Project Dependency
- Project_Dep_Name fltk_images
+ Project_Dep_Name fltk3
End Project Dependency
Begin Project Dependency
- Project_Dep_Name fltk_png
+ Project_Dep_Name fltk3png
End Project Dependency
Begin Project Dependency
- Project_Dep_Name fltk_jpeg
+ Project_Dep_Name fltk3jpeg
End Project Dependency
Begin Project Dependency
- Project_Dep_Name fltk_zlib
+ Project_Dep_Name fltk3zlib
End Project Dependency
}}}
@@ -1374,7 +1398,7 @@
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name fltk
+ Project_Dep_Name fltk3
End Project Dependency
}}}
@@ -1389,7 +1413,7 @@
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name fltk
+ Project_Dep_Name fltk3
End Project Dependency
}}}
@@ -1404,7 +1428,7 @@
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name fltk
+ Project_Dep_Name fltk3
End Project Dependency
Begin Project Dependency
Project_Dep_Name Fluid
@@ -1422,7 +1446,7 @@
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name fltk
+ Project_Dep_Name fltk3
End Project Dependency
}}}
@@ -1437,7 +1461,7 @@
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name fltk
+ Project_Dep_Name fltk3
End Project Dependency
}}}
@@ -1452,19 +1476,19 @@
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name fltk
+ Project_Dep_Name fltk3
End Project Dependency
Begin Project Dependency
- Project_Dep_Name fltk_images
+ Project_Dep_Name fltk3images
End Project Dependency
Begin Project Dependency
- Project_Dep_Name fltk_png
+ Project_Dep_Name fltk3png
End Project Dependency
Begin Project Dependency
- Project_Dep_Name fltk_jpeg
+ Project_Dep_Name fltk3jpeg
End Project Dependency
Begin Project Dependency
- Project_Dep_Name fltk_zlib
+ Project_Dep_Name fltk3zlib
End Project Dependency
}}}
@@ -1479,7 +1503,7 @@
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name fltk
+ Project_Dep_Name fltk3
End Project Dependency
Begin Project Dependency
Project_Dep_Name Fluid
@@ -1497,7 +1521,7 @@
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name fltk
+ Project_Dep_Name fltk3
End Project Dependency
}}}
@@ -1512,7 +1536,7 @@
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name fltk
+ Project_Dep_Name fltk3
End Project Dependency
}}}
@@ -1527,7 +1551,7 @@
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name fltk
+ Project_Dep_Name fltk3
End Project Dependency
Begin Project Dependency
Project_Dep_Name Fluid
Modified: branches/branch-3.0/ide/VisualC6/fltk3.dsp
===================================================================
--- branches/branch-3.0/ide/VisualC6/fltk3.dsp 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC6/fltk3.dsp 2011-08-22 19:53:15 UTC (rev 8996)
@@ -1,24 +1,24 @@
-# Microsoft Developer Studio Project File - Name="fltk" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="fltk3" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Static Library" 0x0104
-CFG=fltk - Win32 Debug
+CFG=fltk3 - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
-!MESSAGE NMAKE /f "fltk.mak".
+!MESSAGE NMAKE /f "fltk3.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "fltk.mak" CFG="fltk - Win32 Debug"
+!MESSAGE NMAKE /f "fltk3.mak" CFG="fltk3 - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "fltk - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "fltk - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "fltk3 - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "fltk3 - Win32 Debug" (based on "Win32 (x86) Static Library")
!MESSAGE
# Begin Project
@@ -28,20 +28,20 @@
CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "fltk - Win32 Release"
+!IF "$(CFG)" == "fltk3 - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release\fltk"
-# PROP BASE Intermediate_Dir "Release\fltk"
+# PROP BASE Output_Dir "Release\fltk3"
+# PROP BASE Intermediate_Dir "Release\fltk3"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release\fltk"
-# PROP Intermediate_Dir "Release\fltk"
+# PROP Output_Dir "Release\fltk3"
+# PROP Intermediate_Dir "Release\fltk3"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "FL_LIBRARY" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Ot /Op /Ob2 /I "." /I "..\.." /I "..\..\zlib" /I "..\..\png" /I "..\..\jpeg" /D "WIN32" /D "FL_LIBRARY" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Ot /Op /Ob2 /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "FL_LIBRARY" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# SUBTRACT CPP /Os
# ADD BASE RSC /l 0x409
# ADD RSC /l 0x409
@@ -50,22 +50,22 @@
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\lib\fltk.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\fltk3.lib"
-!ELSEIF "$(CFG)" == "fltk - Win32 Debug"
+!ELSEIF "$(CFG)" == "fltk3 - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug\fltk"
-# PROP BASE Intermediate_Dir "Debug\fltk"
+# PROP BASE Output_Dir "Debug\fltk3"
+# PROP BASE Intermediate_Dir "Debug\fltk3"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug\fltk"
-# PROP Intermediate_Dir "Debug\fltk"
+# PROP Output_Dir "Debug\fltk3"
+# PROP Intermediate_Dir "Debug\fltk3"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "FL_LIBRARY" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /GX /Z7 /Od /I "." /I "..\.." /I "..\..\zlib" /I "..\..\png" /I "..\..\jpeg" /D "WIN32" /D "FL_LIBRARY" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /FR /YX /FD /c
+# ADD CPP /nologo /MDd /GX /Z7 /Od /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "FL_LIBRARY" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /FR /YX /FD /c
# ADD BASE RSC /l 0x409
# ADD RSC /l 0x409
BSC32=bscmake.exe
@@ -73,613 +73,613 @@
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\lib\fltkd.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\fltk3d.lib"
!ENDIF
# Begin Target
-# Name "fltk - Win32 Release"
-# Name "fltk - Win32 Debug"
+# Name "fltk3 - Win32 Release"
+# Name "fltk3 - Win32 Debug"
# Begin Source File
-SOURCE=..\..\src\Fl.cxx
+SOURCE=..\..\src\core\Fl.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\Fl_Adjuster.cxx
+SOURCE=..\..\src\core\Fl_Adjuster.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\Fl_Bitmap.cxx
+SOURCE=..\..\src\core\Fl_Bitmap.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\Fl_Box.cxx
+SOURCE=..\..\src\core\Fl_Box.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\Fl_Browser.cxx
+SOURCE=..\..\src\core\Fl_Browser.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\Fl_Browser_.cxx
+SOURCE=..\..\src\core\Fl_Browser_.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\Fl_Browser_load.cxx
+SOURCE=..\..\src\core\Fl_Browser_load.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\Fl_Button.cxx
+SOURCE=..\..\src\core\Fl_Button.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\Fl_Chart.cxx
+SOURCE=..\..\src\core\Fl_Chart.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\Fl_Check_Browser.cxx
+SOURCE=..\..\src\core\Fl_Check_Browser.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\Fl_Check_Button.cxx
+SOURCE=..\..\src\core\Fl_Check_Button.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\Fl_Choice.cxx
+SOURCE=..\..\src\core\Fl_Choice.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\Fl_Clock.cxx
+SOURCE=..\..\src\core\Fl_Clock.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\Fl_Color_Chooser.cxx
+SOURCE=..\..\src\core\Fl_Color_Chooser.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\Fl_Counter.cxx
+SOURCE=..\..\src\core\Fl_Counter.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\Fl_Device.cxx
+SOURCE=..\..\src\core\Fl_Device.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\Fl_Dial.cxx
+SOURCE=..\..\src\core\Fl_Dial.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\Fl_Double_Window.cxx
+SOURCE=..\..\src\core\Fl_Double_Window.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\Fl_File_Browser.cxx
+SOURCE=..\..\src\core\Fl_File_Browser.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\Fl_File_Chooser.cxx
+SOURCE=..\..\src\core\Fl_File_Chooser.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\Fl_File_Chooser2.cxx
+SOURCE=..\..\src\core\Fl_File_Chooser2.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\Fl_File_Icon.cxx
+SOURCE=..\..\src\core\Fl_File_Icon.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\Fl_File_Input.cxx
+SOURCE=..\..\src\core\Fl_File_Input.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\Fl_Group.cxx
+SOURCE=..\..\src\core\Fl_Group.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\Fl_Help_View.cxx
+SOURCE=..\..\src\core\Fl_Help_View.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\Fl_Image.cxx
+SOURCE=..\..\src\core\Fl_Image.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\Fl_Input.cxx
+SOURCE=..\..\src\core\Fl_Input.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\Fl_Input_.cxx
+SOURCE=..\..\src\core\Fl_Input_.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\Fl_Light_Button.cxx
+SOURCE=..\..\src\core\Fl_Light_Button.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\Fl_Menu.cxx
+SOURCE=..\..\src\core\Fl_Menu.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\Fl_Menu_.cxx
+SOURCE=..\..\src\core\Fl_Menu_.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\Fl_Menu_Bar.cxx
+SOURCE=..\..\src\core\Fl_Menu_Bar.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\Fl_Menu_Button.cxx
+SOURCE=..\..\src\core\Fl_Menu_Button.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\Fl_Menu_Window.cxx
+SOURCE=..\..\src\core\Fl_Menu_Window.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\Fl_Menu_add.cxx
+SOURCE=..\..\src\core\Fl_Menu_add.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\Fl_Menu_global.cxx
+SOURCE=..\..\src\core\Fl_Menu_global.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\Fl_Multi_Label.cxx
+SOURCE=..\..\src\core\Fl_Multi_Label.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\Fl_Native_File_Chooser.cxx
+SOURCE=..\..\src\core\Fl_Native_File_Chooser.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\Fl_Overlay_Window.cxx
+SOURCE=..\..\src\core\Fl_Overlay_Window.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\Fl_Pack.cxx
+SOURCE=..\..\src\core\Fl_Pack.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\Fl_Paged_Device.cxx
+SOURCE=..\..\src\core\Fl_Paged_Device.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\Fl_Pixmap.cxx
+SOURCE=..\..\src\core\Fl_Pixmap.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\Fl_Positioner.cxx
+SOURCE=..\..\src\core\Fl_Positioner.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\Fl_Printer.cxx
+SOURCE=..\..\src\core\Fl_Printer.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\Fl_Preferences.cxx
+SOURCE=..\..\src\core\Fl_Preferences.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\Fl_Progress.cxx
+SOURCE=..\..\src\core\Fl_Progress.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\Fl_Repeat_Button.cxx
+SOURCE=..\..\src\core\Fl_Repeat_Button.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\Fl_Return_Button.cxx
+SOURCE=..\..\src\core\Fl_Return_Button.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\Fl_Roller.cxx
+SOURCE=..\..\src\core\Fl_Roller.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\Fl_Round_Button.cxx
+SOURCE=..\..\src\core\Fl_Round_Button.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\Fl_Scroll.cxx
+SOURCE=..\..\src\core\Fl_Scroll.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\Fl_Scrollbar.cxx
+SOURCE=..\..\src\core\Fl_Scrollbar.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\Fl_Shared_Image.cxx
+SOURCE=..\..\src\core\Fl_Shared_Image.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\Fl_Single_Window.cxx
+SOURCE=..\..\src\core\Fl_Single_Window.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\Fl_Slider.cxx
+SOURCE=..\..\src\core\Fl_Slider.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\Style.cxx
+SOURCE=..\..\src\core\Style.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\Fl_Sys_Menu_Bar.cxx
+SOURCE=..\..\src\core\Fl_Sys_Menu_Bar.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\Fl_Table.cxx
+SOURCE=..\..\src\core\Fl_Table.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\Fl_Table_Row.cxx
+SOURCE=..\..\src\core\Fl_Table_Row.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\Fl_Tabs.cxx
+SOURCE=..\..\src\core\Fl_Tabs.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\Fl_Text_Buffer.cxx
+SOURCE=..\..\src\core\Fl_Text_Buffer.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\Fl_Text_Display.cxx
+SOURCE=..\..\src\core\Fl_Text_Display.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\Fl_Text_Editor.cxx
+SOURCE=..\..\src\core\Fl_Text_Editor.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\Fl_Tile.cxx
+SOURCE=..\..\src\core\Fl_Tile.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\Fl_Tiled_Image.cxx
+SOURCE=..\..\src\core\Fl_Tiled_Image.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\Fl_Tooltip.cxx
+SOURCE=..\..\src\core\Fl_Tooltip.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\Fl_Tree.cxx
+SOURCE=..\..\src\core\Fl_Tree.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\Fl_Tree_Item.cxx
+SOURCE=..\..\src\core\Fl_Tree_Item.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\Fl_Tree_Item_Array.cxx
+SOURCE=..\..\src\core\Fl_Tree_Item_Array.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\Fl_Tree_Prefs.cxx
+SOURCE=..\..\src\core\Fl_Tree_Prefs.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\Fl_Valuator.cxx
+SOURCE=..\..\src\core\Fl_Valuator.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\Fl_Value_Input.cxx
+SOURCE=..\..\src\core\Fl_Value_Input.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\Fl_Value_Output.cxx
+SOURCE=..\..\src\core\Fl_Value_Output.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\Fl_Value_Slider.cxx
+SOURCE=..\..\src\core\Fl_Value_Slider.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\Fl_Widget.cxx
+SOURCE=..\..\src\core\Fl_Widget.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\Fl_Window.cxx
+SOURCE=..\..\src\core\Fl_Window.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\Fl_Window_fullscreen.cxx
+SOURCE=..\..\src\core\Fl_Window_fullscreen.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\Fl_Window_hotspot.cxx
+SOURCE=..\..\src\core\Fl_Window_hotspot.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\Fl_Window_iconize.cxx
+SOURCE=..\..\src\core\Fl_Window_iconize.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\Fl_Wizard.cxx
+SOURCE=..\..\src\core\Fl_Wizard.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\Fl_XBM_Image.cxx
+SOURCE=..\..\src\core\Fl_XBM_Image.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\Fl_XPM_Image.cxx
+SOURCE=..\..\src\core\Fl_XPM_Image.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\Fl_abort.cxx
+SOURCE=..\..\src\core\Fl_abort.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\Fl_add_idle.cxx
+SOURCE=..\..\src\core\Fl_add_idle.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\Fl_arg.cxx
+SOURCE=..\..\src\core\Fl_arg.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\Fl_compose.cxx
+SOURCE=..\..\src\core\Fl_compose.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\Fl_display.cxx
+SOURCE=..\..\src\core\Fl_display.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\Fl_get_key.cxx
+SOURCE=..\..\src\core\Fl_get_key.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\Fl_get_system_colors.cxx
+SOURCE=..\..\src\core\Fl_get_system_colors.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\Fl_grab.cxx
+SOURCE=..\..\src\core\Fl_grab.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\Fl_lock.cxx
+SOURCE=..\..\src\core\Fl_lock.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\Fl_own_colormap.cxx
+SOURCE=..\..\src\core\Fl_own_colormap.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\Fl_visual.cxx
+SOURCE=..\..\src\core\Fl_visual.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\Fl_x.cxx
+SOURCE=..\..\src\core\Fl_x.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\filename_absolute.cxx
+SOURCE=..\..\src\core\filename_absolute.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\filename_expand.cxx
+SOURCE=..\..\src\core\filename_expand.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\filename_ext.cxx
+SOURCE=..\..\src\core\filename_ext.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\filename_isdir.cxx
+SOURCE=..\..\src\core\filename_isdir.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\filename_list.cxx
+SOURCE=..\..\src\core\filename_list.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\filename_match.cxx
+SOURCE=..\..\src\core\filename_match.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\filename_setext.cxx
+SOURCE=..\..\src\core\filename_setext.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fl_arc.cxx
+SOURCE=..\..\src\core\fl_arc.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fl_arci.cxx
+SOURCE=..\..\src\core\fl_arci.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fl_ask.cxx
+SOURCE=..\..\src\core\fl_ask.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fl_boxtype.cxx
+SOURCE=..\..\src\core\fl_boxtype.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fl_call_main.cxx
+SOURCE=..\..\src\core\fl_call_main.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fl_color.cxx
+SOURCE=..\..\src\core\fl_color.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fl_cursor.cxx
+SOURCE=..\..\src\core\fl_cursor.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fl_curve.cxx
+SOURCE=..\..\src\core\fl_curve.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fl_diamond_box.cxx
+SOURCE=..\..\src\core\fl_diamond_box.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fl_dnd.cxx
+SOURCE=..\..\src\core\fl_dnd.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fl_draw.cxx
+SOURCE=..\..\src\core\fl_draw.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fl_draw_image.cxx
+SOURCE=..\..\src\core\fl_draw_image.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fl_draw_pixmap.cxx
+SOURCE=..\..\src\core\fl_draw_pixmap.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fl_encoding_latin1.cxx
+SOURCE=..\..\src\core\fl_encoding_latin1.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fl_encoding_mac_roman.cxx
+SOURCE=..\..\src\core\fl_encoding_mac_roman.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fl_engraved_label.cxx
+SOURCE=..\..\src\core\fl_engraved_label.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fl_file_dir.cxx
+SOURCE=..\..\src\core\fl_file_dir.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fl_font.cxx
+SOURCE=..\..\src\core\fl_font.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fl_gtk.cxx
+SOURCE=..\..\src\core\fl_gtk.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fl_labeltype.cxx
+SOURCE=..\..\src\core\fl_labeltype.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fl_line_style.cxx
+SOURCE=..\..\src\core\fl_line_style.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fl_open_uri.cxx
+SOURCE=..\..\src\core\fl_open_uri.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fl_oval_box.cxx
+SOURCE=..\..\src\core\fl_oval_box.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fl_overlay.cxx
+SOURCE=..\..\src\core\fl_overlay.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fl_overlay_visual.cxx
+SOURCE=..\..\src\core\fl_overlay_visual.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fl_plastic.cxx
+SOURCE=..\..\src\core\fl_plastic.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fl_read_image.cxx
+SOURCE=..\..\src\core\fl_read_image.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fl_rect.cxx
+SOURCE=..\..\src\core\fl_rect.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fl_round_box.cxx
+SOURCE=..\..\src\core\fl_round_box.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fl_rounded_box.cxx
+SOURCE=..\..\src\core\fl_rounded_box.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fl_scroll_area.cxx
+SOURCE=..\..\src\core\fl_scroll_area.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fl_set_font.cxx
+SOURCE=..\..\src\core\fl_set_font.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fl_set_fonts.cxx
+SOURCE=..\..\src\core\fl_set_fonts.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fl_shadow_box.cxx
+SOURCE=..\..\src\core\fl_shadow_box.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fl_shortcut.cxx
+SOURCE=..\..\src\core\fl_shortcut.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fl_show_colormap.cxx
+SOURCE=..\..\src\core\fl_show_colormap.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fl_symbols.cxx
+SOURCE=..\..\src\core\fl_symbols.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fl_utf8.cxx
+SOURCE=..\..\src\core\fl_utf8.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fl_utf.cxx
+SOURCE=..\..\src\core\fl_utf.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fl_vertex.cxx
+SOURCE=..\..\src\core\fl_vertex.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\numericsort.cxx
+SOURCE=..\..\src\core\numericsort.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\ps_image.cxx
+SOURCE=..\..\src\core\ps_image.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\scandir.cxx
+SOURCE=..\..\src\core\scandir.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\screen_xywh.cxx
+SOURCE=..\..\src\core\screen_xywh.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\flstring.c
+SOURCE=..\..\src\core\flstring.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\vsnprintf.c
+SOURCE=..\..\src\core\vsnprintf.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\xutf8\case.c
+SOURCE=..\..\src\core\xutf8\case.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\xutf8\is_right2left.c
+SOURCE=..\..\src\core\xutf8\is_right2left.c
# End Source File
# Begin Source File
-SOURCE=..\..\src\xutf8\is_spacing.c
+SOURCE=..\..\src\core\xutf8\is_spacing.c
# End Source File
# End Target
# End Project
Modified: branches/branch-3.0/ide/VisualC6/fltk3gl.dsp
===================================================================
--- branches/branch-3.0/ide/VisualC6/fltk3gl.dsp 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC6/fltk3gl.dsp 2011-08-22 19:53:15 UTC (rev 8996)
@@ -1,24 +1,24 @@
-# Microsoft Developer Studio Project File - Name="fltk_gl" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="fltk3gl" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Static Library" 0x0104
-CFG=fltk_gl - Win32 Debug
+CFG=fltk3gl - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
-!MESSAGE NMAKE /f "fltk_gl.mak".
+!MESSAGE NMAKE /f "fltk3gl.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "fltk_gl.mak" CFG="fltk_gl - Win32 Debug"
+!MESSAGE NMAKE /f "fltk3gl.mak" CFG="fltk3gl - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "fltk_gl - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "fltk_gl - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "fltk3gl - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "fltk3gl - Win32 Debug" (based on "Win32 (x86) Static Library")
!MESSAGE
# Begin Project
@@ -28,20 +28,20 @@
CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "fltk_gl - Win32 Release"
+!IF "$(CFG)" == "fltk3gl - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release\fltk_gl"
-# PROP BASE Intermediate_Dir "Release\fltk_gl"
+# PROP BASE Output_Dir "Release\fltk3gl"
+# PROP BASE Intermediate_Dir "Release\fltk3gl"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release\fltk_gl"
-# PROP Intermediate_Dir "Release\fltk_gl"
+# PROP Output_Dir "Release\fltk3gl"
+# PROP Intermediate_Dir "Release\fltk3gl"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "FL_LIBRARY" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Ot /Op /Ob2 /I "." /I "..\.." /I "..\..\zlib" /I "..\..\png" /I "..\..\jpeg" /D "WIN32" /D "FL_LIBRARY" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Ot /Op /Ob2 /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "FL_LIBRARY" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# SUBTRACT CPP /Os
# ADD BASE RSC /l 0x409
# ADD RSC /l 0x409
@@ -50,22 +50,22 @@
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\lib\fltk_gl.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\fltk3gl.lib"
-!ELSEIF "$(CFG)" == "fltk_gl - Win32 Debug"
+!ELSEIF "$(CFG)" == "fltk3gl - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug\fltk_gl"
-# PROP BASE Intermediate_Dir "Debug\fltk_gl"
+# PROP BASE Output_Dir "Debug\fltk3gl"
+# PROP BASE Intermediate_Dir "Debug\fltk3gl"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug\fltk_gl"
-# PROP Intermediate_Dir "Debug\fltk_gl"
+# PROP Output_Dir "Debug\fltk3gl"
+# PROP Intermediate_Dir "Debug\fltk3gl"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "FL_LIBRARY" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /GX /Z7 /Od /I "." /I "..\.." /I "..\..\zlib" /I "..\..\png" /I "..\..\jpeg" /D "WIN32" /D "FL_LIBRARY" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /FR /YX /FD /c
+# ADD CPP /nologo /MDd /GX /Z7 /Od /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "FL_LIBRARY" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /FR /YX /FD /c
# ADD BASE RSC /l 0x409
# ADD RSC /l 0x409
BSC32=bscmake.exe
@@ -73,57 +73,57 @@
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\lib\fltk_gld.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\fltk3gld.lib"
!ENDIF
# Begin Target
-# Name "fltk_gl - Win32 Release"
-# Name "fltk_gl - Win32 Debug"
+# Name "fltk3gl - Win32 Release"
+# Name "fltk3gl - Win32 Debug"
# Begin Source File
-SOURCE=..\..\src\Fl_Gl_Choice.cxx
+SOURCE=..\..\src\core\Fl_Gl_Choice.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\Fl_Gl_Device_Plugin.cxx
+SOURCE=..\..\src\core\Fl_Gl_Device_Plugin.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\Fl_Gl_Overlay.cxx
+SOURCE=..\..\src\core\Fl_Gl_Overlay.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\Fl_Gl_Window.cxx
+SOURCE=..\..\src\core\Fl_Gl_Window.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\freeglut_geometry.cxx
+SOURCE=..\..\src\core\freeglut_geometry.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\freeglut_stroke_mono_roman.cxx
+SOURCE=..\..\src\core\freeglut_stroke_mono_roman.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\freeglut_stroke_roman.cxx
+SOURCE=..\..\src\core\freeglut_stroke_roman.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\freeglut_teapot.cxx
+SOURCE=..\..\src\core\freeglut_teapot.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\gl_draw.cxx
+SOURCE=..\..\src\core\gl_draw.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\glut_compatability.cxx
+SOURCE=..\..\src\core\glut_compatability.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\glut_font.cxx
+SOURCE=..\..\src\core\glut_font.cxx
# End Source File
# End Target
# End Project
Modified: branches/branch-3.0/ide/VisualC6/fltk3images.dsp
===================================================================
--- branches/branch-3.0/ide/VisualC6/fltk3images.dsp 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC6/fltk3images.dsp 2011-08-22 19:53:15 UTC (rev 8996)
@@ -1,24 +1,24 @@
-# Microsoft Developer Studio Project File - Name="fltk_images" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="fltk3images" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Static Library" 0x0104
-CFG=fltk_images - Win32 Debug
+CFG=fltk3images - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
-!MESSAGE NMAKE /f "fltk_images.mak".
+!MESSAGE NMAKE /f "fltk3images.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "fltk_images.mak" CFG="fltk_images - Win32 Debug"
+!MESSAGE NMAKE /f "fltk3images.mak" CFG="fltk3images - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "fltk_images - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "fltk_images - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "fltk3images - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "fltk3images - Win32 Debug" (based on "Win32 (x86) Static Library")
!MESSAGE
# Begin Project
@@ -28,20 +28,20 @@
CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "fltk_images - Win32 Release"
+!IF "$(CFG)" == "fltk3images - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release\fltk_images"
-# PROP BASE Intermediate_Dir "Release\fltk_images"
+# PROP BASE Output_Dir "Release\fltk3images"
+# PROP BASE Intermediate_Dir "Release\fltk3images"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release\fltk_images"
-# PROP Intermediate_Dir "Release\fltk_images"
+# PROP Output_Dir "Release\fltk3images"
+# PROP Intermediate_Dir "Release\fltk3images"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "FL_LIBRARY" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Ot /Op /Ob2 /I "." /I "..\.." /I "..\..\zlib" /I "..\..\png" /I "..\..\jpeg" /D "WIN32" /D "FL_LIBRARY" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Ot /Op /Ob2 /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "FL_LIBRARY" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# SUBTRACT CPP /Os
# ADD BASE RSC /l 0x409
# ADD RSC /l 0x409
@@ -50,22 +50,22 @@
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\lib\fltk_images.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\fltk3images.lib"
-!ELSEIF "$(CFG)" == "fltk_images - Win32 Debug"
+!ELSEIF "$(CFG)" == "fltk3images - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug\fltk_images"
-# PROP BASE Intermediate_Dir "Debug\fltk_images"
+# PROP BASE Output_Dir "Debug\fltk3images"
+# PROP BASE Intermediate_Dir "Debug\fltk3images"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug\fltk_images"
-# PROP Intermediate_Dir "Debug\fltk_images"
+# PROP Output_Dir "Debug\fltk3images"
+# PROP Intermediate_Dir "Debug\fltk3images"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "FL_LIBRARY" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /GX /Z7 /Od /I "." /I "..\.." /I "..\..\zlib" /I "..\..\png" /I "..\..\jpeg" /D "WIN32" /D "FL_LIBRARY" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /FR /YX /FD /c
+# ADD CPP /nologo /MDd /GX /Z7 /Od /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "FL_LIBRARY" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /FR /YX /FD /c
# ADD BASE RSC /l 0x409
# ADD RSC /l 0x409
BSC32=bscmake.exe
@@ -73,45 +73,45 @@
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\lib\fltk_imagesd.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\fltk3imagesd.lib"
!ENDIF
# Begin Target
-# Name "fltk_images - Win32 Release"
-# Name "fltk_images - Win32 Debug"
+# Name "fltk3images - Win32 Release"
+# Name "fltk3images - Win32 Debug"
# Begin Source File
-SOURCE=..\..\src\Fl_BMP_Image.cxx
+SOURCE=..\..\src\core\Fl_BMP_Image.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\Fl_File_Icon2.cxx
+SOURCE=..\..\src\core\Fl_File_Icon2.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\Fl_GIF_Image.cxx
+SOURCE=..\..\src\core\Fl_GIF_Image.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\Fl_Help_Dialog.cxx
+SOURCE=..\..\src\core\Fl_Help_Dialog.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\Fl_JPEG_Image.cxx
+SOURCE=..\..\src\core\Fl_JPEG_Image.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\Fl_PNG_Image.cxx
+SOURCE=..\..\src\core\Fl_PNG_Image.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\Fl_PNM_Image.cxx
+SOURCE=..\..\src\core\Fl_PNM_Image.cxx
# End Source File
# Begin Source File
-SOURCE=..\..\src\fl_images_core.cxx
+SOURCE=..\..\src\core\fl_images_core.cxx
# End Source File
# End Target
# End Project
Modified: branches/branch-3.0/ide/VisualC6/fltk3jpeg.dsp
===================================================================
--- branches/branch-3.0/ide/VisualC6/fltk3jpeg.dsp 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC6/fltk3jpeg.dsp 2011-08-22 19:53:15 UTC (rev 8996)
@@ -1,24 +1,24 @@
-# Microsoft Developer Studio Project File - Name="fltk_jpeg" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="fltk3jpeg" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Static Library" 0x0104
-CFG=fltk_jpeg - Win32 Debug
+CFG=fltk3jpeg - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
-!MESSAGE NMAKE /f "fltk_jpeg.mak".
+!MESSAGE NMAKE /f "fltk3jpeg.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "fltk_jpeg.mak" CFG="fltk_jpeg - Win32 Debug"
+!MESSAGE NMAKE /f "fltk3jpeg.mak" CFG="fltk3jpeg - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "fltk_jpeg - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "fltk_jpeg - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "fltk3jpeg - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "fltk3jpeg - Win32 Debug" (based on "Win32 (x86) Static Library")
!MESSAGE
# Begin Project
@@ -28,20 +28,20 @@
CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "fltk_jpeg - Win32 Release"
+!IF "$(CFG)" == "fltk3jpeg - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release\fltk_jpeg"
-# PROP BASE Intermediate_Dir "Release\fltk_jpeg"
+# PROP BASE Output_Dir "Release\fltk3jpeg"
+# PROP BASE Intermediate_Dir "Release\fltk3jpeg"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release\fltk_jpeg"
-# PROP Intermediate_Dir "Release\fltk_jpeg"
+# PROP Output_Dir "Release\fltk3jpeg"
+# PROP Intermediate_Dir "Release\fltk3jpeg"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "FL_LIBRARY" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Ot /Op /Ob2 /I "." /I "..\.." /I "..\..\zlib" /I "..\..\png" /I "..\..\jpeg" /D "WIN32" /D "FL_LIBRARY" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Ot /Op /Ob2 /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "FL_LIBRARY" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# SUBTRACT CPP /Os
# ADD BASE RSC /l 0x409
# ADD RSC /l 0x409
@@ -50,22 +50,22 @@
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\lib\fltk_jpeg.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\fltk3jpeg.lib"
-!ELSEIF "$(CFG)" == "fltk_jpeg - Win32 Debug"
+!ELSEIF "$(CFG)" == "fltk3jpeg - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug\fltk_jpeg"
-# PROP BASE Intermediate_Dir "Debug\fltk_jpeg"
+# PROP BASE Output_Dir "Debug\fltk3jpeg"
+# PROP BASE Intermediate_Dir "Debug\fltk3jpeg"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug\fltk_jpeg"
-# PROP Intermediate_Dir "Debug\fltk_jpeg"
+# PROP Output_Dir "Debug\fltk3jpeg"
+# PROP Intermediate_Dir "Debug\fltk3jpeg"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "FL_LIBRARY" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /GX /Z7 /Od /I "." /I "..\.." /I "..\..\zlib" /I "..\..\png" /I "..\..\jpeg" /D "WIN32" /D "FL_LIBRARY" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /FR /YX /FD /c
+# ADD CPP /nologo /MDd /GX /Z7 /Od /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "FL_LIBRARY" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /FR /YX /FD /c
# ADD BASE RSC /l 0x409
# ADD RSC /l 0x409
BSC32=bscmake.exe
@@ -73,197 +73,197 @@
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\lib\fltk_jpegd.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\fltk3jpegd.lib"
!ENDIF
# Begin Target
-# Name "fltk_jpeg - Win32 Release"
-# Name "fltk_jpeg - Win32 Debug"
+# Name "fltk3jpeg - Win32 Release"
+# Name "fltk3jpeg - Win32 Debug"
# Begin Source File
-SOURCE=..\..\jpeg\jaricom.c
+SOURCE=..\..\src\jpeg\jaricom.c
# End Source File
# Begin Source File
-SOURCE=..\..\jpeg\jcarith.c
+SOURCE=..\..\src\jpeg\jcarith.c
# End Source File
# Begin Source File
-SOURCE=..\..\jpeg\jdarith.c
+SOURCE=..\..\src\jpeg\jdarith.c
# End Source File
# Begin Source File
-SOURCE=..\..\jpeg\jcapimin.c
+SOURCE=..\..\src\jpeg\jcapimin.c
# End Source File
# Begin Source File
-SOURCE=..\..\jpeg\jcapistd.c
+SOURCE=..\..\src\jpeg\jcapistd.c
# End Source File
# Begin Source File
-SOURCE=..\..\jpeg\jccoefct.c
+SOURCE=..\..\src\jpeg\jccoefct.c
# End Source File
# Begin Source File
-SOURCE=..\..\jpeg\jccolor.c
+SOURCE=..\..\src\jpeg\jccolor.c
# End Source File
# Begin Source File
-SOURCE=..\..\jpeg\jcdctmgr.c
+SOURCE=..\..\src\jpeg\jcdctmgr.c
# End Source File
# Begin Source File
-SOURCE=..\..\jpeg\jchuff.c
+SOURCE=..\..\src\jpeg\jchuff.c
# End Source File
# Begin Source File
-SOURCE=..\..\jpeg\jcinit.c
+SOURCE=..\..\src\jpeg\jcinit.c
# End Source File
# Begin Source File
-SOURCE=..\..\jpeg\jcmainct.c
+SOURCE=..\..\src\jpeg\jcmainct.c
# End Source File
# Begin Source File
-SOURCE=..\..\jpeg\jcmarker.c
+SOURCE=..\..\src\jpeg\jcmarker.c
# End Source File
# Begin Source File
-SOURCE=..\..\jpeg\jcmaster.c
+SOURCE=..\..\src\jpeg\jcmaster.c
# End Source File
# Begin Source File
-SOURCE=..\..\jpeg\jcomapi.c
+SOURCE=..\..\src\jpeg\jcomapi.c
# End Source File
# Begin Source File
-SOURCE=..\..\jpeg\jcparam.c
+SOURCE=..\..\src\jpeg\jcparam.c
# End Source File
# Begin Source File
-SOURCE=..\..\jpeg\jcprepct.c
+SOURCE=..\..\src\jpeg\jcprepct.c
# End Source File
# Begin Source File
-SOURCE=..\..\jpeg\jcsample.c
+SOURCE=..\..\src\jpeg\jcsample.c
# End Source File
# Begin Source File
-SOURCE=..\..\jpeg\jctrans.c
+SOURCE=..\..\src\jpeg\jctrans.c
# End Source File
# Begin Source File
-SOURCE=..\..\jpeg\jdapimin.c
+SOURCE=..\..\src\jpeg\jdapimin.c
# End Source File
# Begin Source File
-SOURCE=..\..\jpeg\jdapistd.c
+SOURCE=..\..\src\jpeg\jdapistd.c
# End Source File
# Begin Source File
-SOURCE=..\..\jpeg\jdatadst.c
+SOURCE=..\..\src\jpeg\jdatadst.c
# End Source File
# Begin Source File
-SOURCE=..\..\jpeg\jdatasrc.c
+SOURCE=..\..\src\jpeg\jdatasrc.c
# End Source File
# Begin Source File
-SOURCE=..\..\jpeg\jdcoefct.c
+SOURCE=..\..\src\jpeg\jdcoefct.c
# End Source File
# Begin Source File
-SOURCE=..\..\jpeg\jdcolor.c
+SOURCE=..\..\src\jpeg\jdcolor.c
# End Source File
# Begin Source File
-SOURCE=..\..\jpeg\jddctmgr.c
+SOURCE=..\..\src\jpeg\jddctmgr.c
# End Source File
# Begin Source File
-SOURCE=..\..\jpeg\jdhuff.c
+SOURCE=..\..\src\jpeg\jdhuff.c
# End Source File
# Begin Source File
-SOURCE=..\..\jpeg\jdinput.c
+SOURCE=..\..\src\jpeg\jdinput.c
# End Source File
# Begin Source File
-SOURCE=..\..\jpeg\jdmainct.c
+SOURCE=..\..\src\jpeg\jdmainct.c
# End Source File
# Begin Source File
-SOURCE=..\..\jpeg\jdmarker.c
+SOURCE=..\..\src\jpeg\jdmarker.c
# End Source File
# Begin Source File
-SOURCE=..\..\jpeg\jdmaster.c
+SOURCE=..\..\src\jpeg\jdmaster.c
# End Source File
# Begin Source File
-SOURCE=..\..\jpeg\jdmerge.c
+SOURCE=..\..\src\jpeg\jdmerge.c
# End Source File
# Begin Source File
-SOURCE=..\..\jpeg\jdpostct.c
+SOURCE=..\..\src\jpeg\jdpostct.c
# End Source File
# Begin Source File
-SOURCE=..\..\jpeg\jdsample.c
+SOURCE=..\..\src\jpeg\jdsample.c
# End Source File
# Begin Source File
-SOURCE=..\..\jpeg\jdtrans.c
+SOURCE=..\..\src\jpeg\jdtrans.c
# End Source File
# Begin Source File
-SOURCE=..\..\jpeg\jerror.c
+SOURCE=..\..\src\jpeg\jerror.c
# End Source File
# Begin Source File
-SOURCE=..\..\jpeg\jfdctflt.c
+SOURCE=..\..\src\jpeg\jfdctflt.c
# End Source File
# Begin Source File
-SOURCE=..\..\jpeg\jfdctfst.c
+SOURCE=..\..\src\jpeg\jfdctfst.c
# End Source File
# Begin Source File
-SOURCE=..\..\jpeg\jfdctint.c
+SOURCE=..\..\src\jpeg\jfdctint.c
# End Source File
# Begin Source File
-SOURCE=..\..\jpeg\jidctflt.c
+SOURCE=..\..\src\jpeg\jidctflt.c
# End Source File
# Begin Source File
-SOURCE=..\..\jpeg\jidctfst.c
+SOURCE=..\..\src\jpeg\jidctfst.c
# End Source File
# Begin Source File
-SOURCE=..\..\jpeg\jidctint.c
+SOURCE=..\..\src\jpeg\jidctint.c
# End Source File
# Begin Source File
-SOURCE=..\..\jpeg\jmemmgr.c
+SOURCE=..\..\src\jpeg\jmemmgr.c
# End Source File
# Begin Source File
-SOURCE=..\..\jpeg\jmemnobs.c
+SOURCE=..\..\src\jpeg\jmemnobs.c
# End Source File
# Begin Source File
-SOURCE=..\..\jpeg\jquant1.c
+SOURCE=..\..\src\jpeg\jquant1.c
# End Source File
# Begin Source File
-SOURCE=..\..\jpeg\jquant2.c
+SOURCE=..\..\src\jpeg\jquant2.c
# End Source File
# Begin Source File
-SOURCE=..\..\jpeg\jutils.c
+SOURCE=..\..\src\jpeg\jutils.c
# End Source File
# End Target
# End Project
Modified: branches/branch-3.0/ide/VisualC6/fltk3png.dsp
===================================================================
--- branches/branch-3.0/ide/VisualC6/fltk3png.dsp 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC6/fltk3png.dsp 2011-08-22 19:53:15 UTC (rev 8996)
@@ -1,24 +1,24 @@
-# Microsoft Developer Studio Project File - Name="fltk_png" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="fltk3png" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Static Library" 0x0104
-CFG=fltk_png - Win32 Debug
+CFG=fltk3png - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
-!MESSAGE NMAKE /f "fltk_png.mak".
+!MESSAGE NMAKE /f "fltk3png.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "fltk_png.mak" CFG="fltk_png - Win32 Debug"
+!MESSAGE NMAKE /f "fltk3png.mak" CFG="fltk3png - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "fltk_png - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "fltk_png - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "fltk3png - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "fltk3png - Win32 Debug" (based on "Win32 (x86) Static Library")
!MESSAGE
# Begin Project
@@ -28,20 +28,20 @@
CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "fltk_png - Win32 Release"
+!IF "$(CFG)" == "fltk3png - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release\fltk_png"
-# PROP BASE Intermediate_Dir "Release\fltk_png"
+# PROP BASE Output_Dir "Release\fltk3png"
+# PROP BASE Intermediate_Dir "Release\fltk3png"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release\fltk_png"
-# PROP Intermediate_Dir "Release\fltk_png"
+# PROP Output_Dir "Release\fltk3png"
+# PROP Intermediate_Dir "Release\fltk3png"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "FL_LIBRARY" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Ot /Op /Ob2 /I "." /I "..\.." /I "..\..\zlib" /I "..\..\png" /I "..\..\jpeg" /D "WIN32" /D "FL_LIBRARY" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Ot /Op /Ob2 /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "FL_LIBRARY" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# SUBTRACT CPP /Os
# ADD BASE RSC /l 0x409
# ADD RSC /l 0x409
@@ -50,22 +50,22 @@
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\lib\fltk_png.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\fltk3png.lib"
-!ELSEIF "$(CFG)" == "fltk_png - Win32 Debug"
+!ELSEIF "$(CFG)" == "fltk3png - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug\fltk_png"
-# PROP BASE Intermediate_Dir "Debug\fltk_png"
+# PROP BASE Output_Dir "Debug\fltk3png"
+# PROP BASE Intermediate_Dir "Debug\fltk3png"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug\fltk_png"
-# PROP Intermediate_Dir "Debug\fltk_png"
+# PROP Output_Dir "Debug\fltk3png"
+# PROP Intermediate_Dir "Debug\fltk3png"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "FL_LIBRARY" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /GX /Z7 /Od /I "." /I "..\.." /I "..\..\zlib" /I "..\..\png" /I "..\..\jpeg" /D "WIN32" /D "FL_LIBRARY" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /FR /YX /FD /c
+# ADD CPP /nologo /MDd /GX /Z7 /Od /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "FL_LIBRARY" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /FR /YX /FD /c
# ADD BASE RSC /l 0x409
# ADD RSC /l 0x409
BSC32=bscmake.exe
@@ -73,73 +73,73 @@
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\lib\fltk_pngd.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\fltk3pngd.lib"
!ENDIF
# Begin Target
-# Name "fltk_png - Win32 Release"
-# Name "fltk_png - Win32 Debug"
+# Name "fltk3png - Win32 Release"
+# Name "fltk3png - Win32 Debug"
# Begin Source File
-SOURCE=..\..\png\png.c
+SOURCE=..\..\src\png\png.c
# End Source File
# Begin Source File
-SOURCE=..\..\png\pngerror.c
+SOURCE=..\..\src\png\pngerror.c
# End Source File
# Begin Source File
-SOURCE=..\..\png\pngget.c
+SOURCE=..\..\src\png\pngget.c
# End Source File
# Begin Source File
-SOURCE=..\..\png\pngmem.c
+SOURCE=..\..\src\png\pngmem.c
# End Source File
# Begin Source File
-SOURCE=..\..\png\pngpread.c
+SOURCE=..\..\src\png\pngpread.c
# End Source File
# Begin Source File
-SOURCE=..\..\png\pngread.c
+SOURCE=..\..\src\png\pngread.c
# End Source File
# Begin Source File
-SOURCE=..\..\png\pngrio.c
+SOURCE=..\..\src\png\pngrio.c
# End Source File
# Begin Source File
-SOURCE=..\..\png\pngrtran.c
+SOURCE=..\..\src\png\pngrtran.c
# End Source File
# Begin Source File
-SOURCE=..\..\png\pngrutil.c
+SOURCE=..\..\src\png\pngrutil.c
# End Source File
# Begin Source File
-SOURCE=..\..\png\pngset.c
+SOURCE=..\..\src\png\pngset.c
# End Source File
# Begin Source File
-SOURCE=..\..\png\pngtrans.c
+SOURCE=..\..\src\png\pngtrans.c
# End Source File
# Begin Source File
-SOURCE=..\..\png\pngwio.c
+SOURCE=..\..\src\png\pngwio.c
# End Source File
# Begin Source File
-SOURCE=..\..\png\pngwrite.c
+SOURCE=..\..\src\png\pngwrite.c
# End Source File
# Begin Source File
-SOURCE=..\..\png\pngwtran.c
+SOURCE=..\..\src\png\pngwtran.c
# End Source File
# Begin Source File
-SOURCE=..\..\png\pngwutil.c
+SOURCE=..\..\src\png\pngwutil.c
# End Source File
# End Target
# End Project
Modified: branches/branch-3.0/ide/VisualC6/fltk3zlib.dsp
===================================================================
--- branches/branch-3.0/ide/VisualC6/fltk3zlib.dsp 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC6/fltk3zlib.dsp 2011-08-22 19:53:15 UTC (rev 8996)
@@ -1,24 +1,24 @@
-# Microsoft Developer Studio Project File - Name="fltk_zlib" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="fltk3zlib" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Static Library" 0x0104
-CFG=fltk_zlib - Win32 Debug
+CFG=fltk3zlib - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
-!MESSAGE NMAKE /f "fltk_zlib.mak".
+!MESSAGE NMAKE /f "fltk3zlib.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "fltk_zlib.mak" CFG="fltk_zlib - Win32 Debug"
+!MESSAGE NMAKE /f "fltk3zlib.mak" CFG="fltk3zlib - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "fltk_zlib - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "fltk_zlib - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "fltk3zlib - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "fltk3zlib - Win32 Debug" (based on "Win32 (x86) Static Library")
!MESSAGE
# Begin Project
@@ -28,20 +28,20 @@
CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "fltk_zlib - Win32 Release"
+!IF "$(CFG)" == "fltk3zlib - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release\fltk_zlib"
-# PROP BASE Intermediate_Dir "Release\fltk_zlib"
+# PROP BASE Output_Dir "Release\fltk3zlib"
+# PROP BASE Intermediate_Dir "Release\fltk3zlib"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release\fltk_zlib"
-# PROP Intermediate_Dir "Release\fltk_zlib"
+# PROP Output_Dir "Release\fltk3zlib"
+# PROP Intermediate_Dir "Release\fltk3zlib"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "FL_LIBRARY" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Ot /Op /Ob2 /I "." /I "..\.." /I "..\..\zlib" /I "..\..\png" /I "..\..\jpeg" /D "WIN32" /D "FL_LIBRARY" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Ot /Op /Ob2 /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "FL_LIBRARY" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# SUBTRACT CPP /Os
# ADD BASE RSC /l 0x409
# ADD RSC /l 0x409
@@ -50,22 +50,22 @@
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\lib\fltk_zlib.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\fltk3zlib.lib"
-!ELSEIF "$(CFG)" == "fltk_zlib - Win32 Debug"
+!ELSEIF "$(CFG)" == "fltk3zlib - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug\fltk_zlib"
-# PROP BASE Intermediate_Dir "Debug\fltk_zlib"
+# PROP BASE Output_Dir "Debug\fltk3zlib"
+# PROP BASE Intermediate_Dir "Debug\fltk3zlib"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug\fltk_zlib"
-# PROP Intermediate_Dir "Debug\fltk_zlib"
+# PROP Output_Dir "Debug\fltk3zlib"
+# PROP Intermediate_Dir "Debug\fltk3zlib"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "FL_LIBRARY" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /GX /Z7 /Od /I "." /I "..\.." /I "..\..\zlib" /I "..\..\png" /I "..\..\jpeg" /D "WIN32" /D "FL_LIBRARY" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /FR /YX /FD /c
+# ADD CPP /nologo /MDd /GX /Z7 /Od /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "FL_LIBRARY" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /FR /YX /FD /c
# ADD BASE RSC /l 0x409
# ADD RSC /l 0x409
BSC32=bscmake.exe
@@ -73,73 +73,73 @@
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\lib\fltk_zlibd.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\fltk3zlibd.lib"
!ENDIF
# Begin Target
-# Name "fltk_zlib - Win32 Release"
-# Name "fltk_zlib - Win32 Debug"
+# Name "fltk3zlib - Win32 Release"
+# Name "fltk3zlib - Win32 Debug"
# Begin Source File
-SOURCE=..\..\zlib\adler32.c
+SOURCE=..\..\src\zlib\adler32.c
# End Source File
# Begin Source File
-SOURCE=..\..\zlib\compress.c
+SOURCE=..\..\src\zlib\compress.c
# End Source File
# Begin Source File
-SOURCE=..\..\zlib\crc32.c
+SOURCE=..\..\src\zlib\crc32.c
# End Source File
# Begin Source File
-SOURCE=..\..\zlib\deflate.c
+SOURCE=..\..\src\zlib\deflate.c
# End Source File
# Begin Source File
-SOURCE=..\..\zlib\gzclose.c
+SOURCE=..\..\src\zlib\gzclose.c
# End Source File
# Begin Source File
-SOURCE=..\..\zlib\gzlib.c
+SOURCE=..\..\src\zlib\gzlib.c
# End Source File
# Begin Source File
-SOURCE=..\..\zlib\gzread.c
+SOURCE=..\..\src\zlib\gzread.c
# End Source File
# Begin Source File
-SOURCE=..\..\zlib\gzwrite.c
+SOURCE=..\..\src\zlib\gzwrite.c
# End Source File
# Begin Source File
-SOURCE=..\..\zlib\infback.c
+SOURCE=..\..\src\zlib\infback.c
# End Source File
# Begin Source File
-SOURCE=..\..\zlib\inffast.c
+SOURCE=..\..\src\zlib\inffast.c
# End Source File
# Begin Source File
-SOURCE=..\..\zlib\inflate.c
+SOURCE=..\..\src\zlib\inflate.c
# End Source File
# Begin Source File
-SOURCE=..\..\zlib\inftrees.c
+SOURCE=..\..\src\zlib\inftrees.c
# End Source File
# Begin Source File
-SOURCE=..\..\zlib\trees.c
+SOURCE=..\..\src\zlib\trees.c
# End Source File
# Begin Source File
-SOURCE=..\..\zlib\uncompr.c
+SOURCE=..\..\src\zlib\uncompr.c
# End Source File
# Begin Source File
-SOURCE=..\..\zlib\zutil.c
+SOURCE=..\..\src\zlib\zutil.c
# End Source File
# End Target
# End Project
Modified: branches/branch-3.0/ide/VisualC6/fonts.dsp
===================================================================
--- branches/branch-3.0/ide/VisualC6/fonts.dsp 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC6/fonts.dsp 2011-08-22 19:53:15 UTC (rev 8996)
@@ -43,7 +43,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\.." /I "..\..\zlib" /I "..\..\png" /I "..\..\jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 fltk.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/fonts.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/fonts.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:yes
!ELSEIF "$(CFG)" == "fonts - Win32 Debug"
@@ -70,7 +70,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\.." /I "..\../zlib" /I "..\../png" /I "..\../jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -80,7 +80,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 fltkd.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/fontsd.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3d.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/fontsd.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:no
!ENDIF
Modified: branches/branch-3.0/ide/VisualC6/fractals.dsp
===================================================================
--- branches/branch-3.0/ide/VisualC6/fractals.dsp 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC6/fractals.dsp 2011-08-22 19:53:15 UTC (rev 8996)
@@ -43,7 +43,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\.." /I "..\..\zlib" /I "..\..\png" /I "..\..\jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 fltk.lib fltk_gl.lib glu32.lib opengl32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/fractals.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3gl.lib fltk3.lib glu32.lib opengl32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/fractals.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:yes
!ELSEIF "$(CFG)" == "fractals - Win32 Debug"
@@ -70,7 +70,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\.." /I "..\../zlib" /I "..\../png" /I "..\../jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -80,7 +80,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 fltkd.lib fltk_gld.lib glu32.lib opengl32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/fractalsd.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3gld.lib fltk3d.lib glu32.lib opengl32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/fractalsd.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:no
!ENDIF
Modified: branches/branch-3.0/ide/VisualC6/fullscreen.dsp
===================================================================
--- branches/branch-3.0/ide/VisualC6/fullscreen.dsp 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC6/fullscreen.dsp 2011-08-22 19:53:15 UTC (rev 8996)
@@ -43,7 +43,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\.." /I "..\..\zlib" /I "..\..\png" /I "..\..\jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 fltk.lib fltk_gl.lib glu32.lib opengl32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/fullscreen.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3.lib fltk3gl.lib glu32.lib opengl32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/fullscreen.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:yes
!ELSEIF "$(CFG)" == "fullscreen - Win32 Debug"
@@ -70,7 +70,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\.." /I "..\../zlib" /I "..\../png" /I "..\../jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -80,7 +80,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 fltkd.lib fltk_gld.lib glu32.lib opengl32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/fullscreend.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3d.lib fltk3gld.lib glu32.lib opengl32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/fullscreend.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:no
!ENDIF
Modified: branches/branch-3.0/ide/VisualC6/gl_overlay.dsp
===================================================================
--- branches/branch-3.0/ide/VisualC6/gl_overlay.dsp 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC6/gl_overlay.dsp 2011-08-22 19:53:15 UTC (rev 8996)
@@ -43,7 +43,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\.." /I "..\..\zlib" /I "..\..\png" /I "..\..\jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 fltk.lib fltk_gl.lib glu32.lib opengl32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/gl_overlay.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3.lib fltk3gl.lib glu32.lib opengl32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/gl_overlay.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:yes
!ELSEIF "$(CFG)" == "gl_overlay - Win32 Debug"
@@ -70,7 +70,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\.." /I "..\../zlib" /I "..\../png" /I "..\../jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -80,7 +80,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 fltkd.lib fltk_gld.lib glu32.lib opengl32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/gl_overlayd.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3d.lib fltk3gld.lib glu32.lib opengl32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/gl_overlayd.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:no
!ENDIF
Modified: branches/branch-3.0/ide/VisualC6/glpuzzle.dsp
===================================================================
--- branches/branch-3.0/ide/VisualC6/glpuzzle.dsp 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC6/glpuzzle.dsp 2011-08-22 19:53:15 UTC (rev 8996)
@@ -43,7 +43,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\.." /I "..\..\zlib" /I "..\..\png" /I "..\..\jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 fltk.lib fltk_gl.lib glu32.lib opengl32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/glpuzzle.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3gl.lib fltk3.lib glu32.lib opengl32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/glpuzzle.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:yes
!ELSEIF "$(CFG)" == "glpuzzle - Win32 Debug"
@@ -70,7 +70,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\.." /I "..\../zlib" /I "..\../png" /I "..\../jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -80,7 +80,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 fltkd.lib fltk_gld.lib glu32.lib opengl32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/glpuzzled.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3gld.lib fltk3d.lib glu32.lib opengl32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/glpuzzled.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:no
!ENDIF
Modified: branches/branch-3.0/ide/VisualC6/hello.dsp
===================================================================
--- branches/branch-3.0/ide/VisualC6/hello.dsp 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC6/hello.dsp 2011-08-22 19:53:15 UTC (rev 8996)
@@ -43,7 +43,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\.." /I "..\..\zlib" /I "..\..\png" /I "..\..\jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 fltk.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/hello.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/hello.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:yes
!ELSEIF "$(CFG)" == "hello - Win32 Debug"
@@ -70,7 +70,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\.." /I "..\../zlib" /I "..\../png" /I "..\../jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -80,7 +80,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 fltkd.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/hellod.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3d.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/hellod.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:no
!ENDIF
Modified: branches/branch-3.0/ide/VisualC6/help.dsp
===================================================================
--- branches/branch-3.0/ide/VisualC6/help.dsp 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC6/help.dsp 2011-08-22 19:53:15 UTC (rev 8996)
@@ -43,7 +43,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\.." /I "..\..\zlib" /I "..\..\png" /I "..\..\jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 fltk.lib fltk_images.lib fltk_png.lib fltk_jpeg.lib fltk_zlib.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/help.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3images.lib fltk3.lib fltk3png.lib fltk3jpeg.lib fltk3zlib.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/help.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:yes
!ELSEIF "$(CFG)" == "help - Win32 Debug"
@@ -70,7 +70,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\.." /I "..\../zlib" /I "..\../png" /I "..\../jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -80,7 +80,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 fltkd.lib fltk_imagesd.lib fltk_pngd.lib fltk_jpegd.lib fltk_zlibd.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/helpd.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3imagesd.lib fltk3d.lib fltk3pngd.lib fltk3jpegd.lib fltk3zlibd.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/helpd.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:no
!ENDIF
Modified: branches/branch-3.0/ide/VisualC6/iconize.dsp
===================================================================
--- branches/branch-3.0/ide/VisualC6/iconize.dsp 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC6/iconize.dsp 2011-08-22 19:53:15 UTC (rev 8996)
@@ -43,7 +43,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\.." /I "..\..\zlib" /I "..\..\png" /I "..\..\jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 fltk.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/iconize.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/iconize.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:yes
!ELSEIF "$(CFG)" == "iconize - Win32 Debug"
@@ -70,7 +70,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\.." /I "..\../zlib" /I "..\../png" /I "..\../jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -80,7 +80,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 fltkd.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/iconized.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3d.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/iconized.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:no
!ENDIF
Modified: branches/branch-3.0/ide/VisualC6/image.dsp
===================================================================
--- branches/branch-3.0/ide/VisualC6/image.dsp 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC6/image.dsp 2011-08-22 19:53:15 UTC (rev 8996)
@@ -43,7 +43,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\.." /I "..\..\zlib" /I "..\..\png" /I "..\..\jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 fltk.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/image.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/image.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:yes
!ELSEIF "$(CFG)" == "image - Win32 Debug"
@@ -70,7 +70,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\.." /I "..\../zlib" /I "..\../png" /I "..\../jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -80,7 +80,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 fltkd.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/imaged.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3d.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/imaged.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:no
!ENDIF
Modified: branches/branch-3.0/ide/VisualC6/inactive.dsp
===================================================================
--- branches/branch-3.0/ide/VisualC6/inactive.dsp 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC6/inactive.dsp 2011-08-22 19:53:15 UTC (rev 8996)
@@ -43,7 +43,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\.." /I "..\..\zlib" /I "..\..\png" /I "..\..\jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 fltk.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/inactive.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/inactive.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:yes
!ELSEIF "$(CFG)" == "inactive - Win32 Debug"
@@ -70,7 +70,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\.." /I "..\../zlib" /I "..\../png" /I "..\../jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -80,7 +80,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 fltkd.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/inactived.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3d.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/inactived.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:no
!ENDIF
Modified: branches/branch-3.0/ide/VisualC6/input.dsp
===================================================================
--- branches/branch-3.0/ide/VisualC6/input.dsp 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC6/input.dsp 2011-08-22 19:53:15 UTC (rev 8996)
@@ -43,7 +43,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\.." /I "..\..\zlib" /I "..\..\png" /I "..\..\jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 fltk.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/input.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/input.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:yes
!ELSEIF "$(CFG)" == "input - Win32 Debug"
@@ -70,7 +70,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\.." /I "..\../zlib" /I "..\../png" /I "..\../jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -80,7 +80,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 fltkd.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/inputd.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3d.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/inputd.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:no
!ENDIF
Modified: branches/branch-3.0/ide/VisualC6/input_choice.dsp
===================================================================
--- branches/branch-3.0/ide/VisualC6/input_choice.dsp 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC6/input_choice.dsp 2011-08-22 19:53:15 UTC (rev 8996)
@@ -43,7 +43,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\.." /I "..\..\zlib" /I "..\..\png" /I "..\..\jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 fltk.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/input_choice.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/input_choice.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:yes
!ELSEIF "$(CFG)" == "input_choice - Win32 Debug"
@@ -70,7 +70,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\.." /I "..\../zlib" /I "..\../png" /I "..\../jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -80,7 +80,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 fltkd.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/input_choiced.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3d.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/input_choiced.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:no
!ENDIF
Modified: branches/branch-3.0/ide/VisualC6/keyboard.dsp
===================================================================
--- branches/branch-3.0/ide/VisualC6/keyboard.dsp 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC6/keyboard.dsp 2011-08-22 19:53:15 UTC (rev 8996)
@@ -43,7 +43,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\.." /I "..\..\zlib" /I "..\..\png" /I "..\..\jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 fltk.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/keyboard.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/keyboard.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:yes
!ELSEIF "$(CFG)" == "keyboard - Win32 Debug"
@@ -70,7 +70,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\.." /I "..\../zlib" /I "..\../png" /I "..\../jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -80,7 +80,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 fltkd.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/keyboardd.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3d.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/keyboardd.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:no
!ENDIF
Modified: branches/branch-3.0/ide/VisualC6/label.dsp
===================================================================
--- branches/branch-3.0/ide/VisualC6/label.dsp 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC6/label.dsp 2011-08-22 19:53:15 UTC (rev 8996)
@@ -43,7 +43,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\.." /I "..\..\zlib" /I "..\..\png" /I "..\..\jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 fltk.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/label.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/label.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:yes
!ELSEIF "$(CFG)" == "label - Win32 Debug"
@@ -70,7 +70,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\.." /I "..\../zlib" /I "..\../png" /I "..\../jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -80,7 +80,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 fltkd.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/labeld.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3d.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/labeld.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:no
!ENDIF
Modified: branches/branch-3.0/ide/VisualC6/line_style.dsp
===================================================================
--- branches/branch-3.0/ide/VisualC6/line_style.dsp 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC6/line_style.dsp 2011-08-22 19:53:15 UTC (rev 8996)
@@ -43,7 +43,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\.." /I "..\..\zlib" /I "..\..\png" /I "..\..\jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 fltk.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/line_style.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/line_style.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:yes
!ELSEIF "$(CFG)" == "line_style - Win32 Debug"
@@ -70,7 +70,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\.." /I "..\../zlib" /I "..\../png" /I "..\../jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -80,7 +80,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 fltkd.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/line_styled.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3d.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/line_styled.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:no
!ENDIF
Modified: branches/branch-3.0/ide/VisualC6/list_visuals.dsp
===================================================================
--- branches/branch-3.0/ide/VisualC6/list_visuals.dsp 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC6/list_visuals.dsp 2011-08-22 19:53:15 UTC (rev 8996)
@@ -43,7 +43,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\.." /I "..\..\zlib" /I "..\..\png" /I "..\..\jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 fltk.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/list_visuals.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/list_visuals.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:yes
!ELSEIF "$(CFG)" == "list_visuals - Win32 Debug"
@@ -70,7 +70,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\.." /I "..\../zlib" /I "..\../png" /I "..\../jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -80,7 +80,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 fltkd.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/list_visualsd.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3d.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/list_visualsd.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:no
!ENDIF
Modified: branches/branch-3.0/ide/VisualC6/mandelbrot.dsp
===================================================================
--- branches/branch-3.0/ide/VisualC6/mandelbrot.dsp 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC6/mandelbrot.dsp 2011-08-22 19:53:15 UTC (rev 8996)
@@ -43,7 +43,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\.." /I "..\..\zlib" /I "..\..\png" /I "..\..\jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 fltk.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/mandelbrot.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/mandelbrot.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:yes
!ELSEIF "$(CFG)" == "mandelbrot - Win32 Debug"
@@ -70,7 +70,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\.." /I "..\../zlib" /I "..\../png" /I "..\../jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -80,7 +80,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 fltkd.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/mandelbrotd.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3d.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/mandelbrotd.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:no
!ENDIF
Modified: branches/branch-3.0/ide/VisualC6/menubar.dsp
===================================================================
--- branches/branch-3.0/ide/VisualC6/menubar.dsp 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC6/menubar.dsp 2011-08-22 19:53:15 UTC (rev 8996)
@@ -43,7 +43,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\.." /I "..\..\zlib" /I "..\..\png" /I "..\..\jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 fltk.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/menubar.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/menubar.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:yes
!ELSEIF "$(CFG)" == "menubar - Win32 Debug"
@@ -70,7 +70,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\.." /I "..\../zlib" /I "..\../png" /I "..\../jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -80,7 +80,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 fltkd.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/menubard.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3d.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/menubard.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:no
!ENDIF
Modified: branches/branch-3.0/ide/VisualC6/message.dsp
===================================================================
--- branches/branch-3.0/ide/VisualC6/message.dsp 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC6/message.dsp 2011-08-22 19:53:15 UTC (rev 8996)
@@ -43,7 +43,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\.." /I "..\..\zlib" /I "..\..\png" /I "..\..\jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 fltk.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/message.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/message.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:yes
!ELSEIF "$(CFG)" == "message - Win32 Debug"
@@ -70,7 +70,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\.." /I "..\../zlib" /I "..\../png" /I "..\../jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -80,7 +80,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 fltkd.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/messaged.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3d.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/messaged.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:no
!ENDIF
Modified: branches/branch-3.0/ide/VisualC6/minimum.dsp
===================================================================
--- branches/branch-3.0/ide/VisualC6/minimum.dsp 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC6/minimum.dsp 2011-08-22 19:53:15 UTC (rev 8996)
@@ -43,7 +43,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\.." /I "..\..\zlib" /I "..\..\png" /I "..\..\jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 fltk.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/minimum.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/minimum.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:yes
!ELSEIF "$(CFG)" == "minimum - Win32 Debug"
@@ -70,7 +70,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\.." /I "..\../zlib" /I "..\../png" /I "..\../jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -80,7 +80,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 fltkd.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/minimumd.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3d.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/minimumd.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:no
!ENDIF
Modified: branches/branch-3.0/ide/VisualC6/native-filechooser.dsp
===================================================================
--- branches/branch-3.0/ide/VisualC6/native-filechooser.dsp 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC6/native-filechooser.dsp 2011-08-22 19:53:15 UTC (rev 8996)
@@ -43,7 +43,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\.." /I "..\..\zlib" /I "..\..\png" /I "..\..\jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 fltk.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/native-filechooser.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3images.lib fltk3.lib fltk3png.lib fltk3jpeg.lib fltk3zlib.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/native-filechooser.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:yes
!ELSEIF "$(CFG)" == "native-filechooser - Win32 Debug"
@@ -70,7 +70,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\.." /I "..\../zlib" /I "..\../png" /I "..\../jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -80,7 +80,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 fltkd.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/native-filechooserd.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3imagesd.lib fltk3d.lib fltk3pngd.lib fltk3jpegd.lib fltk3zlibd.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/native-filechooserd.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:no
!ENDIF
Modified: branches/branch-3.0/ide/VisualC6/navigation.dsp
===================================================================
--- branches/branch-3.0/ide/VisualC6/navigation.dsp 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC6/navigation.dsp 2011-08-22 19:53:15 UTC (rev 8996)
@@ -43,7 +43,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\.." /I "..\..\zlib" /I "..\..\png" /I "..\..\jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 fltk.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/navigation.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/navigation.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:yes
!ELSEIF "$(CFG)" == "navigation - Win32 Debug"
@@ -70,7 +70,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\.." /I "..\../zlib" /I "..\../png" /I "..\../jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -80,7 +80,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 fltkd.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/navigationd.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3d.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/navigationd.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:no
!ENDIF
Modified: branches/branch-3.0/ide/VisualC6/output.dsp
===================================================================
--- branches/branch-3.0/ide/VisualC6/output.dsp 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC6/output.dsp 2011-08-22 19:53:15 UTC (rev 8996)
@@ -43,7 +43,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\.." /I "..\..\zlib" /I "..\..\png" /I "..\..\jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 fltk.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/output.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/output.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:yes
!ELSEIF "$(CFG)" == "output - Win32 Debug"
@@ -70,7 +70,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\.." /I "..\../zlib" /I "..\../png" /I "..\../jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -80,7 +80,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 fltkd.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/outputd.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3d.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/outputd.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:no
!ENDIF
Modified: branches/branch-3.0/ide/VisualC6/overlay.dsp
===================================================================
--- branches/branch-3.0/ide/VisualC6/overlay.dsp 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC6/overlay.dsp 2011-08-22 19:53:15 UTC (rev 8996)
@@ -43,7 +43,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\.." /I "..\..\zlib" /I "..\..\png" /I "..\..\jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 fltk.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/overlay.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/overlay.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:yes
!ELSEIF "$(CFG)" == "overlay - Win32 Debug"
@@ -70,7 +70,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\.." /I "..\../zlib" /I "..\../png" /I "..\../jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -80,7 +80,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 fltkd.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/overlayd.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3d.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/overlayd.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:no
!ENDIF
Modified: branches/branch-3.0/ide/VisualC6/pack.dsp
===================================================================
--- branches/branch-3.0/ide/VisualC6/pack.dsp 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC6/pack.dsp 2011-08-22 19:53:15 UTC (rev 8996)
@@ -43,7 +43,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\.." /I "..\..\zlib" /I "..\..\png" /I "..\..\jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 fltk.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/pack.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/pack.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:yes
!ELSEIF "$(CFG)" == "pack - Win32 Debug"
@@ -70,7 +70,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\.." /I "..\../zlib" /I "..\../png" /I "..\../jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -80,7 +80,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 fltkd.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/packd.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3d.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/packd.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:no
!ENDIF
Modified: branches/branch-3.0/ide/VisualC6/pixmap.dsp
===================================================================
--- branches/branch-3.0/ide/VisualC6/pixmap.dsp 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC6/pixmap.dsp 2011-08-22 19:53:15 UTC (rev 8996)
@@ -43,7 +43,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\.." /I "..\..\zlib" /I "..\..\png" /I "..\..\jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 fltk.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/pixmap.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/pixmap.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:yes
!ELSEIF "$(CFG)" == "pixmap - Win32 Debug"
@@ -70,7 +70,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\.." /I "..\../zlib" /I "..\../png" /I "..\../jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -80,7 +80,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 fltkd.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/pixmapd.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3d.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/pixmapd.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:no
!ENDIF
Modified: branches/branch-3.0/ide/VisualC6/pixmap_browser.dsp
===================================================================
--- branches/branch-3.0/ide/VisualC6/pixmap_browser.dsp 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC6/pixmap_browser.dsp 2011-08-22 19:53:15 UTC (rev 8996)
@@ -43,7 +43,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\.." /I "..\..\zlib" /I "..\..\png" /I "..\..\jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 fltk.lib fltk_images.lib fltk_png.lib fltk_jpeg.lib fltk_zlib.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/pixmap_browser.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3.lib fltk3images.lib fltk3png.lib fltk3jpeg.lib fltk3zlib.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/pixmap_browser.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:yes
!ELSEIF "$(CFG)" == "pixmap_browser - Win32 Debug"
@@ -70,7 +70,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\.." /I "..\../zlib" /I "..\../png" /I "..\../jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -80,7 +80,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 fltkd.lib fltk_imagesd.lib fltk_pngd.lib fltk_jpegd.lib fltk_zlibd.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/pixmap_browserd.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3d.lib fltk3imagesd.lib fltk3pngd.lib fltk3jpegd.lib fltk3zlibd.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/pixmap_browserd.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:no
!ENDIF
Modified: branches/branch-3.0/ide/VisualC6/preferences.dsp
===================================================================
--- branches/branch-3.0/ide/VisualC6/preferences.dsp 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC6/preferences.dsp 2011-08-22 19:53:15 UTC (rev 8996)
@@ -43,7 +43,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\.." /I "..\..\zlib" /I "..\..\png" /I "..\..\jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 fltk.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/preferences.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/preferences.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:yes
!ELSEIF "$(CFG)" == "preferences - Win32 Debug"
@@ -70,7 +70,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\.." /I "..\../zlib" /I "..\../png" /I "..\../jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -80,7 +80,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 fltkd.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/preferencesd.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3d.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/preferencesd.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:no
!ENDIF
Modified: branches/branch-3.0/ide/VisualC6/radio.dsp
===================================================================
--- branches/branch-3.0/ide/VisualC6/radio.dsp 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC6/radio.dsp 2011-08-22 19:53:15 UTC (rev 8996)
@@ -43,7 +43,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\.." /I "..\..\zlib" /I "..\..\png" /I "..\..\jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 fltk.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/radio.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/radio.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:yes
!ELSEIF "$(CFG)" == "radio - Win32 Debug"
@@ -70,7 +70,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\.." /I "..\../zlib" /I "..\../png" /I "..\../jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -80,7 +80,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 fltkd.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/radiod.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3d.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/radiod.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:no
!ENDIF
Modified: branches/branch-3.0/ide/VisualC6/resize.dsp
===================================================================
--- branches/branch-3.0/ide/VisualC6/resize.dsp 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC6/resize.dsp 2011-08-22 19:53:15 UTC (rev 8996)
@@ -43,7 +43,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\.." /I "..\..\zlib" /I "..\..\png" /I "..\..\jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 fltk.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/resize.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/resize.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:yes
!ELSEIF "$(CFG)" == "resize - Win32 Debug"
@@ -70,7 +70,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\.." /I "..\../zlib" /I "..\../png" /I "..\../jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -80,7 +80,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 fltkd.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/resized.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3d.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/resized.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:no
!ENDIF
Modified: branches/branch-3.0/ide/VisualC6/resizebox.dsp
===================================================================
--- branches/branch-3.0/ide/VisualC6/resizebox.dsp 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC6/resizebox.dsp 2011-08-22 19:53:15 UTC (rev 8996)
@@ -43,7 +43,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\.." /I "..\..\zlib" /I "..\..\png" /I "..\..\jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 fltk.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/resizebox.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/resizebox.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:yes
!ELSEIF "$(CFG)" == "resizebox - Win32 Debug"
@@ -70,7 +70,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\.." /I "..\../zlib" /I "..\../png" /I "..\../jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -80,7 +80,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 fltkd.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/resizeboxd.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3d.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/resizeboxd.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:no
!ENDIF
Modified: branches/branch-3.0/ide/VisualC6/rotated_text.dsp
===================================================================
--- branches/branch-3.0/ide/VisualC6/rotated_text.dsp 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC6/rotated_text.dsp 2011-08-22 19:53:15 UTC (rev 8996)
@@ -43,7 +43,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\.." /I "..\..\zlib" /I "..\..\png" /I "..\..\jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 fltk.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/rotated_text.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/rotated_text.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:yes
!ELSEIF "$(CFG)" == "rotated_text - Win32 Debug"
@@ -70,7 +70,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\.." /I "..\../zlib" /I "..\../png" /I "..\../jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -80,7 +80,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 fltkd.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/rotated_textd.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3d.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/rotated_textd.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:no
!ENDIF
Modified: branches/branch-3.0/ide/VisualC6/scroll.dsp
===================================================================
--- branches/branch-3.0/ide/VisualC6/scroll.dsp 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC6/scroll.dsp 2011-08-22 19:53:15 UTC (rev 8996)
@@ -43,7 +43,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\.." /I "..\..\zlib" /I "..\..\png" /I "..\..\jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 fltk.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/scroll.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/scroll.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:yes
!ELSEIF "$(CFG)" == "scroll - Win32 Debug"
@@ -70,7 +70,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\.." /I "..\../zlib" /I "..\../png" /I "..\../jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -80,7 +80,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 fltkd.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/scrolld.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3d.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/scrolld.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:no
!ENDIF
Modified: branches/branch-3.0/ide/VisualC6/shape.dsp
===================================================================
--- branches/branch-3.0/ide/VisualC6/shape.dsp 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC6/shape.dsp 2011-08-22 19:53:15 UTC (rev 8996)
@@ -43,7 +43,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\.." /I "..\..\zlib" /I "..\..\png" /I "..\..\jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 fltk.lib fltk_gl.lib glu32.lib opengl32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/shape.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3.lib fltk3gl.lib glu32.lib opengl32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/shape.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:yes
!ELSEIF "$(CFG)" == "shape - Win32 Debug"
@@ -70,7 +70,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\.." /I "..\../zlib" /I "..\../png" /I "..\../jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -80,7 +80,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 fltkd.lib fltk_gld.lib glu32.lib opengl32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/shaped.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3d.lib fltk3gld.lib glu32.lib opengl32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/shaped.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:no
!ENDIF
Modified: branches/branch-3.0/ide/VisualC6/subwindow.dsp
===================================================================
--- branches/branch-3.0/ide/VisualC6/subwindow.dsp 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC6/subwindow.dsp 2011-08-22 19:53:15 UTC (rev 8996)
@@ -43,7 +43,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\.." /I "..\..\zlib" /I "..\..\png" /I "..\..\jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 fltk.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/subwindow.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/subwindow.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:yes
!ELSEIF "$(CFG)" == "subwindow - Win32 Debug"
@@ -70,7 +70,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\.." /I "..\../zlib" /I "..\../png" /I "..\../jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -80,7 +80,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 fltkd.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/subwindowd.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3d.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/subwindowd.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:no
!ENDIF
Modified: branches/branch-3.0/ide/VisualC6/sudoku.dsp
===================================================================
--- branches/branch-3.0/ide/VisualC6/sudoku.dsp 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC6/sudoku.dsp 2011-08-22 19:53:15 UTC (rev 8996)
@@ -43,7 +43,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\.." /I "..\..\zlib" /I "..\..\png" /I "..\..\jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 fltk.lib fltk_images.lib fltk_png.lib fltk_jpeg.lib fltk_zlib.lib winmm.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/sudoku.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3images.lib fltk3.lib fltk3png.lib fltk3jpeg.lib fltk3zlib.lib winmm.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/sudoku.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:yes
!ELSEIF "$(CFG)" == "sudoku - Win32 Debug"
@@ -70,7 +70,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\.." /I "..\../zlib" /I "..\../png" /I "..\../jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -80,7 +80,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 fltkd.lib fltk_imagesd.lib fltk_pngd.lib fltk_jpegd.lib fltk_zlibd.lib winmm.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/sudokud.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3imagesd.lib fltk3d.lib fltk3pngd.lib fltk3jpegd.lib fltk3zlibd.lib winmm.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/sudokud.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:no
!ENDIF
Modified: branches/branch-3.0/ide/VisualC6/symbols.dsp
===================================================================
--- branches/branch-3.0/ide/VisualC6/symbols.dsp 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC6/symbols.dsp 2011-08-22 19:53:15 UTC (rev 8996)
@@ -43,7 +43,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\.." /I "..\..\zlib" /I "..\..\png" /I "..\..\jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 fltk.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/symbols.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/symbols.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:yes
!ELSEIF "$(CFG)" == "symbols - Win32 Debug"
@@ -70,7 +70,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\.." /I "..\../zlib" /I "..\../png" /I "..\../jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -80,7 +80,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 fltkd.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/symbolsd.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3d.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/symbolsd.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:no
!ENDIF
Modified: branches/branch-3.0/ide/VisualC6/table.dsp
===================================================================
--- branches/branch-3.0/ide/VisualC6/table.dsp 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC6/table.dsp 2011-08-22 19:53:15 UTC (rev 8996)
@@ -43,7 +43,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\.." /I "..\..\zlib" /I "..\..\png" /I "..\..\jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 fltk.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/table.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/table.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:yes
!ELSEIF "$(CFG)" == "table - Win32 Debug"
@@ -70,7 +70,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\.." /I "..\../zlib" /I "..\../png" /I "..\../jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -80,7 +80,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 fltkd.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/tabled.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3d.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/tabled.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:no
!ENDIF
Modified: branches/branch-3.0/ide/VisualC6/tabs.dsp
===================================================================
--- branches/branch-3.0/ide/VisualC6/tabs.dsp 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC6/tabs.dsp 2011-08-22 19:53:15 UTC (rev 8996)
@@ -43,7 +43,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\.." /I "..\..\zlib" /I "..\..\png" /I "..\..\jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 fltk.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/tabs.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/tabs.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:yes
!ELSEIF "$(CFG)" == "tabs - Win32 Debug"
@@ -70,7 +70,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\.." /I "..\../zlib" /I "..\../png" /I "..\../jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -80,7 +80,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 fltkd.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/tabsd.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3d.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/tabsd.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:no
!ENDIF
Modified: branches/branch-3.0/ide/VisualC6/threads.dsp
===================================================================
--- branches/branch-3.0/ide/VisualC6/threads.dsp 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC6/threads.dsp 2011-08-22 19:53:15 UTC (rev 8996)
@@ -43,7 +43,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\.." /I "..\..\zlib" /I "..\..\png" /I "..\..\jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 fltk.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/threads.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/threads.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:yes
!ELSEIF "$(CFG)" == "threads - Win32 Debug"
@@ -70,7 +70,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\.." /I "..\../zlib" /I "..\../png" /I "..\../jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -80,7 +80,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 fltkd.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/threadsd.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3d.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/threadsd.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:no
!ENDIF
Modified: branches/branch-3.0/ide/VisualC6/tile.dsp
===================================================================
--- branches/branch-3.0/ide/VisualC6/tile.dsp 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC6/tile.dsp 2011-08-22 19:53:15 UTC (rev 8996)
@@ -43,7 +43,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\.." /I "..\..\zlib" /I "..\..\png" /I "..\..\jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 fltk.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/tile.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/tile.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:yes
!ELSEIF "$(CFG)" == "tile - Win32 Debug"
@@ -70,7 +70,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\.." /I "..\../zlib" /I "..\../png" /I "..\../jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -80,7 +80,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 fltkd.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/tiled.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3d.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/tiled.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:no
!ENDIF
Modified: branches/branch-3.0/ide/VisualC6/tiled_image.dsp
===================================================================
--- branches/branch-3.0/ide/VisualC6/tiled_image.dsp 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC6/tiled_image.dsp 2011-08-22 19:53:15 UTC (rev 8996)
@@ -43,7 +43,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\.." /I "..\..\zlib" /I "..\..\png" /I "..\..\jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 fltk.lib fltk_images.lib fltk_png.lib fltk_jpeg.lib fltk_zlib.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/tiled_image.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3.lib fltk3images.lib fltk3png.lib fltk3jpeg.lib fltk3zlib.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/tiled_image.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:yes
!ELSEIF "$(CFG)" == "tiled_image - Win32 Debug"
@@ -70,7 +70,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\.." /I "..\../zlib" /I "..\../png" /I "..\../jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -80,7 +80,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 fltkd.lib fltk_imagesd.lib fltk_pngd.lib fltk_jpegd.lib fltk_zlibd.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/tiled_imaged.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3d.lib fltk3imagesd.lib fltk3pngd.lib fltk3jpegd.lib fltk3zlibd.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/tiled_imaged.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:no
!ENDIF
Modified: branches/branch-3.0/ide/VisualC6/tree.dsp
===================================================================
--- branches/branch-3.0/ide/VisualC6/tree.dsp 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC6/tree.dsp 2011-08-22 19:53:15 UTC (rev 8996)
@@ -43,7 +43,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\.." /I "..\..\zlib" /I "..\..\png" /I "..\..\jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 fltk.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/tree.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/tree.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:yes
!ELSEIF "$(CFG)" == "tree - Win32 Debug"
@@ -70,7 +70,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\.." /I "..\../zlib" /I "..\../png" /I "..\../jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -80,7 +80,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 fltkd.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/treed.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3d.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/treed.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:no
!ENDIF
Modified: branches/branch-3.0/ide/VisualC6/unittests.dsp
===================================================================
--- branches/branch-3.0/ide/VisualC6/unittests.dsp 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC6/unittests.dsp 2011-08-22 19:53:15 UTC (rev 8996)
@@ -43,7 +43,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\.." /I "..\..\zlib" /I "..\..\png" /I "..\..\jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 fltk.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/unittests.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/unittests.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:yes
!ELSEIF "$(CFG)" == "unittests - Win32 Debug"
@@ -70,7 +70,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\.." /I "..\../zlib" /I "..\../png" /I "..\../jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -80,7 +80,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 fltkd.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/unittestsd.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3d.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/unittestsd.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:no
!ENDIF
Modified: branches/branch-3.0/ide/VisualC6/utf8.dsp
===================================================================
--- branches/branch-3.0/ide/VisualC6/utf8.dsp 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC6/utf8.dsp 2011-08-22 19:53:15 UTC (rev 8996)
@@ -43,7 +43,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\.." /I "..\..\zlib" /I "..\..\png" /I "..\..\jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 fltk.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/utf8.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/utf8.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:yes
!ELSEIF "$(CFG)" == "utf8 - Win32 Debug"
@@ -70,7 +70,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\.." /I "..\../zlib" /I "..\../png" /I "..\../jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -80,7 +80,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 fltkd.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/utf8d.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3d.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/utf8d.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:no
!ENDIF
Modified: branches/branch-3.0/ide/VisualC6/valuators.dsp
===================================================================
--- branches/branch-3.0/ide/VisualC6/valuators.dsp 2011-08-22 18:54:47 UTC (rev 8995)
+++ branches/branch-3.0/ide/VisualC6/valuators.dsp 2011-08-22 19:53:15 UTC (rev 8996)
@@ -43,7 +43,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\.." /I "..\..\zlib" /I "..\..\png" /I "..\..\jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Os /Ob2 /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 fltk.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/valuators.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /out:"../../test/valuators.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:yes
!ELSEIF "$(CFG)" == "valuators - Win32 Debug"
@@ -70,7 +70,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\.." /I "..\../zlib" /I "..\../png" /I "..\../jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
+# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I "..\..\include" /I "..\..\include\fltk3zlib" /I "..\..\include\fltk3png" /I "..\..\include\fltk3jpeg" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -80,7 +80,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 fltkd.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/valuatorsd.exe" /pdbtype:sept /libpath:"..\..\lib"
+# ADD LINK32 fltk3d.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/valuatorsd.exe" /pdbtype:sept /libpath:"..\..\lib"
# SUBTRACT LINK32 /pdb:none /incremental:no
!ENDIF
[ Direct Link to Message ] | |
