| |
Author: dejan
Date: 2005-08-16 23:06:13 -0400 (Tue, 16 Aug 2005)
New Revision: 4520
Modified:
trunk/ide/devcpp/FLTK.dev
trunk/ide/vcnet/boxtype.vcproj
trunk/ide/vcnet/fltk.lib.vcproj
trunk/ide/vcnet/fltk_images.lib.vcproj
trunk/src/HelpView.cxx
trunk/src/run.cxx
trunk/src/win32/run.cxx
Log:
Fixed building problems with VC.NET 2003 related to WinSock2 (IN, OUT); Fixed "inconsistent linkage" linking problem in HelpView.cxx (newstring has been wrongly exported).
Modified: trunk/ide/devcpp/FLTK.dev
===================================================================
--- trunk/ide/devcpp/FLTK.dev 2005-08-17 02:10:38 UTC (rev 4519)
+++ trunk/ide/devcpp/FLTK.dev 2005-08-17 03:06:13 UTC (rev 4520)
@@ -1,38 +1,48 @@
[Project]
-FileName=FLTK.dev
-Name=FLTK
-UnitCount=134
-Type=2
+FileName=fltk.dev
+Name=fltk
+UnitCount=130
+Type=3
Ver=1
ObjFiles=
-Includes=../..
-Libs=
-PrivateResource=FLTK_private.rc
+Includes=../..;.
+Libs=../../lib
+PrivateResource=
ResourceIncludes=
MakeIncludes=
-Compiler=
-CppCompiler=
-Linker=
+Compiler=-DBUILDING_DLL=1_@@_-DFL_DLL_@@_-DFL_SHARED_@@_-DFL_LIBRARY_@@_-DWIN32_LEAN_AND_MEAN_@@_-DWIN32_EXTRA_LEAN_@@_-DUSE_CONF_@@_
+CppCompiler=-DBUILDING_DLL=1_@@_-DFL_DLL_@@_-DFL_SHARED_@@_-DFL_LIBRARY_@@_-DWIN32_LEAN_AND_MEAN_@@_-DWIN32_EXTRA_LEAN_@@_-DUSE_CONF_@@_
+Linker=--no-export-all-symbols _@@_--add-stdcall-alias_@@_-lpthread_@@_-lkernel32_@@_-luser32_@@_-lgdi32_@@_-lwinspool_@@_-lcomdlg32_@@_-ladvapi32_@@_-lshell32_@@_-lole32_@@_-loleaut32_@@_-luuid_@@_-lwsock32_@@_-lmsimg32_@@_
IsCpp=1
Icon=
-ExeOutput=../../lib
+ExeOutput=
ObjectOutput=
-OverrideOutput=1
-OverrideOutputName=libfltk.a
+OverrideOutput=0
+OverrideOutputName=fltk.dll
HostApplication=
Folders=
CommandLine=
-IncludeVersionInfo=1
+UseCustomMakefile=0
+CustomMakefile=
+IncludeVersionInfo=0
SupportXPThemes=0
CompilerSet=0
CompilerSettings=0000000000010000000000
-UseCustomMakefile=0
-CustomMakefile=
+[Unit1]
+FileName=..\..\src\xpmImage.cxx
+CompileCpp=1
+Folder=fltk
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
[Unit2]
FileName=..\..\src\add_idle.cxx
CompileCpp=1
-Folder=FLTK
+Folder=fltk
Compile=1
Link=1
Priority=1000
@@ -42,7 +52,7 @@
[Unit3]
FileName=..\..\src\addarc.cxx
CompileCpp=1
-Folder=FLTK
+Folder=fltk
Compile=1
Link=1
Priority=1000
@@ -52,7 +62,7 @@
[Unit4]
FileName=..\..\src\addcurve.cxx
CompileCpp=1
-Folder=FLTK
+Folder=fltk
Compile=1
Link=1
Priority=1000
@@ -62,7 +72,7 @@
[Unit5]
FileName=..\..\src\Adjuster.cxx
CompileCpp=1
-Folder=FLTK
+Folder=fltk
Compile=1
Link=1
Priority=1000
@@ -72,7 +82,7 @@
[Unit6]
FileName=..\..\src\AlignGroup.cxx
CompileCpp=1
-Folder=FLTK
+Folder=fltk
Compile=1
Link=1
Priority=1000
@@ -82,7 +92,7 @@
[Unit7]
FileName=..\..\src\args.cxx
CompileCpp=1
-Folder=FLTK
+Folder=fltk
Compile=1
Link=1
Priority=1000
@@ -92,7 +102,7 @@
[Unit8]
FileName=..\..\src\BarGroup.cxx
CompileCpp=1
-Folder=FLTK
+Folder=fltk
Compile=1
Link=1
Priority=1000
@@ -102,7 +112,7 @@
[Unit9]
FileName=..\..\src\bmpImage.cxx
CompileCpp=1
-Folder=FLTK
+Folder=fltk
Compile=1
Link=1
Priority=1000
@@ -112,7 +122,7 @@
[Unit10]
FileName=..\..\src\Browser.cxx
CompileCpp=1
-Folder=FLTK
+Folder=fltk
Compile=1
Link=1
Priority=1000
@@ -122,7 +132,7 @@
[Unit11]
FileName=..\..\src\Browser_load.cxx
CompileCpp=1
-Folder=FLTK
+Folder=fltk
Compile=1
Link=1
Priority=1000
@@ -132,7 +142,7 @@
[Unit12]
FileName=..\..\src\Button.cxx
CompileCpp=1
-Folder=FLTK
+Folder=fltk
Compile=1
Link=1
Priority=1000
@@ -142,7 +152,7 @@
[Unit13]
FileName=..\..\src\CheckButton.cxx
CompileCpp=1
-Folder=FLTK
+Folder=fltk
Compile=1
Link=1
Priority=1000
@@ -152,7 +162,7 @@
[Unit14]
FileName=..\..\src\Choice.cxx
CompileCpp=1
-Folder=FLTK
+Folder=fltk
Compile=1
Link=1
Priority=1000
@@ -162,7 +172,7 @@
[Unit15]
FileName=..\..\src\clip.cxx
CompileCpp=1
-Folder=FLTK
+Folder=fltk
Compile=1
Link=1
Priority=1000
@@ -172,7 +182,7 @@
[Unit16]
FileName=..\..\src\Clock.cxx
CompileCpp=1
-Folder=FLTK
+Folder=fltk
Compile=1
Link=1
Priority=1000
@@ -182,7 +192,7 @@
[Unit17]
FileName=..\..\src\Color.cxx
CompileCpp=1
-Folder=FLTK
+Folder=fltk
Compile=1
Link=1
Priority=1000
@@ -192,7 +202,7 @@
[Unit18]
FileName=..\..\src\color_chooser.cxx
CompileCpp=1
-Folder=FLTK
+Folder=fltk
Compile=1
Link=1
Priority=1000
@@ -202,7 +212,7 @@
[Unit19]
FileName=..\..\src\colormap.cxx
CompileCpp=1
-Folder=FLTK
+Folder=fltk
Compile=1
Link=1
Priority=1000
@@ -212,7 +222,7 @@
[Unit20]
FileName=..\..\src\ComboBox.cxx
CompileCpp=1
-Folder=FLTK
+Folder=fltk
Compile=1
Link=1
Priority=1000
@@ -222,7 +232,7 @@
[Unit21]
FileName=..\..\src\compose.cxx
CompileCpp=1
-Folder=FLTK
+Folder=fltk
Compile=1
Link=1
Priority=1000
@@ -232,7 +242,7 @@
[Unit22]
FileName=..\..\src\Cursor.cxx
CompileCpp=1
-Folder=FLTK
+Folder=fltk
Compile=1
Link=1
Priority=1000
@@ -242,17 +252,27 @@
[Unit23]
FileName=..\..\src\CycleButton.cxx
CompileCpp=1
-Folder=FLTK
+Folder=fltk
Compile=1
Link=1
Priority=1000
OverrideBuildCmd=0
BuildCmd=
+[Unit24]
+FileName=..\..\src\default_glyph.cxx
+CompileCpp=1
+Folder=fltk
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
[Unit25]
FileName=..\..\src\Dial.cxx
CompileCpp=1
-Folder=FLTK
+Folder=fltk
Compile=1
Link=1
Priority=1000
@@ -262,17 +282,27 @@
[Unit26]
FileName=..\..\src\DiamondBox.cxx
CompileCpp=1
-Folder=FLTK
+Folder=fltk
Compile=1
Link=1
Priority=1000
OverrideBuildCmd=0
BuildCmd=
+[Unit27]
+FileName=..\..\src\dnd.cxx
+CompileCpp=1
+Folder=fltk
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
[Unit28]
FileName=..\..\src\draw_xpm.cxx
CompileCpp=1
-Folder=FLTK
+Folder=fltk
Compile=1
Link=1
Priority=1000
@@ -282,7 +312,7 @@
[Unit29]
FileName=..\..\src\drawimage.cxx
CompileCpp=1
-Folder=FLTK
+Folder=fltk
Compile=1
Link=1
Priority=1000
@@ -292,7 +322,7 @@
[Unit30]
FileName=..\..\src\drawtext.cxx
CompileCpp=1
-Folder=FLTK
+Folder=fltk
Compile=1
Link=1
Priority=1000
@@ -302,7 +332,7 @@
[Unit31]
FileName=..\..\src\EngravedLabel.cxx
CompileCpp=1
-Folder=FLTK
+Folder=fltk
Compile=1
Link=1
Priority=1000
@@ -312,7 +342,7 @@
[Unit32]
FileName=..\..\src\error.cxx
CompileCpp=1
-Folder=FLTK
+Folder=fltk
Compile=1
Link=1
Priority=1000
@@ -322,7 +352,7 @@
[Unit33]
FileName=..\..\src\event_key_state.cxx
CompileCpp=1
-Folder=FLTK
+Folder=fltk
Compile=1
Link=1
Priority=1000
@@ -332,7 +362,7 @@
[Unit34]
FileName=..\..\src\file_chooser.cxx
CompileCpp=1
-Folder=FLTK
+Folder=fltk
Compile=1
Link=1
Priority=1000
@@ -342,7 +372,7 @@
[Unit35]
FileName=..\..\src\FileBrowser.cxx
CompileCpp=1
-Folder=FLTK
+Folder=fltk
Compile=1
Link=1
Priority=1000
@@ -352,7 +382,7 @@
[Unit36]
FileName=..\..\src\FileChooser.cxx
CompileCpp=1
-Folder=FLTK
+Folder=fltk
Compile=1
Link=1
Priority=1000
@@ -362,7 +392,7 @@
[Unit37]
FileName=..\..\src\FileChooser2.cxx
CompileCpp=1
-Folder=FLTK
+Folder=fltk
Compile=1
Link=1
Priority=1000
@@ -372,7 +402,7 @@
[Unit38]
FileName=..\..\src\FileIcon.cxx
CompileCpp=1
-Folder=FLTK
+Folder=fltk
Compile=1
Link=1
Priority=1000
@@ -382,7 +412,7 @@
[Unit39]
FileName=..\..\src\FileIcon2.cxx
CompileCpp=1
-Folder=FLTK
+Folder=fltk
Compile=1
Link=1
Priority=1000
@@ -392,7 +422,7 @@
[Unit40]
FileName=..\..\src\FileInput.cxx
CompileCpp=1
-Folder=FLTK
+Folder=fltk
Compile=1
Link=1
Priority=1000
@@ -402,7 +432,7 @@
[Unit41]
FileName=..\..\src\filename_ext.cxx
CompileCpp=1
-Folder=FLTK
+Folder=fltk
Compile=1
Link=1
Priority=1000
@@ -412,7 +442,7 @@
[Unit42]
FileName=..\..\src\filename_isdir.cxx
CompileCpp=1
-Folder=FLTK
+Folder=fltk
Compile=1
Link=1
Priority=1000
@@ -422,7 +452,7 @@
[Unit43]
FileName=..\..\src\filename_list.cxx
CompileCpp=1
-Folder=FLTK
+Folder=fltk
Compile=1
Link=1
Priority=1000
@@ -432,7 +462,7 @@
[Unit44]
FileName=..\..\src\filename_match.cxx
CompileCpp=1
-Folder=FLTK
+Folder=fltk
Compile=1
Link=1
Priority=1000
@@ -442,7 +472,7 @@
[Unit45]
FileName=..\..\src\filename_normalize.cxx
CompileCpp=1
-Folder=FLTK
+Folder=fltk
Compile=1
Link=1
Priority=1000
@@ -452,7 +482,7 @@
[Unit46]
FileName=..\..\src\fillarc.cxx
CompileCpp=1
-Folder=FLTK
+Folder=fltk
Compile=1
Link=1
Priority=1000
@@ -462,7 +492,7 @@
[Unit47]
FileName=..\..\src\fillrect.cxx
CompileCpp=1
-Folder=FLTK
+Folder=fltk
Compile=1
Link=1
Priority=1000
@@ -472,7 +502,7 @@
[Unit48]
FileName=..\..\src\Fl_Menu_Item.cxx
CompileCpp=1
-Folder=FLTK
+Folder=fltk
Compile=1
Link=1
Priority=1000
@@ -482,7 +512,7 @@
[Unit49]
FileName=..\..\src\FloatInput.cxx
CompileCpp=1
-Folder=FLTK
+Folder=fltk
Compile=1
Link=1
Priority=1000
@@ -492,7 +522,7 @@
[Unit50]
FileName=..\..\src\fltk_theme.cxx
CompileCpp=1
-Folder=FLTK
+Folder=fltk
Compile=1
Link=1
Priority=1000
@@ -502,7 +532,7 @@
[Unit51]
FileName=..\..\src\Font.cxx
CompileCpp=1
-Folder=FLTK
+Folder=fltk
Compile=1
Link=1
Priority=1000
@@ -512,7 +542,7 @@
[Unit52]
FileName=..\..\src\gifImage.cxx
CompileCpp=1
-Folder=FLTK
+Folder=fltk
Compile=1
Link=1
Priority=1000
@@ -522,37 +552,27 @@
[Unit53]
FileName=..\..\src\Group.cxx
CompileCpp=1
-Folder=FLTK
+Folder=fltk
Compile=1
Link=1
Priority=1000
OverrideBuildCmd=0
BuildCmd=
-[Unit54]
-FileName=..\..\src\HelpDialog.cxx
+[Unit56]
+FileName=..\..\src\Input.cxx
CompileCpp=1
-Folder=FLTK
+Folder=fltk
Compile=1
Link=1
Priority=1000
OverrideBuildCmd=0
BuildCmd=
-[Unit55]
-FileName=..\..\src\HelpView.cxx
-CompileCpp=1
-Folder=FLTK
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
[Unit57]
-FileName=..\..\src\Image.cxx
+FileName=..\..\src\InputBrowser.cxx
CompileCpp=1
-Folder=FLTK
+Folder=fltk
Compile=1
Link=1
Priority=1000
@@ -560,9 +580,9 @@
BuildCmd=
[Unit58]
-FileName=..\..\src\Input.cxx
+FileName=..\..\src\InvisibleWidget.cxx
CompileCpp=1
-Folder=FLTK
+Folder=fltk
Compile=1
Link=1
Priority=1000
@@ -570,9 +590,9 @@
BuildCmd=
[Unit59]
-FileName=..\..\src\InputBrowser.cxx
+FileName=..\..\src\Item.cxx
CompileCpp=1
-Folder=FLTK
+Folder=fltk
Compile=1
Link=1
Priority=1000
@@ -580,9 +600,9 @@
BuildCmd=
[Unit60]
-FileName=..\..\src\InvisibleWidget.cxx
+FileName=..\..\src\key_name.cxx
CompileCpp=1
-Folder=FLTK
+Folder=fltk
Compile=1
Link=1
Priority=1000
@@ -590,9 +610,9 @@
BuildCmd=
[Unit61]
-FileName=..\..\src\Item.cxx
+FileName=..\..\src\LightButton.cxx
CompileCpp=1
-Folder=FLTK
+Folder=fltk
Compile=1
Link=1
Priority=1000
@@ -600,9 +620,9 @@
BuildCmd=
[Unit62]
-FileName=..\..\src\key_name.cxx
+FileName=..\..\src\list_fonts.cxx
CompileCpp=1
-Folder=FLTK
+Folder=fltk
Compile=1
Link=1
Priority=1000
@@ -610,9 +630,9 @@
BuildCmd=
[Unit63]
-FileName=..\..\src\LightButton.cxx
+FileName=..\..\src\load_plugin.cxx
CompileCpp=1
-Folder=FLTK
+Folder=fltk
Compile=1
Link=1
Priority=1000
@@ -620,9 +640,9 @@
BuildCmd=
[Unit64]
-FileName=..\..\src\list_fonts.cxx
+FileName=..\..\src\lock.cxx
CompileCpp=1
-Folder=FLTK
+Folder=fltk
Compile=1
Link=1
Priority=1000
@@ -630,9 +650,9 @@
BuildCmd=
[Unit65]
-FileName=..\..\src\load_plugin.cxx
+FileName=..\..\src\Menu.cxx
CompileCpp=1
-Folder=FLTK
+Folder=fltk
Compile=1
Link=1
Priority=1000
@@ -640,9 +660,9 @@
BuildCmd=
[Unit66]
-FileName=..\..\src\lock.cxx
+FileName=..\..\src\Menu_add.cxx
CompileCpp=1
-Folder=FLTK
+Folder=fltk
Compile=1
Link=1
Priority=1000
@@ -650,9 +670,9 @@
BuildCmd=
[Unit67]
-FileName=..\..\src\Menu.cxx
+FileName=..\..\src\Menu_global.cxx
CompileCpp=1
-Folder=FLTK
+Folder=fltk
Compile=1
Link=1
Priority=1000
@@ -660,9 +680,9 @@
BuildCmd=
[Unit68]
-FileName=..\..\src\Menu_add.cxx
+FileName=..\..\src\Menu_popup.cxx
CompileCpp=1
-Folder=FLTK
+Folder=fltk
Compile=1
Link=1
Priority=1000
@@ -670,9 +690,9 @@
BuildCmd=
[Unit69]
-FileName=..\..\src\Menu_global.cxx
+FileName=..\..\src\MenuBar.cxx
CompileCpp=1
-Folder=FLTK
+Folder=fltk
Compile=1
Link=1
Priority=1000
@@ -680,9 +700,9 @@
BuildCmd=
[Unit70]
-FileName=..\..\src\Menu_popup.cxx
+FileName=..\..\src\MenuWindow.cxx
CompileCpp=1
-Folder=FLTK
+Folder=fltk
Compile=1
Link=1
Priority=1000
@@ -690,9 +710,9 @@
BuildCmd=
[Unit71]
-FileName=..\..\src\MenuBar.cxx
+FileName=..\..\src\message.cxx
CompileCpp=1
-Folder=FLTK
+Folder=fltk
Compile=1
Link=1
Priority=1000
@@ -700,9 +720,9 @@
BuildCmd=
[Unit72]
-FileName=..\..\src\MenuWindow.cxx
+FileName=..\..\src\MultiImage.cxx
CompileCpp=1
-Folder=FLTK
+Folder=fltk
Compile=1
Link=1
Priority=1000
@@ -710,9 +730,9 @@
BuildCmd=
[Unit73]
-FileName=..\..\src\message.cxx
+FileName=..\..\src\NumericInput.cxx
CompileCpp=1
-Folder=FLTK
+Folder=fltk
Compile=1
Link=1
Priority=1000
@@ -720,9 +740,9 @@
BuildCmd=
[Unit74]
-FileName=..\..\src\MultiImage.cxx
+FileName=..\..\src\Output.cxx
CompileCpp=1
-Folder=FLTK
+Folder=fltk
Compile=1
Link=1
Priority=1000
@@ -730,9 +750,9 @@
BuildCmd=
[Unit75]
-FileName=..\..\src\NumericInput.cxx
+FileName=..\..\src\OvalBox.cxx
CompileCpp=1
-Folder=FLTK
+Folder=fltk
Compile=1
Link=1
Priority=1000
@@ -740,9 +760,9 @@
BuildCmd=
[Unit76]
-FileName=..\..\src\Output.cxx
+FileName=..\..\src\overlay_rect.cxx
CompileCpp=1
-Folder=FLTK
+Folder=fltk
Compile=1
Link=1
Priority=1000
@@ -750,9 +770,9 @@
BuildCmd=
[Unit77]
-FileName=..\..\src\OvalBox.cxx
+FileName=..\..\src\own_colormap.cxx
CompileCpp=1
-Folder=FLTK
+Folder=fltk
Compile=1
Link=1
Priority=1000
@@ -760,9 +780,9 @@
BuildCmd=
[Unit78]
-FileName=..\..\src\overlay_rect.cxx
+FileName=..\..\src\PackedGroup.cxx
CompileCpp=1
-Folder=FLTK
+Folder=fltk
Compile=1
Link=1
Priority=1000
@@ -770,9 +790,9 @@
BuildCmd=
[Unit79]
-FileName=..\..\src\own_colormap.cxx
+FileName=..\..\src\path.cxx
CompileCpp=1
-Folder=FLTK
+Folder=fltk
Compile=1
Link=1
Priority=1000
@@ -780,9 +800,9 @@
BuildCmd=
[Unit80]
-FileName=..\..\src\PackedGroup.cxx
+FileName=..\..\src\PlasticBox.cxx
CompileCpp=1
-Folder=FLTK
+Folder=fltk
Compile=1
Link=1
Priority=1000
@@ -790,9 +810,9 @@
BuildCmd=
[Unit81]
-FileName=..\..\src\path.cxx
+FileName=..\..\src\PopupMenu.cxx
CompileCpp=1
-Folder=FLTK
+Folder=fltk
Compile=1
Link=1
Priority=1000
@@ -800,9 +820,9 @@
BuildCmd=
[Unit82]
-FileName=..\..\src\PlasticBox.cxx
+FileName=..\..\src\ProgressBar.cxx
CompileCpp=1
-Folder=FLTK
+Folder=fltk
Compile=1
Link=1
Priority=1000
@@ -810,9 +830,9 @@
BuildCmd=
[Unit83]
-FileName=..\..\src\PopupMenu.cxx
+FileName=..\..\src\RadioButton.cxx
CompileCpp=1
-Folder=FLTK
+Folder=fltk
Compile=1
Link=1
Priority=1000
@@ -820,9 +840,9 @@
BuildCmd=
[Unit84]
-FileName=..\..\src\ProgressBar.cxx
+FileName=..\..\src\readimage.cxx
CompileCpp=1
-Folder=FLTK
+Folder=fltk
Compile=1
Link=1
Priority=1000
@@ -830,9 +850,9 @@
BuildCmd=
[Unit85]
-FileName=..\..\src\RadioButton.cxx
+FileName=..\..\src\RepeatButton.cxx
CompileCpp=1
-Folder=FLTK
+Folder=fltk
Compile=1
Link=1
Priority=1000
@@ -840,9 +860,9 @@
BuildCmd=
[Unit86]
-FileName=..\..\src\readimage.cxx
+FileName=..\..\src\ReturnButton.cxx
CompileCpp=1
-Folder=FLTK
+Folder=fltk
Compile=1
Link=1
Priority=1000
@@ -850,9 +870,9 @@
BuildCmd=
[Unit87]
-FileName=..\..\src\RepeatButton.cxx
+FileName=..\..\src\rgbImage.cxx
CompileCpp=1
-Folder=FLTK
+Folder=fltk
Compile=1
Link=1
Priority=1000
@@ -860,9 +880,9 @@
BuildCmd=
[Unit88]
-FileName=..\..\src\ReturnButton.cxx
+FileName=..\..\src\RoundBox.cxx
CompileCpp=1
-Folder=FLTK
+Folder=fltk
Compile=1
Link=1
Priority=1000
@@ -870,9 +890,9 @@
BuildCmd=
[Unit89]
-FileName=..\..\src\rgbImage.cxx
+FileName=..\..\src\RoundedBox.cxx
CompileCpp=1
-Folder=FLTK
+Folder=fltk
Compile=1
Link=1
Priority=1000
@@ -880,9 +900,9 @@
BuildCmd=
[Unit90]
-FileName=..\..\src\RoundBox.cxx
+FileName=..\..\src\run.cxx
CompileCpp=1
-Folder=FLTK
+Folder=fltk
Compile=1
Link=1
Priority=1000
@@ -890,9 +910,9 @@
BuildCmd=
[Unit91]
-FileName=..\..\src\RoundedBox.cxx
+FileName=..\..\src\Scrollbar.cxx
CompileCpp=1
-Folder=FLTK
+Folder=fltk
Compile=1
Link=1
Priority=1000
@@ -900,9 +920,9 @@
BuildCmd=
[Unit92]
-FileName=..\..\src\run.cxx
+FileName=..\..\src\ScrollGroup.cxx
CompileCpp=1
-Folder=FLTK
+Folder=fltk
Compile=1
Link=1
Priority=1000
@@ -910,9 +930,9 @@
BuildCmd=
[Unit93]
-FileName=..\..\src\Scrollbar.cxx
+FileName=..\..\src\scrollrect.cxx
CompileCpp=1
-Folder=FLTK
+Folder=fltk
Compile=1
Link=1
Priority=1000
@@ -920,9 +940,9 @@
BuildCmd=
[Unit94]
-FileName=..\..\src\ScrollGroup.cxx
+FileName=..\..\src\setcolor.cxx
CompileCpp=1
-Folder=FLTK
+Folder=fltk
Compile=1
Link=1
Priority=1000
@@ -930,9 +950,9 @@
BuildCmd=
[Unit95]
-FileName=..\..\src\scrollrect.cxx
+FileName=..\..\src\setdisplay.cxx
CompileCpp=1
-Folder=FLTK
+Folder=fltk
Compile=1
Link=1
Priority=1000
@@ -940,9 +960,9 @@
BuildCmd=
[Unit96]
-FileName=..\..\src\setcolor.cxx
+FileName=..\..\src\setvisual.cxx
CompileCpp=1
-Folder=FLTK
+Folder=fltk
Compile=1
Link=1
Priority=1000
@@ -950,9 +970,9 @@
BuildCmd=
[Unit97]
-FileName=..\..\src\setdisplay.cxx
+FileName=..\..\src\ShadowBox.cxx
CompileCpp=1
-Folder=FLTK
+Folder=fltk
Compile=1
Link=1
Priority=1000
@@ -960,9 +980,9 @@
BuildCmd=
[Unit98]
-FileName=..\..\src\setvisual.cxx
+FileName=..\..\src\ShapedWindow.cxx
CompileCpp=1
-Folder=FLTK
+Folder=fltk
Compile=1
Link=1
Priority=1000
@@ -970,9 +990,9 @@
BuildCmd=
[Unit99]
-FileName=..\..\src\ShadowBox.cxx
+FileName=..\..\src\SharedImage.cxx
CompileCpp=1
-Folder=FLTK
+Folder=fltk
Compile=1
Link=1
Priority=1000
@@ -980,9 +1000,9 @@
BuildCmd=
[Unit100]
-FileName=..\..\src\ShapedWindow.cxx
+FileName=..\..\src\ShortcutAssignment.cxx
CompileCpp=1
-Folder=FLTK
+Folder=fltk
Compile=1
Link=1
Priority=1000
@@ -990,9 +1010,9 @@
BuildCmd=
[Unit101]
-FileName=..\..\src\SharedImage.cxx
+FileName=..\..\src\show_colormap.cxx
CompileCpp=1
-Folder=FLTK
+Folder=fltk
Compile=1
Link=1
Priority=1000
@@ -1000,9 +1020,9 @@
BuildCmd=
[Unit102]
-FileName=..\..\src\ShortcutAssignment.cxx
+FileName=..\..\src\Slider.cxx
CompileCpp=1
-Folder=FLTK
+Folder=fltk
Compile=1
Link=1
Priority=1000
@@ -1010,309 +1030,299 @@
BuildCmd=
[Unit103]
-FileName=..\..\src\show_colormap.cxx
-CompileCpp=1
-Folder=FLTK
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit105]
FileName=..\..\src\StringList.cxx
CompileCpp=1
-Folder=FLTK
+Folder=fltk
Compile=1
Link=1
Priority=1000
OverrideBuildCmd=0
BuildCmd=
-[Unit106]
+[Unit104]
FileName=..\..\src\Style.cxx
CompileCpp=1
-Folder=FLTK
+Folder=fltk
Compile=1
Link=1
Priority=1000
OverrideBuildCmd=0
BuildCmd=
-[Unit107]
+[Unit105]
FileName=..\..\src\StyleSet.cxx
CompileCpp=1
-Folder=FLTK
+Folder=fltk
Compile=1
Link=1
Priority=1000
OverrideBuildCmd=0
BuildCmd=
-[Unit108]
+[Unit106]
FileName=..\..\src\Symbol.cxx
CompileCpp=1
-Folder=FLTK
+Folder=fltk
Compile=1
Link=1
Priority=1000
OverrideBuildCmd=0
BuildCmd=
-[Unit109]
+[Unit107]
FileName=..\..\src\TabGroup.cxx
CompileCpp=1
-Folder=FLTK
+Folder=fltk
Compile=1
Link=1
Priority=1000
OverrideBuildCmd=0
BuildCmd=
-[Unit110]
+[Unit108]
FileName=..\..\src\TextBuffer.cxx
CompileCpp=1
-Folder=FLTK
+Folder=fltk
Compile=1
Link=1
Priority=1000
OverrideBuildCmd=0
BuildCmd=
-[Unit111]
+[Unit109]
FileName=..\..\src\TextDisplay.cxx
CompileCpp=1
-Folder=FLTK
+Folder=fltk
Compile=1
Link=1
Priority=1000
OverrideBuildCmd=0
BuildCmd=
-[Unit112]
+[Unit110]
FileName=..\..\src\TextEditor.cxx
CompileCpp=1
-Folder=FLTK
+Folder=fltk
Compile=1
Link=1
Priority=1000
OverrideBuildCmd=0
BuildCmd=
-[Unit113]
+[Unit111]
FileName=..\..\src\ThumbWheel.cxx
CompileCpp=1
-Folder=FLTK
+Folder=fltk
Compile=1
Link=1
Priority=1000
OverrideBuildCmd=0
BuildCmd=
-[Unit114]
+[Unit112]
FileName=..\..\src\TiledGroup.cxx
CompileCpp=1
-Folder=FLTK
+Folder=fltk
Compile=1
Link=1
Priority=1000
OverrideBuildCmd=0
BuildCmd=
-[Unit115]
+[Unit113]
FileName=..\..\src\TiledImage.cxx
CompileCpp=1
-Folder=FLTK
+Folder=fltk
Compile=1
Link=1
Priority=1000
OverrideBuildCmd=0
BuildCmd=
-[Unit116]
+[Unit114]
FileName=..\..\src\Tooltip.cxx
CompileCpp=1
-Folder=FLTK
+Folder=fltk
Compile=1
Link=1
Priority=1000
OverrideBuildCmd=0
BuildCmd=
-[Unit117]
+[Unit115]
FileName=..\..\src\UpBox.cxx
CompileCpp=1
-Folder=FLTK
+Folder=fltk
Compile=1
Link=1
Priority=1000
OverrideBuildCmd=0
BuildCmd=
-[Unit118]
+[Unit116]
FileName=..\..\src\Valuator.cxx
CompileCpp=1
-Folder=FLTK
+Folder=fltk
Compile=1
Link=1
Priority=1000
OverrideBuildCmd=0
BuildCmd=
-[Unit119]
+[Unit117]
FileName=..\..\src\ValueInput.cxx
CompileCpp=1
-Folder=FLTK
+Folder=fltk
Compile=1
Link=1
Priority=1000
OverrideBuildCmd=0
BuildCmd=
-[Unit120]
+[Unit118]
FileName=..\..\src\ValueOutput.cxx
CompileCpp=1
-Folder=FLTK
+Folder=fltk
Compile=1
Link=1
Priority=1000
OverrideBuildCmd=0
BuildCmd=
-[Unit121]
+[Unit119]
FileName=..\..\src\ValueSlider.cxx
CompileCpp=1
-Folder=FLTK
+Folder=fltk
Compile=1
Link=1
Priority=1000
OverrideBuildCmd=0
BuildCmd=
-[Unit122]
+[Unit120]
FileName=..\..\src\Widget.cxx
CompileCpp=1
-Folder=FLTK
+Folder=fltk
Compile=1
Link=1
Priority=1000
OverrideBuildCmd=0
BuildCmd=
-[Unit123]
+[Unit121]
FileName=..\..\src\Widget_draw.cxx
CompileCpp=1
-Folder=FLTK
+Folder=fltk
Compile=1
Link=1
Priority=1000
OverrideBuildCmd=0
BuildCmd=
-[Unit124]
+[Unit122]
FileName=..\..\src\Window.cxx
CompileCpp=1
-Folder=FLTK
+Folder=fltk
Compile=1
Link=1
Priority=1000
OverrideBuildCmd=0
BuildCmd=
-[Unit125]
+[Unit123]
FileName=..\..\src\Window_fullscreen.cxx
CompileCpp=1
-Folder=FLTK
+Folder=fltk
Compile=1
Link=1
Priority=1000
OverrideBuildCmd=0
BuildCmd=
-[Unit126]
+[Unit124]
FileName=..\..\src\Window_hotspot.cxx
CompileCpp=1
-Folder=FLTK
+Folder=fltk
Compile=1
Link=1
Priority=1000
OverrideBuildCmd=0
BuildCmd=
-[Unit127]
+[Unit125]
FileName=..\..\src\Window_iconize.cxx
CompileCpp=1
-Folder=FLTK
+Folder=fltk
Compile=1
Link=1
Priority=1000
OverrideBuildCmd=0
BuildCmd=
-[Unit128]
+[Unit126]
FileName=..\..\src\xbmImage.cxx
CompileCpp=1
-Folder=FLTK
+Folder=fltk
Compile=1
Link=1
Priority=1000
OverrideBuildCmd=0
BuildCmd=
-[Unit129]
-FileName=..\..\src\xpmFileImage.cxx
+[Unit127]
+FileName=..\..\src\vsnprintf.c
CompileCpp=1
-Folder=FLTK
+Folder=fltk
Compile=1
Link=1
Priority=1000
OverrideBuildCmd=0
BuildCmd=
-[Unit130]
-FileName=..\..\src\win32\WinMain.cxx
+[Unit128]
+FileName=..\..\src\scandir.c
CompileCpp=1
-Folder=FLTK
+Folder=fltk
Compile=1
Link=1
Priority=1000
OverrideBuildCmd=0
BuildCmd=
-[Unit131]
-FileName=..\..\src\scandir.c
+[Unit129]
+FileName=..\..\src\string.c
CompileCpp=1
-Folder=FLTK
+Folder=fltk
Compile=1
Link=1
Priority=1000
OverrideBuildCmd=0
BuildCmd=
-[Unit132]
+[Unit130]
FileName=..\..\src\utf.c
CompileCpp=1
-Folder=FLTK
+Folder=fltk
Compile=1
Link=1
Priority=1000
OverrideBuildCmd=0
BuildCmd=
-[Unit133]
-FileName=..\..\src\vsnprintf.c
+[Unit131]
+FileName=..\..\src\utf.c
CompileCpp=1
-Folder=FLTK
+Folder=fltk
Compile=1
Link=1
Priority=1000
OverrideBuildCmd=0
BuildCmd=
-[Unit134]
-FileName=..\..\src\string.c
+[Unit132]
+FileName=..\..\src\utf.c
CompileCpp=1
-Folder=FLTK
+Folder=fltk
Compile=1
Link=1
Priority=1000
@@ -1320,70 +1330,40 @@
BuildCmd=
[VersionInfo]
-Major=2
-Minor=0
-Release=0
-Build=14
+Major=0
+Minor=1
+Release=1
+Build=1
LanguageID=1033
CharsetID=1252
-CompanyName=FLTK Development Team
+CompanyName=
FileVersion=
-FileDescription=FLTK Core Static Library
-InternalName=FLTK
-LegalCopyright=1998-2004 Bill Spitzak and others
+FileDescription=Developed using the Dev-C++ IDE
+InternalName=
+LegalCopyright=
LegalTrademarks=
OriginalFilename=
-ProductName=FLTK
-ProductVersion=2.0.0
-AutoIncBuildNr=1
+ProductName=
+ProductVersion=
+AutoIncBuildNr=0
-[Unit24]
-FileName=..\..\src\default_glyph.cxx
+[Unit55]
+FileName=..\..\src\Image.cxx
CompileCpp=1
-Folder=FLTK
+Folder=fltk
Compile=1
Link=1
Priority=1000
OverrideBuildCmd=0
BuildCmd=
-[Unit104]
-FileName=..\..\src\Slider.cxx
-CompileCpp=1
-Folder=FLTK
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit56]
+[Unit54]
FileName=..\..\src\HighlightButton.cxx
CompileCpp=1
-Folder=FLTK
+Folder=fltk
Compile=1
Link=1
Priority=1000
OverrideBuildCmd=0
BuildCmd=
-[Unit1]
-FileName=..\..\src\xpmImage.cxx
-CompileCpp=1
-Folder=FLTK
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit27]
-FileName=..\..\src\dnd.cxx
-CompileCpp=1
-Folder=FLTK
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
Modified: trunk/ide/vcnet/boxtype.vcproj
===================================================================
--- trunk/ide/vcnet/boxtype.vcproj 2005-08-17 02:10:38 UTC (rev 4519)
+++ trunk/ide/vcnet/boxtype.vcproj 2005-08-17 03:06:13 UTC (rev 4520)
@@ -164,7 +164,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="fltk.lib wsock32.lib"
+ AdditionalDependencies="fltk.lib ws2_32.lib"
OutputFile="../../test/boxtype.exe"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
Modified: trunk/ide/vcnet/fltk.lib.vcproj
===================================================================
--- trunk/ide/vcnet/fltk.lib.vcproj 2005-08-17 02:10:38 UTC (rev 4519)
+++ trunk/ide/vcnet/fltk.lib.vcproj 2005-08-17 03:06:13 UTC (rev 4520)
@@ -385,6 +385,12 @@
RelativePath="..\..\src\GSave.cxx">
</File>
<File
+ RelativePath="..\..\src\HelpDialog.cxx">
+ </File>
+ <File
+ RelativePath="..\..\src\HelpView.cxx">
+ </File>
+ <File
RelativePath="..\..\src\HighlightButton.cxx">
</File>
<File
Modified: trunk/ide/vcnet/fltk_images.lib.vcproj
===================================================================
--- trunk/ide/vcnet/fltk_images.lib.vcproj 2005-08-17 02:10:38 UTC (rev 4519)
+++ trunk/ide/vcnet/fltk_images.lib.vcproj 2005-08-17 03:06:13 UTC (rev 4520)
@@ -316,12 +316,6 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\HelpDialog.cxx">
- </File>
- <File
- RelativePath="..\..\src\HelpView.cxx">
- </File>
- <File
RelativePath="..\..\src\xpmFileImage.cxx">
</File>
</Files>
Modified: trunk/src/HelpView.cxx
===================================================================
--- trunk/src/HelpView.cxx 2005-08-17 02:10:38 UTC (rev 4519)
+++ trunk/src/HelpView.cxx 2005-08-17 03:06:13 UTC (rev 4520)
@@ -70,6 +70,10 @@
# include <unistd.h>
#endif // WIN32
+#if defined(_MSC_VER) && defined(__cplusplus)
+ extern "C" const char* newstring(const char *from);
+#endif
+
#define MAX_COLUMNS 200
Modified: trunk/src/run.cxx
===================================================================
--- trunk/src/run.cxx 2005-08-17 02:10:38 UTC (rev 4519)
+++ trunk/src/run.cxx 2005-08-17 03:06:13 UTC (rev 4520)
@@ -39,7 +39,6 @@
#endif
#include <fltk/x.h>
-
#include <ctype.h>
#include <stdlib.h>
#include <string.h>
@@ -146,7 +145,7 @@
replacement new-handler to work. FLTK uses this for all strings
that it copies internally.
*/
-const char* newstring(const char *from) {
+FL_API const char* newstring(const char *from) {
if (!from) return 0;
unsigned n = strlen(from)+1;
char* ret = new char[n];
Modified: trunk/src/win32/run.cxx
===================================================================
--- trunk/src/win32/run.cxx 2005-08-17 02:10:38 UTC (rev 4519)
+++ trunk/src/win32/run.cxx 2005-08-17 03:06:13 UTC (rev 4520)
@@ -41,7 +41,17 @@
#include <sys/types.h>
#include <limits.h>
#include <time.h>
-#include <winsock.h>
+#include <windows.h>
+
+// FIXME - Following block fixes weird problem with compiling FLTK
+// inside Visual C++ (.NET 2003 Enterprise Architect)
+#ifdef _MSC_VER
+# define IN
+# define OUT
+#endif
+#include <winsock2.h>
+#include <ws2tcpip.h>
+
#include <commctrl.h>
#include <ctype.h>
#include <wchar.h>
[ Direct Link to Message ] | |
