Author: matt
Date: 2011-08-13 05:01:40 -0700 (Sat, 13 Aug 2011)
New Revision: 8948
Log:
Fluid3: splitting up VisualC support as modules get more complex. (2/2)
Modified:
branches/branch-3.0/fltk.flw
branches/branch-3.0/ide/VisualC2008/fluid.vcproj
branches/branch-3.0/ide/VisualC2010/fluid.vcxproj
branches/branch-3.0/ide/VisualC6/Fluid.dsp
branches/branch-3.0/ide/Xcode4/FLTK.xcodeproj/project.pbxproj
Modified: branches/branch-3.0/fltk.flw
===================================================================
--- branches/branch-3.0/fltk.flw 2011-08-13 12:01:15 UTC (rev 8947)
+++ branches/branch-3.0/fltk.flw 2011-08-13 12:01:40 UTC (rev 8948)
@@ -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}
@@ -10,12 +10,12 @@
uuid_Xcode4_ContainerItemProxy {7DB77C01-F47B-42CE-883F-5CD221F15472}
uuid_Xcode4_DebugBuildConfiguration {2B180F46-0364-417C-B270-125FAF04B452}
uuid_Xcode4_ReleaseBuildConfiguration {C5259E66-FBF8-43A2-B30F-8D59BBE3CF16}
- build_env 4
+ build_env 8
} {
folder Applications {open
uuid_Xcode4_Group {137F861A-5702-45AC-821B-A2C51A17F780}
} {
- app_target Fluid {
+ app_target Fluid {open
uuid_Xcode4_ProductReference {FD9750B2-CA9C-4856-A516-E56BD9B2E805}
uuid_Xcode4_ProductFileReference {4616D958-4FAE-4BE9-921B-A868F80B6CC7}
uuid_Xcode4_FluidBuildRule {30FE3F00-9876-4AE4-9F6E-35B6B4CAA24E}
@@ -211,12 +211,24 @@
uuid_Xcode4_BuildFileInSources {3FAA34C0-FA28-458C-BD14-C595999528A7}
filename_and_path {fluid/file_make.cxx}
}
- file_ref {file_visualc.cxx} {
- uuid_Xcode4_BuildFile {90165E96-B379-4CFB-9443-96A69D1138FF}
- uuid_Xcode4_FileRef {3897A14B-FF80-4B19-905F-F4FB3BEC9F0E}
- uuid_Xcode4_BuildFileInSources {02C47251-0AB9-43AA-853B-6CFC13C30460}
- filename_and_path {fluid/file_visualc.cxx}
+ file_ref {file_visualc_6.cxx} {
+ uuid_Xcode4_BuildFile {00FA8741-3E56-44B5-9C6B-ED13272A89A1}
+ uuid_Xcode4_FileRef {86DB409A-4C29-424F-88F8-265C212D8905}
+ uuid_Xcode4_BuildFileInSources {D23CCE7A-60B5-4073-B6EE-EBF99702D9DB}
+ filename_and_path {fluid/file_visualc_6.cxx}
}
+ file_ref {file_visualc_2008.cxx} {
+ uuid_Xcode4_BuildFile {31F375E6-6DD1-41E6-998C-32289D6BC4D4}
+ uuid_Xcode4_FileRef {1B4AC73D-575C-47A7-BA87-389AF56598F7}
+ uuid_Xcode4_BuildFileInSources {D3CCB5E0-7126-4A51-B541-711659C469E8}
+ filename_and_path {fluid/file_visualc_2008.cxx}
+ }
+ file_ref {file_visualc_2010.cxx} {
+ uuid_Xcode4_BuildFile {993876C5-6992-4540-AC3E-D364FF83B9CE}
+ uuid_Xcode4_FileRef {2AFB60F3-EC0E-41A3-A13F-8547D8A7F74A}
+ uuid_Xcode4_BuildFileInSources {1BB7A5BD-E62F-498F-A658-1BF0A87FBA6A}
+ filename_and_path {fluid/file_visualc_2010.cxx}
+ }
file_ref {file_xcode.cxx} {
uuid_Xcode4_BuildFile {6274DFA2-A0BB-41B1-A445-DA19DDBEA45B}
uuid_Xcode4_FileRef {8AB9E1DA-0E88-4EC9-BA9C-A772BE5E138D}
@@ -299,7 +311,7 @@
folder Libraries {open
uuid_Xcode4_Group {AFD010B3-DA64-4C5E-9682-891530BD3B73}
} {
- lib_target fltk {
+ lib_target fltk {open
uuid_Xcode4_BuildConfigurationList {F8A317C2-0F96-4681-8A97-DA6FDEF118E2}
uuid_Xcode4_DebugBuildConfiguration
{034870F2-FE15-4D23-AD0D-62ED38449392}
uuid_Xcode4_ReleaseBuildConfiguration
{D584B52C-FED3-4E71-A47E-A60BA05375B9}
@@ -2434,7 +2446,7 @@
}
}
}
- lib_target fltk_gl {selected
+ lib_target fltk_gl {
uuid_Xcode4_FluidBuildRule {C15C877E-5712-4AB2-B7BE-7B8A5F1D6F49}
uuid_Xcode4_ProductFileReference {47405B55-C42D-4839-B6BF-F6B5BA410AF3}
uuid_Xcode4_FrameworksBuildPhase {A02CA389-C019-4CB2-82B7-1CC18C255A72}
Modified: branches/branch-3.0/ide/VisualC2008/fluid.vcproj
===================================================================
--- branches/branch-3.0/ide/VisualC2008/fluid.vcproj 2011-08-13 12:01:15 UTC
(rev 8947)
+++ branches/branch-3.0/ide/VisualC2008/fluid.vcproj 2011-08-13 12:01:40 UTC
(rev 8948)
@@ -1153,7 +1153,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\fluid\file_visualc.cxx"
+ RelativePath="..\..\fluid\file_visualc_6.cxx"
>
<FileConfiguration
Name="Debug|Win32"
@@ -1197,6 +1197,94 @@
</FileConfiguration>
</File>
<File
+ RelativePath="..\..\fluid\file_visualc_2008.cxx"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ FavorSizeOrSpeed="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug Cairo|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release Cairo|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ FavorSizeOrSpeed="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\..\fluid\file_visualc_2010.cxx"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ FavorSizeOrSpeed="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug Cairo|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release Cairo|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ FavorSizeOrSpeed="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ </File>
+ <File
RelativePath="..\..\fluid\file_xcode.cxx"
>
<FileConfiguration
Modified: branches/branch-3.0/ide/VisualC2010/fluid.vcxproj
===================================================================
--- branches/branch-3.0/ide/VisualC2010/fluid.vcxproj 2011-08-13 12:01:15 UTC
(rev 8947)
+++ branches/branch-3.0/ide/VisualC2010/fluid.vcxproj 2011-08-13 12:01:40 UTC
(rev 8948)
@@ -471,7 +471,7 @@
<AdditionalIncludeDirectories
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\fluid\file_visualc.cxx">
+ <ClCompile Include="..\..\fluid\file_visualc_6.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug
Cairo|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories
Condition="'$(Configuration)|$(Platform)'=='Debug
Cairo|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions
Condition="'$(Configuration)|$(Platform)'=='Debug
Cairo|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -485,6 +485,34 @@
<AdditionalIncludeDirectories
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
+ <ClCompile Include="..\..\fluid\file_visualc_2008.cxx">
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug
Cairo|Win32'">Disabled</Optimization>
+ <AdditionalIncludeDirectories
Condition="'$(Configuration)|$(Platform)'=='Debug
Cairo|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions
Condition="'$(Configuration)|$(Platform)'=='Debug
Cairo|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Optimization
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+ <AdditionalIncludeDirectories
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <FavorSizeOrSpeed Condition="'$(Configuration)|$(Platform)'=='Release
Cairo|Win32'">Neither</FavorSizeOrSpeed>
+ <AdditionalIncludeDirectories
Condition="'$(Configuration)|$(Platform)'=='Release
Cairo|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions
Condition="'$(Configuration)|$(Platform)'=='Release
Cairo|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <FavorSizeOrSpeed
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Neither</FavorSizeOrSpeed>
+ <AdditionalIncludeDirectories
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="..\..\fluid\file_visualc_2010.cxx">
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug
Cairo|Win32'">Disabled</Optimization>
+ <AdditionalIncludeDirectories
Condition="'$(Configuration)|$(Platform)'=='Debug
Cairo|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions
Condition="'$(Configuration)|$(Platform)'=='Debug
Cairo|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Optimization
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+ <AdditionalIncludeDirectories
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <FavorSizeOrSpeed Condition="'$(Configuration)|$(Platform)'=='Release
Cairo|Win32'">Neither</FavorSizeOrSpeed>
+ <AdditionalIncludeDirectories
Condition="'$(Configuration)|$(Platform)'=='Release
Cairo|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions
Condition="'$(Configuration)|$(Platform)'=='Release
Cairo|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <FavorSizeOrSpeed
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Neither</FavorSizeOrSpeed>
+ <AdditionalIncludeDirectories
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
<ClCompile Include="..\..\fluid\file_xcode.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug
Cairo|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories
Condition="'$(Configuration)|$(Platform)'=='Debug
Cairo|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
Modified: branches/branch-3.0/ide/VisualC6/Fluid.dsp
===================================================================
--- branches/branch-3.0/ide/VisualC6/Fluid.dsp 2011-08-13 12:01:15 UTC (rev
8947)
+++ branches/branch-3.0/ide/VisualC6/Fluid.dsp 2011-08-13 12:01:40 UTC (rev
8948)
@@ -155,10 +155,18 @@
# End Source File
# Begin Source File
-SOURCE=..\..\fluid\file_visualc.cxx
+SOURCE=..\..\fluid\file_visualc_6.cxx
# End Source File
# Begin Source File
+SOURCE=..\..\fluid\file_visualc_2008.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\fluid\file_visualc_2010.cxx
+# End Source File
+# Begin Source File
+
SOURCE=..\..\fluid\file_xcode.cxx
# End Source File
# Begin Source File
Modified: branches/branch-3.0/ide/Xcode4/FLTK.xcodeproj/project.pbxproj
===================================================================
--- branches/branch-3.0/ide/Xcode4/FLTK.xcodeproj/project.pbxproj
2011-08-13 12:01:15 UTC (rev 8947)
+++ branches/branch-3.0/ide/Xcode4/FLTK.xcodeproj/project.pbxproj
2011-08-13 12:01:40 UTC (rev 8948)
@@ -24,7 +24,9 @@
D719FB0AB75C88BEA02F7959 /* file.cxx in Sources */ = {isa =
PBXBuildFile; fileRef = C9E8495FA110AAD01A53EA61 /* file.cxx */; };
D491A3BE8AB1F6509AC987B9 /* file_cmake.cxx in Sources */ = {isa
= PBXBuildFile; fileRef = C610271CF5AC9FE97D070C83 /* file_cmake.cxx */; };
3FAA34C0BFA47881999528A7 /* file_make.cxx in Sources */ = {isa
= PBXBuildFile; fileRef = AA03064178C5288F12B116BF /* file_make.cxx */; };
- 02C472514913E9C713C30460 /* file_visualc.cxx in Sources */ =
{isa = PBXBuildFile; fileRef = 3897A14BB49964A43BEC9F0E /* file_visualc.cxx */;
};
+ D23CCE7A20C65D179702D9DB /* file_visualc_6.cxx in Sources */ =
{isa = PBXBuildFile; fileRef = 86DB409A0E66AEA4212D8905 /* file_visualc_6.cxx
*/; };
+ D3CCB5E03B77C45759C469E8 /* file_visualc_2008.cxx in Sources */
= {isa = PBXBuildFile; fileRef = 1B4AC73D10FB821DF56598F7 /*
file_visualc_2008.cxx */; };
+ 1BB7A5BDAFA0BDA8A87FBA6A /* file_visualc_2010.cxx in Sources */
= {isa = PBXBuildFile; fileRef = 2AFB60F3ADAD2478D8A7F74A /*
file_visualc_2010.cxx */; };
554CA518D3F63B715126D6FB /* file_xcode.cxx in Sources */ = {isa
= PBXBuildFile; fileRef = 8AB9E1DA40411DEEBE5E138D /* file_xcode.cxx */; };
257A1C728189ABB5B9F0D09D /* fluid.cxx in Sources */ = {isa =
PBXBuildFile; fileRef = 248C3EC8AF823D7C4B50DD4D /* fluid.cxx */; };
AB0644D484D0D451FEA107B7 /* function_panel.cxx in Sources */ =
{isa = PBXBuildFile; fileRef = 0279DE51526CE67E6C8790BE /* function_panel.cxx
*/; };
@@ -3768,7 +3770,9 @@
C9E8495FA110AAD01A53EA61 /* file.cxx */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp;
name = file.cxx; path = ../../fluid/file.cxx; sourceTree = SOURCE_ROOT; };
C610271CF5AC9FE97D070C83 /* file_cmake.cxx */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp;
name = file_cmake.cxx; path = ../../fluid/file_cmake.cxx; sourceTree =
SOURCE_ROOT; };
AA03064178C5288F12B116BF /* file_make.cxx */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp;
name = file_make.cxx; path = ../../fluid/file_make.cxx; sourceTree =
SOURCE_ROOT; };
- 3897A14BB49964A43BEC9F0E /* file_visualc.cxx */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp;
name = file_visualc.cxx; path = ../../fluid/file_visualc.cxx; sourceTree =
SOURCE_ROOT; };
+ 86DB409A0E66AEA4212D8905 /* file_visualc_6.cxx */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp;
name = file_visualc_6.cxx; path = ../../fluid/file_visualc_6.cxx; sourceTree =
SOURCE_ROOT; };
+ 1B4AC73D10FB821DF56598F7 /* file_visualc_2008.cxx */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp;
name = file_visualc_2008.cxx; path = ../../fluid/file_visualc_2008.cxx;
sourceTree = SOURCE_ROOT; };
+ 2AFB60F3ADAD2478D8A7F74A /* file_visualc_2010.cxx */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp;
name = file_visualc_2010.cxx; path = ../../fluid/file_visualc_2010.cxx;
sourceTree = SOURCE_ROOT; };
8AB9E1DA40411DEEBE5E138D /* file_xcode.cxx */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp;
name = file_xcode.cxx; path = ../../fluid/file_xcode.cxx; sourceTree =
SOURCE_ROOT; };
248C3EC8AF823D7C4B50DD4D /* fluid.cxx */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp;
name = fluid.cxx; path = ../../fluid/fluid.cxx; sourceTree = SOURCE_ROOT; };
0279DE51526CE67E6C8790BE /* function_panel.cxx */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp;
name = function_panel.cxx; path = ../../fluid/function_panel.cxx; sourceTree =
SOURCE_ROOT; };
@@ -5132,7 +5136,9 @@
C9E8495FA110AAD01A53EA61 /* file.cxx */,
C610271CF5AC9FE97D070C83 /* file_cmake.cxx */,
AA03064178C5288F12B116BF /* file_make.cxx */,
- 3897A14BB49964A43BEC9F0E /* file_visualc.cxx */,
+ 86DB409A0E66AEA4212D8905 /* file_visualc_6.cxx
*/,
+ 1B4AC73D10FB821DF56598F7 /*
file_visualc_2008.cxx */,
+ 2AFB60F3ADAD2478D8A7F74A /*
file_visualc_2010.cxx */,
8AB9E1DA40411DEEBE5E138D /* file_xcode.cxx */,
248C3EC8AF823D7C4B50DD4D /* fluid.cxx */,
0279DE51526CE67E6C8790BE /* function_panel.cxx
*/,
@@ -8884,7 +8890,9 @@
D719FB0AB75C88BEA02F7959 /* file.cxx in Sources
*/,
D491A3BE8AB1F6509AC987B9 /* file_cmake.cxx in
Sources */,
3FAA34C0BFA47881999528A7 /* file_make.cxx in
Sources */,
- 02C472514913E9C713C30460 /* file_visualc.cxx in
Sources */,
+ D23CCE7A20C65D179702D9DB /* file_visualc_6.cxx
in Sources */,
+ D3CCB5E03B77C45759C469E8 /*
file_visualc_2008.cxx in Sources */,
+ 1BB7A5BDAFA0BDA8A87FBA6A /*
file_visualc_2010.cxx in Sources */,
554CA518D3F63B715126D6FB /* file_xcode.cxx in
Sources */,
257A1C728189ABB5B9F0D09D /* fluid.cxx in
Sources */,
AB0644D484D0D451FEA107B7 /* function_panel.cxx
in Sources */,
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
