From 421f908c69ddf071b024608ae506472eb4edf962 Mon Sep 17 00:00:00 2001 From: Matthias Melcher Date: Sat, 27 Mar 2010 08:51:54 +0000 Subject: Bringing supported IDEs to the newest setup, add device and others. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7345 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- ide/VisualC6/CubeView.dsp | 6 +- ide/VisualC6/Fluid.dsp | 38 +-- ide/VisualC6/fast_slow.dsp | 2 +- ide/VisualC6/file_chooser.dsp | 4 +- ide/VisualC6/fltk.dsp | 4 + ide/VisualC6/fltk.dsw | 560 +++++++++++++++++++----------------- ide/VisualC6/fltkdll.dsp | 4 + ide/VisualC6/help.dsp | 4 +- ide/VisualC6/inactive.dsp | 2 +- ide/VisualC6/keyboard.dsp | 2 +- ide/VisualC6/mandelbrot.dsp | 2 +- ide/VisualC6/native-filechooser.dsp | 2 +- ide/VisualC6/pixmap_browser.dsp | 4 +- ide/VisualC6/preferences.dsp | 2 +- ide/VisualC6/radio.dsp | 2 +- ide/VisualC6/resize.dsp | 2 +- ide/VisualC6/sudoku.dsp | 4 +- ide/VisualC6/tabs.dsp | 2 +- ide/VisualC6/tiled_image.dsp | 4 +- ide/VisualC6/valuators.dsp | 2 +- 20 files changed, 348 insertions(+), 304 deletions(-) (limited to 'ide/VisualC6') diff --git a/ide/VisualC6/CubeView.dsp b/ide/VisualC6/CubeView.dsp index 865c0c337..4438f663c 100644 --- a/ide/VisualC6/CubeView.dsp +++ b/ide/VisualC6/CubeView.dsp @@ -91,11 +91,11 @@ LINK32=link.exe # Name "CubeView - Win32 Debug" # Begin Source File -SOURCE=..\..\test\CubeMain.cxx +SOURCE=..\..\test\CubeView.cxx # End Source File # Begin Source File -SOURCE=..\..\test\CubeView.cxx +SOURCE=..\..\test\CubeMain.cxx # End Source File # Begin Source File @@ -112,7 +112,7 @@ InputPath=..\..\test\CubeViewUI.fl "..\..\test\CubeViewUI.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" cd ..\..\test/ - ..\fluid\fluid -c CubeViewUI.fl + ..\fluid\fluid -c CubeViewUI.fl cd ..\ide\visualc # End Custom Build diff --git a/ide/VisualC6/Fluid.dsp b/ide/VisualC6/Fluid.dsp index 90c258a3e..3bfe73da6 100644 --- a/ide/VisualC6/Fluid.dsp +++ b/ide/VisualC6/Fluid.dsp @@ -91,63 +91,63 @@ LINK32=link.exe # Name "Fluid - Win32 Debug" # Begin Source File -SOURCE=..\..\fluid\about_panel.cxx +SOURCE=..\..\fluid\CodeEditor.cxx # End Source File # Begin Source File -SOURCE=..\..\fluid\align_widget.cxx +SOURCE=..\..\fluid\Fl_Function_Type.cxx # End Source File # Begin Source File -SOURCE=..\..\fluid\alignment_panel.cxx +SOURCE=..\..\fluid\Fl_Group_Type.cxx # End Source File # Begin Source File -SOURCE=..\..\fluid\code.cxx +SOURCE=..\..\fluid\Fl_Menu_Type.cxx # End Source File # Begin Source File -SOURCE=..\..\fluid\CodeEditor.cxx +SOURCE=..\..\fluid\Fl_Type.cxx # End Source File # Begin Source File -SOURCE=..\..\fluid\factory.cxx +SOURCE=..\..\fluid\Fl_Widget_Type.cxx # End Source File # Begin Source File -SOURCE=..\..\fluid\file.cxx +SOURCE=..\..\fluid\Fl_Window_Type.cxx # End Source File # Begin Source File -SOURCE=..\..\fluid\Fl_Function_Type.cxx +SOURCE=..\..\fluid\Fluid_Image.cxx # End Source File # Begin Source File -SOURCE=..\..\fluid\Fl_Group_Type.cxx +SOURCE=..\..\fluid\about_panel.cxx # End Source File # Begin Source File -SOURCE=..\..\fluid\Fl_Menu_Type.cxx +SOURCE=..\..\fluid\align_widget.cxx # End Source File # Begin Source File -SOURCE=..\..\fluid\Fl_Type.cxx +SOURCE=..\..\fluid\alignment_panel.cxx # End Source File # Begin Source File -SOURCE=..\..\fluid\Fl_Widget_Type.cxx +SOURCE=..\..\fluid\code.cxx # End Source File # Begin Source File -SOURCE=..\..\fluid\Fl_Window_Type.cxx +SOURCE=..\..\fluid\factory.cxx # End Source File # Begin Source File -SOURCE=..\..\fluid\fluid.cxx +SOURCE=..\..\fluid\file.cxx # End Source File # Begin Source File -SOURCE=..\..\fluid\Fluid_Image.cxx +SOURCE=..\..\fluid\fluid.cxx # End Source File # Begin Source File @@ -155,10 +155,6 @@ SOURCE=..\..\fluid\function_panel.cxx # End Source File # Begin Source File -SOURCE=..\..\fluid\ide_maketools.cxx -# End Source File -# Begin Source File - SOURCE=..\..\fluid\ide_support.cxx # End Source File # Begin Source File @@ -185,5 +181,9 @@ SOURCE=..\..\fluid\undo.cxx SOURCE=..\..\fluid\widget_panel.cxx # End Source File +# Begin Source File + +SOURCE=..\..\fluid\ide_maketools.cxx +# End Source File # End Target # End Project diff --git a/ide/VisualC6/fast_slow.dsp b/ide/VisualC6/fast_slow.dsp index 82f596a67..a4c162194 100644 --- a/ide/VisualC6/fast_slow.dsp +++ b/ide/VisualC6/fast_slow.dsp @@ -104,7 +104,7 @@ InputPath=..\..\test\fast_slow.fl "..\..\test\fast_slow.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" cd ..\..\test/ - ..\fluid\fluid -c fast_slow.fl + ..\fluid\fluid -c fast_slow.fl cd ..\ide\visualc # End Custom Build diff --git a/ide/VisualC6/file_chooser.dsp b/ide/VisualC6/file_chooser.dsp index 391d87006..0d0a45efa 100644 --- a/ide/VisualC6/file_chooser.dsp +++ b/ide/VisualC6/file_chooser.dsp @@ -53,7 +53,7 @@ BSC32=bscmake.exe # 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 fltkimages.lib fltkjpeg.lib fltkpng.lib comctl32.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_chooser.exe" /pdbtype:sept /libpath:"..\..\lib" +# ADD LINK32 fltk.lib fltkimages.lib fltkjpeg.lib fltkpng.lib 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 /debug /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" @@ -80,7 +80,7 @@ BSC32=bscmake.exe # 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 fltkimagesd.lib fltkjpegd.lib fltkpngd.lib comctl32.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 fltkd.lib fltkimagesd.lib fltkjpegd.lib fltkpngd.lib 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" # SUBTRACT LINK32 /pdb:none /incremental:no !ENDIF diff --git a/ide/VisualC6/fltk.dsp b/ide/VisualC6/fltk.dsp index 87b670f6e..189b521e5 100644 --- a/ide/VisualC6/fltk.dsp +++ b/ide/VisualC6/fltk.dsp @@ -677,5 +677,9 @@ SOURCE=..\..\src\Fl_Printer.cxx SOURCE=..\..\src\ps_image.cxx # End Source File +# Begin Source File + +SOURCE=..\..\src\Fl_Abstract_Printer.cxx +# End Source File # End Target # End Project diff --git a/ide/VisualC6/fltk.dsw b/ide/VisualC6/fltk.dsw index 7fe08a181..c818cf921 100644 --- a/ide/VisualC6/fltk.dsw +++ b/ide/VisualC6/fltk.dsw @@ -3,7 +3,7 @@ Microsoft Developer Studio Workspace File, Format Version 6.00 ############################################################################### -Project: "CubeView"=".\CubeView.dsp" - Package Owner=<4> +Project: "Fluid"=".\Fluid.dsp" - Package Owner=<4> Package=<5> {{{ @@ -15,15 +15,234 @@ Package=<4> Project_Dep_Name fltk End Project Dependency Begin Project Dependency - Project_Dep_Name fltkgl + Project_Dep_Name fltkforms End Project Dependency Begin Project Dependency - Project_Dep_Name Fluid + Project_Dep_Name fltkimages + End Project Dependency + Begin Project Dependency + Project_Dep_Name fltkjpeg + End Project Dependency + Begin Project Dependency + Project_Dep_Name fltkpng + End Project Dependency + Begin Project Dependency + Project_Dep_Name zlib + End Project Dependency +}}} + +############################################################################### + +Project: "fltk"=".\fltk.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Project: "fltkgl"=".\fltkgl.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name fltk + End Project Dependency +}}} + +############################################################################### + +Project: "fltkimages"=".\fltkimages.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name fltk + End Project Dependency + Begin Project Dependency + Project_Dep_Name fltkpng + End Project Dependency + Begin Project Dependency + Project_Dep_Name fltkjpeg + End Project Dependency +}}} + +############################################################################### + +Project: "fltkpng"=".\fltkpng.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name zlib + End Project Dependency +}}} + +############################################################################### + +Project: "fltkjpeg"=".\fltkjpeg.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name fltk + End Project Dependency +}}} + +############################################################################### + +Project: "fltkforms"=".\fltkforms.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name fltk + End Project Dependency +}}} + +############################################################################### + +Project: "zlib"=".\zlib.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Project: "fltkdll"=".\fltkdll.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Project: "fltkgldll"=".\fltkgldll.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name fltk + End Project Dependency +}}} + +############################################################################### + +Project: "fltkimagesdll"=".\fltkimagesdll.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name fltk + End Project Dependency + Begin Project Dependency + Project_Dep_Name fltkpng + End Project Dependency + Begin Project Dependency + Project_Dep_Name fltkjpeg + End Project Dependency +}}} + +############################################################################### + +Project: "fltkpngdll"=".\fltkpngdll.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name zlib End Project Dependency }}} ############################################################################### +Project: "fltkjpegdll"=".\fltkjpegdll.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name fltk + End Project Dependency +}}} + +############################################################################### + +Project: "fltkformsdll"=".\fltkformsdll.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name fltk + End Project Dependency +}}} + +############################################################################### + +Project: "zlibdll"=".\zlibdll.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + Project: "Demo"=".\Demo.dsp" - Package Owner=<4> Package=<5> @@ -234,103 +453,16 @@ Package=<4> Project_Dep_Name utf8 End Project Dependency Begin Project Dependency - Project_Dep_Name valuators - End Project Dependency -}}} - -############################################################################### - -Project: "Fluid"=".\Fluid.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name fltk - End Project Dependency - Begin Project Dependency - Project_Dep_Name fltkforms - End Project Dependency - Begin Project Dependency - Project_Dep_Name fltkimages - End Project Dependency - Begin Project Dependency - Project_Dep_Name fltkjpeg - End Project Dependency - Begin Project Dependency - Project_Dep_Name fltkpng - End Project Dependency - Begin Project Dependency - Project_Dep_Name zlib - End Project Dependency -}}} - -############################################################################### - -Project: "adjuster"=".\adjuster.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name fltk - End Project Dependency -}}} - -############################################################################### - -Project: "arc"=".\arc.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name fltk - End Project Dependency -}}} - -############################################################################### - -Project: "ask"=".\ask.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name fltk + Project_Dep_Name valuators End Project Dependency -}}} - -############################################################################### - -Project: "bitmap"=".\bitmap.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ Begin Project Dependency - Project_Dep_Name fltk + Project_Dep_Name device End Project Dependency }}} ############################################################################### -Project: "blocks"=".\blocks.dsp" - Package Owner=<4> +Project: "adjuster"=".\adjuster.dsp" - Package Owner=<4> Package=<5> {{{ @@ -345,7 +477,7 @@ Package=<4> ############################################################################### -Project: "boxtype"=".\boxtype.dsp" - Package Owner=<4> +Project: "arc"=".\arc.dsp" - Package Owner=<4> Package=<5> {{{ @@ -360,7 +492,7 @@ Package=<4> ############################################################################### -Project: "browser"=".\browser.dsp" - Package Owner=<4> +Project: "ask"=".\ask.dsp" - Package Owner=<4> Package=<5> {{{ @@ -375,7 +507,7 @@ Package=<4> ############################################################################### -Project: "button"=".\button.dsp" - Package Owner=<4> +Project: "bitmap"=".\bitmap.dsp" - Package Owner=<4> Package=<5> {{{ @@ -390,7 +522,7 @@ Package=<4> ############################################################################### -Project: "buttons"=".\buttons.dsp" - Package Owner=<4> +Project: "blocks"=".\blocks.dsp" - Package Owner=<4> Package=<5> {{{ @@ -405,7 +537,7 @@ Package=<4> ############################################################################### -Project: "checkers"=".\checkers.dsp" - Package Owner=<4> +Project: "boxtype"=".\boxtype.dsp" - Package Owner=<4> Package=<5> {{{ @@ -420,7 +552,7 @@ Package=<4> ############################################################################### -Project: "clock"=".\clock.dsp" - Package Owner=<4> +Project: "browser"=".\browser.dsp" - Package Owner=<4> Package=<5> {{{ @@ -435,7 +567,7 @@ Package=<4> ############################################################################### -Project: "colbrowser"=".\colbrowser.dsp" - Package Owner=<4> +Project: "button"=".\button.dsp" - Package Owner=<4> Package=<5> {{{ @@ -446,14 +578,11 @@ Package=<4> Begin Project Dependency Project_Dep_Name fltk End Project Dependency - Begin Project Dependency - Project_Dep_Name fltkforms - End Project Dependency }}} ############################################################################### -Project: "color_chooser"=".\color_chooser.dsp" - Package Owner=<4> +Project: "buttons"=".\buttons.dsp" - Package Owner=<4> Package=<5> {{{ @@ -468,7 +597,7 @@ Package=<4> ############################################################################### -Project: "cube"=".\cube.dsp" - Package Owner=<4> +Project: "checkers"=".\checkers.dsp" - Package Owner=<4> Package=<5> {{{ @@ -479,14 +608,11 @@ Package=<4> Begin Project Dependency Project_Dep_Name fltk End Project Dependency - Begin Project Dependency - Project_Dep_Name fltkgl - End Project Dependency }}} ############################################################################### -Project: "cursor"=".\cursor.dsp" - Package Owner=<4> +Project: "clock"=".\clock.dsp" - Package Owner=<4> Package=<5> {{{ @@ -501,7 +627,7 @@ Package=<4> ############################################################################### -Project: "curve"=".\curve.dsp" - Package Owner=<4> +Project: "colbrowser"=".\colbrowser.dsp" - Package Owner=<4> Package=<5> {{{ @@ -512,26 +638,14 @@ Package=<4> Begin Project Dependency Project_Dep_Name fltk End Project Dependency -}}} - -############################################################################### - -Project: "doublebuffer"=".\doublebuffer.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ Begin Project Dependency - Project_Dep_Name fltk + Project_Dep_Name fltkforms End Project Dependency }}} ############################################################################### -Project: "editor"=".\editor.dsp" - Package Owner=<4> +Project: "color_chooser"=".\color_chooser.dsp" - Package Owner=<4> Package=<5> {{{ @@ -546,7 +660,7 @@ Package=<4> ############################################################################### -Project: "fast_slow"=".\fast_slow.dsp" - Package Owner=<4> +Project: "cube"=".\cube.dsp" - Package Owner=<4> Package=<5> {{{ @@ -558,13 +672,13 @@ Package=<4> Project_Dep_Name fltk End Project Dependency Begin Project Dependency - Project_Dep_Name Fluid + Project_Dep_Name fltkgl End Project Dependency }}} ############################################################################### -Project: "file_chooser"=".\file_chooser.dsp" - Package Owner=<4> +Project: "CubeView"=".\CubeView.dsp" - Package Owner=<4> Package=<5> {{{ @@ -576,43 +690,16 @@ Package=<4> Project_Dep_Name fltk End Project Dependency Begin Project Dependency - Project_Dep_Name fltkimages - End Project Dependency - Begin Project Dependency - Project_Dep_Name fltkjpeg + Project_Dep_Name fltkgl End Project Dependency Begin Project Dependency - Project_Dep_Name fltkpng + Project_Dep_Name Fluid End Project Dependency }}} ############################################################################### -Project: "fltk"=".\fltk.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "fltkdll"=".\fltkdll.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "fltkforms"=".\fltkforms.dsp" - Package Owner=<4> +Project: "cursor"=".\cursor.dsp" - Package Owner=<4> Package=<5> {{{ @@ -627,7 +714,7 @@ Package=<4> ############################################################################### -Project: "fltkformsdll"=".\fltkformsdll.dsp" - Package Owner=<4> +Project: "curve"=".\curve.dsp" - Package Owner=<4> Package=<5> {{{ @@ -642,7 +729,7 @@ Package=<4> ############################################################################### -Project: "fltkgl"=".\fltkgl.dsp" - Package Owner=<4> +Project: "doublebuffer"=".\doublebuffer.dsp" - Package Owner=<4> Package=<5> {{{ @@ -657,7 +744,7 @@ Package=<4> ############################################################################### -Project: "fltkgldll"=".\fltkgldll.dsp" - Package Owner=<4> +Project: "editor"=".\editor.dsp" - Package Owner=<4> Package=<5> {{{ @@ -672,7 +759,7 @@ Package=<4> ############################################################################### -Project: "fltkimages"=".\fltkimages.dsp" - Package Owner=<4> +Project: "fast_slow"=".\fast_slow.dsp" - Package Owner=<4> Package=<5> {{{ @@ -684,16 +771,13 @@ Package=<4> Project_Dep_Name fltk End Project Dependency Begin Project Dependency - Project_Dep_Name fltkpng - End Project Dependency - Begin Project Dependency - Project_Dep_Name fltkjpeg + Project_Dep_Name Fluid End Project Dependency }}} ############################################################################### -Project: "fltkimagesdll"=".\fltkimagesdll.dsp" - Package Owner=<4> +Project: "file_chooser"=".\file_chooser.dsp" - Package Owner=<4> Package=<5> {{{ @@ -705,65 +789,14 @@ Package=<4> Project_Dep_Name fltk End Project Dependency Begin Project Dependency - Project_Dep_Name fltkpng + Project_Dep_Name fltkimages End Project Dependency Begin Project Dependency Project_Dep_Name fltkjpeg End Project Dependency -}}} - -############################################################################### - -Project: "fltkjpeg"=".\fltkjpeg.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "fltkjpegdll"=".\fltkjpegdll.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name fltk - End Project Dependency -}}} - -############################################################################### - -Project: "fltkpng"=".\fltkpng.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ Begin Project Dependency - Project_Dep_Name zlib + Project_Dep_Name fltkpng End Project Dependency -}}} - -############################################################################### - -Project: "fltkpngdll"=".\fltkpngdll.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ Begin Project Dependency Project_Dep_Name zlib End Project Dependency @@ -914,6 +947,9 @@ Package=<4> Begin Project Dependency Project_Dep_Name fltkpng End Project Dependency + Begin Project Dependency + Project_Dep_Name zlib + End Project Dependency }}} ############################################################################### @@ -1125,7 +1161,7 @@ Package=<4> ############################################################################### -Project: "native-filechooser"=".\native-filechooser.dsp" - Package Owner=<4> +Project: "navigation"=".\navigation.dsp" - Package Owner=<4> Package=<5> {{{ @@ -1140,7 +1176,7 @@ Package=<4> ############################################################################### -Project: "navigation"=".\navigation.dsp" - Package Owner=<4> +Project: "native-filechooser"=".\native-filechooser.dsp" - Package Owner=<4> Package=<5> {{{ @@ -1203,7 +1239,7 @@ Package=<4> ############################################################################### -Project: "pixmap"=".\pixmap.dsp" - Package Owner=<4> +Project: "pixmap_browser"=".\pixmap_browser.dsp" - Package Owner=<4> Package=<5> {{{ @@ -1214,11 +1250,23 @@ Package=<4> Begin Project Dependency Project_Dep_Name fltk End Project Dependency + Begin Project Dependency + Project_Dep_Name fltkimages + End Project Dependency + Begin Project Dependency + Project_Dep_Name fltkjpeg + End Project Dependency + Begin Project Dependency + Project_Dep_Name fltkpng + End Project Dependency + Begin Project Dependency + Project_Dep_Name zlib + End Project Dependency }}} ############################################################################### -Project: "pixmap_browser"=".\pixmap_browser.dsp" - Package Owner=<4> +Project: "pixmap"=".\pixmap.dsp" - Package Owner=<4> Package=<5> {{{ @@ -1229,15 +1277,6 @@ Package=<4> Begin Project Dependency Project_Dep_Name fltk End Project Dependency - Begin Project Dependency - Project_Dep_Name fltkimages - End Project Dependency - Begin Project Dependency - Project_Dep_Name fltkjpeg - End Project Dependency - Begin Project Dependency - Project_Dep_Name fltkpng - End Project Dependency }}} ############################################################################### @@ -1278,7 +1317,7 @@ Package=<4> ############################################################################### -Project: "resize"=".\resize.dsp" - Package Owner=<4> +Project: "resizebox"=".\resizebox.dsp" - Package Owner=<4> Package=<5> {{{ @@ -1289,14 +1328,11 @@ Package=<4> Begin Project Dependency Project_Dep_Name fltk End Project Dependency - Begin Project Dependency - Project_Dep_Name Fluid - End Project Dependency }}} ############################################################################### -Project: "resizebox"=".\resizebox.dsp" - Package Owner=<4> +Project: "resize"=".\resize.dsp" - Package Owner=<4> Package=<5> {{{ @@ -1307,6 +1343,9 @@ Package=<4> Begin Project Dependency Project_Dep_Name fltk End Project Dependency + Begin Project Dependency + Project_Dep_Name Fluid + End Project Dependency }}} ############################################################################### @@ -1379,6 +1418,9 @@ Package=<4> Begin Project Dependency Project_Dep_Name fltkpng End Project Dependency + Begin Project Dependency + Project_Dep_Name zlib + End Project Dependency }}} ############################################################################### @@ -1481,6 +1523,9 @@ Package=<4> Begin Project Dependency Project_Dep_Name fltkpng End Project Dependency + Begin Project Dependency + Project_Dep_Name zlib + End Project Dependency }}} ############################################################################### @@ -1533,19 +1578,7 @@ Package=<4> ############################################################################### -Project: "zlib"=".\zlib.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "zlibdll"=".\zlibdll.dsp" - Package Owner=<4> +Project: "device"=".\device.dsp" - Package Owner=<4> Package=<5> {{{ @@ -1553,18 +1586,21 @@ Package=<5> Package=<4> {{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ + Begin Project Dependency + Project_Dep_Name fltk + End Project Dependency + Begin Project Dependency + Project_Dep_Name fltkimages + End Project Dependency + Begin Project Dependency + Project_Dep_Name fltkjpeg + End Project Dependency + Begin Project Dependency + Project_Dep_Name fltkpng + End Project Dependency + Begin Project Dependency + Project_Dep_Name zlib + End Project Dependency }}} ############################################################################### diff --git a/ide/VisualC6/fltkdll.dsp b/ide/VisualC6/fltkdll.dsp index 9d1d3b099..7265ca80f 100644 --- a/ide/VisualC6/fltkdll.dsp +++ b/ide/VisualC6/fltkdll.dsp @@ -685,5 +685,9 @@ SOURCE=..\..\src\Fl_Printer.cxx SOURCE=..\..\src\ps_image.cxx # End Source File +# Begin Source File + +SOURCE=..\..\src\Fl_Abstract_Printer.cxx +# End Source File # End Target # End Project diff --git a/ide/VisualC6/help.dsp b/ide/VisualC6/help.dsp index 0c8e16fed..ff661c65a 100644 --- a/ide/VisualC6/help.dsp +++ b/ide/VisualC6/help.dsp @@ -53,7 +53,7 @@ BSC32=bscmake.exe # 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 fltkimages.lib fltkjpeg.lib fltkpng.lib comctl32.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/help.exe" /pdbtype:sept /libpath:"..\..\lib" +# ADD LINK32 fltk.lib fltkimages.lib fltkjpeg.lib fltkpng.lib 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 /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/help.exe" /pdbtype:sept /libpath:"..\..\lib" # SUBTRACT LINK32 /pdb:none /incremental:yes !ELSEIF "$(CFG)" == "help - Win32 Debug" @@ -80,7 +80,7 @@ BSC32=bscmake.exe # 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 fltkimagesd.lib fltkjpegd.lib fltkpngd.lib comctl32.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 fltkd.lib fltkimagesd.lib fltkjpegd.lib fltkpngd.lib 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" # SUBTRACT LINK32 /pdb:none /incremental:no !ENDIF diff --git a/ide/VisualC6/inactive.dsp b/ide/VisualC6/inactive.dsp index a4a24b058..d8f9b0c65 100644 --- a/ide/VisualC6/inactive.dsp +++ b/ide/VisualC6/inactive.dsp @@ -104,7 +104,7 @@ InputPath=..\..\test\inactive.fl "..\..\test\inactive.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" cd ..\..\test/ - ..\fluid\fluid -c inactive.fl + ..\fluid\fluid -c inactive.fl cd ..\ide\visualc # End Custom Build diff --git a/ide/VisualC6/keyboard.dsp b/ide/VisualC6/keyboard.dsp index 0f4b52c95..9a8c5ea21 100644 --- a/ide/VisualC6/keyboard.dsp +++ b/ide/VisualC6/keyboard.dsp @@ -108,7 +108,7 @@ InputPath=..\..\test\keyboard_ui.fl "..\..\test\keyboard_ui.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" cd ..\..\test/ - ..\fluid\fluid -c keyboard_ui.fl + ..\fluid\fluid -c keyboard_ui.fl cd ..\ide\visualc # End Custom Build diff --git a/ide/VisualC6/mandelbrot.dsp b/ide/VisualC6/mandelbrot.dsp index 6d03da52a..6b868e3fc 100644 --- a/ide/VisualC6/mandelbrot.dsp +++ b/ide/VisualC6/mandelbrot.dsp @@ -108,7 +108,7 @@ InputPath=..\..\test\mandelbrot_ui.fl "..\..\test\mandelbrot_ui.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" cd ..\..\test/ - ..\fluid\fluid -c mandelbrot_ui.fl + ..\fluid\fluid -c mandelbrot_ui.fl cd ..\ide\visualc # End Custom Build diff --git a/ide/VisualC6/native-filechooser.dsp b/ide/VisualC6/native-filechooser.dsp index 2d1b51ffb..122b3ae0c 100644 --- a/ide/VisualC6/native-filechooser.dsp +++ b/ide/VisualC6/native-filechooser.dsp @@ -91,7 +91,7 @@ LINK32=link.exe # Name "native-filechooser - Win32 Debug" # Begin Source File -SOURCE="..\..\test\native-filechooser.cxx" +SOURCE=..\..\test\native-filechooser.cxx # End Source File # End Target # End Project diff --git a/ide/VisualC6/pixmap_browser.dsp b/ide/VisualC6/pixmap_browser.dsp index e8c306a67..491bc94b4 100644 --- a/ide/VisualC6/pixmap_browser.dsp +++ b/ide/VisualC6/pixmap_browser.dsp @@ -53,7 +53,7 @@ BSC32=bscmake.exe # 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 fltkimages.lib fltkjpeg.lib fltkpng.lib comctl32.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_browser.exe" /pdbtype:sept /libpath:"..\..\lib" +# ADD LINK32 fltk.lib fltkimages.lib fltkjpeg.lib fltkpng.lib 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 /debug /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" @@ -80,7 +80,7 @@ BSC32=bscmake.exe # 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 fltkimagesd.lib fltkjpegd.lib fltkpngd.lib comctl32.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 fltkd.lib fltkimagesd.lib fltkjpegd.lib fltkpngd.lib 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" # SUBTRACT LINK32 /pdb:none /incremental:no !ENDIF diff --git a/ide/VisualC6/preferences.dsp b/ide/VisualC6/preferences.dsp index 17b504046..923505ad2 100644 --- a/ide/VisualC6/preferences.dsp +++ b/ide/VisualC6/preferences.dsp @@ -104,7 +104,7 @@ InputPath=..\..\test\preferences.fl "..\..\test\preferences.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" cd ..\..\test/ - ..\fluid\fluid -c preferences.fl + ..\fluid\fluid -c preferences.fl cd ..\ide\visualc # End Custom Build diff --git a/ide/VisualC6/radio.dsp b/ide/VisualC6/radio.dsp index bdaced52b..0558444fd 100644 --- a/ide/VisualC6/radio.dsp +++ b/ide/VisualC6/radio.dsp @@ -104,7 +104,7 @@ InputPath=..\..\test\radio.fl "..\..\test\radio.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" cd ..\..\test/ - ..\fluid\fluid -c radio.fl + ..\fluid\fluid -c radio.fl cd ..\ide\visualc # End Custom Build diff --git a/ide/VisualC6/resize.dsp b/ide/VisualC6/resize.dsp index d60a6979d..d0bbb2a28 100644 --- a/ide/VisualC6/resize.dsp +++ b/ide/VisualC6/resize.dsp @@ -104,7 +104,7 @@ InputPath=..\..\test\resize.fl "..\..\test\resize.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" cd ..\..\test/ - ..\fluid\fluid -c resize.fl + ..\fluid\fluid -c resize.fl cd ..\ide\visualc # End Custom Build diff --git a/ide/VisualC6/sudoku.dsp b/ide/VisualC6/sudoku.dsp index 5239f04c7..ba15dfa98 100644 --- a/ide/VisualC6/sudoku.dsp +++ b/ide/VisualC6/sudoku.dsp @@ -53,7 +53,7 @@ BSC32=bscmake.exe # 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 fltkimages.lib fltkjpeg.lib fltkpng.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/sudoku.exe" /pdbtype:sept /libpath:"..\..\lib" +# ADD LINK32 fltk.lib fltkimages.lib fltkjpeg.lib fltkpng.lib 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 /debug /machine:I386 /nodefaultlib:"libcd" /out:"../../test/sudoku.exe" /pdbtype:sept /libpath:"..\..\lib" # SUBTRACT LINK32 /pdb:none /incremental:yes !ELSEIF "$(CFG)" == "sudoku - Win32 Debug" @@ -80,7 +80,7 @@ BSC32=bscmake.exe # 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 fltkimagesd.lib fltkjpegd.lib fltkpngd.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 fltkd.lib fltkimagesd.lib fltkjpegd.lib fltkpngd.lib 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" # SUBTRACT LINK32 /pdb:none /incremental:no !ENDIF diff --git a/ide/VisualC6/tabs.dsp b/ide/VisualC6/tabs.dsp index 7d63d6f5f..6c01fb7c5 100644 --- a/ide/VisualC6/tabs.dsp +++ b/ide/VisualC6/tabs.dsp @@ -104,7 +104,7 @@ InputPath=..\..\test\tabs.fl "..\..\test\tabs.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" cd ..\..\test/ - ..\fluid\fluid -c tabs.fl + ..\fluid\fluid -c tabs.fl cd ..\ide\visualc # End Custom Build diff --git a/ide/VisualC6/tiled_image.dsp b/ide/VisualC6/tiled_image.dsp index aa3e4ad6e..c09475cc1 100644 --- a/ide/VisualC6/tiled_image.dsp +++ b/ide/VisualC6/tiled_image.dsp @@ -53,7 +53,7 @@ BSC32=bscmake.exe # 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 fltkimages.lib fltkjpeg.lib fltkpng.lib comctl32.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_image.exe" /pdbtype:sept /libpath:"..\..\lib" +# ADD LINK32 fltk.lib fltkimages.lib fltkjpeg.lib fltkpng.lib 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 /debug /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" @@ -80,7 +80,7 @@ BSC32=bscmake.exe # 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 fltkimagesd.lib fltkjpegd.lib fltkpngd.lib comctl32.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 fltkd.lib fltkimagesd.lib fltkjpegd.lib fltkpngd.lib 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" # SUBTRACT LINK32 /pdb:none /incremental:no !ENDIF diff --git a/ide/VisualC6/valuators.dsp b/ide/VisualC6/valuators.dsp index 6470901f8..0ddf0e5b2 100644 --- a/ide/VisualC6/valuators.dsp +++ b/ide/VisualC6/valuators.dsp @@ -104,7 +104,7 @@ InputPath=..\..\test\valuators.fl "..\..\test\valuators.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" cd ..\..\test/ - ..\fluid\fluid -c valuators.fl + ..\fluid\fluid -c valuators.fl cd ..\ide\visualc # End Custom Build -- cgit v1.2.3