diff --git a/CMakeLists.txt b/CMakeLists.txt index 54e9656f..94a17b22 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -106,6 +106,7 @@ list(APPEND SOURCE_LIST ${SOURCEDIR}/gui/FindDialog.cpp ${SOURCEDIR}/gui/FRLayoutConfig.cpp ${SOURCEDIR}/gui/FRStyle.cpp + ${SOURCEDIR}/gui/FRStyleManager.cpp ${SOURCEDIR}/gui/GUIURIHandlerHelper.cpp ${SOURCEDIR}/gui/HtmlHeaderMetadataItemVisitor.cpp ${SOURCEDIR}/gui/HtmlTemplateProcessor.cpp @@ -116,6 +117,7 @@ list(APPEND SOURCE_LIST ${SOURCEDIR}/gui/MultilineEnterDialog.cpp ${SOURCEDIR}/gui/PreferencesDialog.cpp ${SOURCEDIR}/gui/PreferencesDialogSettings.cpp + ${SOURCEDIR}/gui/PreferencesDialogStyle.cpp ${SOURCEDIR}/gui/PrivilegesDialog.cpp ${SOURCEDIR}/gui/ProgressDialog.cpp ${SOURCEDIR}/gui/ReorderFieldsDialog.cpp @@ -227,6 +229,7 @@ list(APPEND HEADER_LIST ${SOURCEDIR}/gui/FindDialog.h ${SOURCEDIR}/gui/FRLayoutConfig.h ${SOURCEDIR}/gui/FRStyle.h + ${SOURCEDIR}/gui/FRStyleManager.h ${SOURCEDIR}/gui/GUIURIHandlerHelper.h ${SOURCEDIR}/gui/HtmlHeaderMetadataItemVisitor.h ${SOURCEDIR}/gui/HtmlTemplateProcessor.h @@ -236,6 +239,7 @@ list(APPEND HEADER_LIST ${SOURCEDIR}/gui/MetadataItemPropertiesFrame.h ${SOURCEDIR}/gui/MultilineEnterDialog.h ${SOURCEDIR}/gui/PreferencesDialog.h + ${SOURCEDIR}/gui/PreferencesDialogStyle.h ${SOURCEDIR}/gui/PrivilegesDialog.h ${SOURCEDIR}/gui/ProgressDialog.h ${SOURCEDIR}/gui/ReorderFieldsDialog.h diff --git a/GNUmakefile b/GNUmakefile index 9a8d1aef..a6240481 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -96,6 +96,7 @@ FLAMEROBIN_OBJECTS = \ flamerobin_FindDialog.o \ flamerobin_FRLayoutConfig.o \ flamerobin_FRStyle.o \ + flamerobin_FRStyleManager.o \ flamerobin_GUIURIHandlerHelper.o \ flamerobin_HtmlHeaderMetadataItemVisitor.o \ flamerobin_HtmlTemplateProcessor.o \ @@ -106,6 +107,7 @@ FLAMEROBIN_OBJECTS = \ flamerobin_MultilineEnterDialog.o \ flamerobin_PreferencesDialog.o \ flamerobin_PreferencesDialogSettings.o \ + flamerobin_PreferencesDialogStyle.o \ flamerobin_PrivilegesDialog.o \ flamerobin_ProgressDialog.o \ flamerobin_ReorderFieldsDialog.o \ @@ -377,6 +379,9 @@ flamerobin_FRLayoutConfig.o: ./src/gui/FRLayoutConfig.cpp flamerobin_FRStyle.o: ./src/gui/FRStyle.cpp $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< +flamerobin_FRStyleManager.o: ./src/gui/FRStyleManager.cpp + $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< + flamerobin_GUIURIHandlerHelper.o: ./src/gui/GUIURIHandlerHelper.cpp $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< @@ -407,6 +412,9 @@ flamerobin_PreferencesDialog.o: ./src/gui/PreferencesDialog.cpp flamerobin_PreferencesDialogSettings.o: ./src/gui/PreferencesDialogSettings.cpp $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< +flamerobin_PreferencesDialogStyle.o: ./src/gui/PreferencesDialogStyle.cpp + $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< + flamerobin_PrivilegesDialog.o: ./src/gui/PrivilegesDialog.cpp $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< diff --git a/Makefile.in b/Makefile.in index ce54d406..31a508e7 100644 --- a/Makefile.in +++ b/Makefile.in @@ -89,6 +89,7 @@ FLAMEROBIN_OBJECTS = \ flamerobin_FindDialog.o \ flamerobin_FRLayoutConfig.o \ flamerobin_FRStyle.o \ + flamerobin_FRStyleManager.o \ flamerobin_GUIURIHandlerHelper.o \ flamerobin_HtmlHeaderMetadataItemVisitor.o \ flamerobin_HtmlTemplateProcessor.o \ @@ -99,6 +100,7 @@ FLAMEROBIN_OBJECTS = \ flamerobin_MultilineEnterDialog.o \ flamerobin_PreferencesDialog.o \ flamerobin_PreferencesDialogSettings.o \ + flamerobin_PreferencesDialogStyle.o \ flamerobin_PrivilegesDialog.o \ flamerobin_ProgressDialog.o \ flamerobin_ReorderFieldsDialog.o \ @@ -469,6 +471,9 @@ flamerobin_FRLayoutConfig.o: $(srcdir)/src/gui/FRLayoutConfig.cpp $(FLAMEROBIN_O flamerobin_FRStyle.o: $(srcdir)/src/gui/FRStyle.cpp $(FLAMEROBIN_ODEP) $(CXXC) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(srcdir)/src/gui/FRStyle.cpp +flamerobin_FRStyleManager.o: $(srcdir)/src/gui/FRStyleManager.cpp $(FLAMEROBIN_ODEP) + $(CXXC) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(srcdir)/src/gui/FRStyleManager.cpp + flamerobin_GUIURIHandlerHelper.o: $(srcdir)/src/gui/GUIURIHandlerHelper.cpp $(FLAMEROBIN_ODEP) $(CXXC) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(srcdir)/src/gui/GUIURIHandlerHelper.cpp @@ -499,6 +504,9 @@ flamerobin_PreferencesDialog.o: $(srcdir)/src/gui/PreferencesDialog.cpp $(FLAMER flamerobin_PreferencesDialogSettings.o: $(srcdir)/src/gui/PreferencesDialogSettings.cpp $(FLAMEROBIN_ODEP) $(CXXC) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(srcdir)/src/gui/PreferencesDialogSettings.cpp +flamerobin_PreferencesDialogStyle.o: $(srcdir)/src/gui/PreferencesDialogStyle.cpp $(FLAMEROBIN_ODEP) + $(CXXC) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(srcdir)/src/gui/PreferencesDialogStyle.cpp + flamerobin_PrivilegesDialog.o: $(srcdir)/src/gui/PrivilegesDialog.cpp $(FLAMEROBIN_ODEP) $(CXXC) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(srcdir)/src/gui/PrivilegesDialog.cpp diff --git a/Makefile.suncc b/Makefile.suncc index e4e2426f..c707edfa 100644 --- a/Makefile.suncc +++ b/Makefile.suncc @@ -99,6 +99,7 @@ FLAMEROBIN_OBJECTS = \ flamerobin_FindDialog.o \ flamerobin_FRLayoutConfig.o \ flamerobin_FRStyle.o \ + flamerobin_FRStyleManager.o \ flamerobin_GUIURIHandlerHelper.o \ flamerobin_HtmlHeaderMetadataItemVisitor.o \ flamerobin_HtmlTemplateProcessor.o \ @@ -109,6 +110,7 @@ FLAMEROBIN_OBJECTS = \ flamerobin_MultilineEnterDialog.o \ flamerobin_PreferencesDialog.o \ flamerobin_PreferencesDialogSettings.o \ + flamerobin_PreferencesDialogStyle.o \ flamerobin_PrivilegesDialog.o \ flamerobin_ProgressDialog.o \ flamerobin_ReorderFieldsDialog.o \ @@ -374,6 +376,9 @@ flamerobin_FRLayoutConfig.o: ./src/gui/FRLayoutConfig.cpp flamerobin_FRStyle.o: ./src/gui/FRStyle.cpp $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< +flamerobin_FRStyleManager.o: ./src/gui/FRStyleManager.cpp + $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< + flamerobin_GUIURIHandlerHelper.o: ./src/gui/GUIURIHandlerHelper.cpp $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< @@ -404,6 +409,9 @@ flamerobin_PreferencesDialog.o: ./src/gui/PreferencesDialog.cpp flamerobin_PreferencesDialogSettings.o: ./src/gui/PreferencesDialogSettings.cpp $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< +flamerobin_PreferencesDialogStyle.o: ./src/gui/PreferencesDialogStyle.cpp + $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< + flamerobin_PrivilegesDialog.o: ./src/gui/PrivilegesDialog.cpp $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< diff --git a/flamerobin.bkl b/flamerobin.bkl index e3acf2da..93c3c7aa 100644 --- a/flamerobin.bkl +++ b/flamerobin.bkl @@ -274,6 +274,7 @@ Accepted values: AMD64, IA64. $(SOURCEDIR)/gui/FindDialog.h $(SOURCEDIR)/gui/FRLayoutConfig.h $(SOURCEDIR)/gui/FRStyle.h + $(SOURCEDIR)/gui/FRStyleManager.h $(SOURCEDIR)/gui/GUIURIHandlerHelper.h $(SOURCEDIR)/gui/HtmlHeaderMetadataItemVisitor.h $(SOURCEDIR)/gui/HtmlTemplateProcessor.h @@ -283,6 +284,7 @@ Accepted values: AMD64, IA64. $(SOURCEDIR)/gui/MetadataItemPropertiesFrame.h $(SOURCEDIR)/gui/MultilineEnterDialog.h $(SOURCEDIR)/gui/PreferencesDialog.h + $(SOURCEDIR)/gui/PreferencesDialogStyle.h $(SOURCEDIR)/gui/PrivilegesDialog.h $(SOURCEDIR)/gui/ProgressDialog.h $(SOURCEDIR)/gui/ReorderFieldsDialog.h @@ -406,6 +408,7 @@ Accepted values: AMD64, IA64. $(SOURCEDIR)/gui/FindDialog.cpp $(SOURCEDIR)/gui/FRLayoutConfig.cpp $(SOURCEDIR)/gui/FRStyle.cpp + $(SOURCEDIR)/gui/FRStyleManager.cpp $(SOURCEDIR)/gui/GUIURIHandlerHelper.cpp $(SOURCEDIR)/gui/HtmlHeaderMetadataItemVisitor.cpp $(SOURCEDIR)/gui/HtmlTemplateProcessor.cpp @@ -416,6 +419,7 @@ Accepted values: AMD64, IA64. $(SOURCEDIR)/gui/MultilineEnterDialog.cpp $(SOURCEDIR)/gui/PreferencesDialog.cpp $(SOURCEDIR)/gui/PreferencesDialogSettings.cpp + $(SOURCEDIR)/gui/PreferencesDialogStyle.cpp $(SOURCEDIR)/gui/PrivilegesDialog.cpp $(SOURCEDIR)/gui/ProgressDialog.cpp $(SOURCEDIR)/gui/ReorderFieldsDialog.cpp diff --git a/flamerobin.sln b/flamerobin.sln index 166226bf..de6383a7 100644 --- a/flamerobin.sln +++ b/flamerobin.sln @@ -1,33 +1,27 @@ -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual Studio 2008 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "flamerobin", "flamerobin_flamerobin.vcproj", "{3C914FEE-C6E8-58AA-B046-6E951FCD6BFC}" - ProjectSection(ProjectDependencies) = postProject - {F98A5270-7698-516C-9430-13EBB667AEA5} = {F98A5270-7698-516C-9430-13EBB667AEA5} - {F98A5270-7698-516C-9430-13EBB667AEA5} = {F98A5270-7698-516C-9430-13EBB667AEA5} - EndProjectSection +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 17 +VisualStudioVersion = 17.6.33829.357 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "flamerobin", "flamerobin_flamerobin.vcxproj", "{3C914FEE-C6E8-58AA-B046-6E951FCD6BFC}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ibpp", "flamerobin_ibpp.vcproj", "{F98A5270-7698-516C-9430-13EBB667AEA5}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ibpp", "flamerobin_ibpp.vcxproj", "{F98A5270-7698-516C-9430-13EBB667AEA5}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug Dynamic|Win32 = Debug Dynamic|Win32 Debug Static|Win32 = Debug Static|Win32 - Release Dynamic|Win32 = Release Dynamic|Win32 - Release Static|Win32 = Release Static|Win32 DLL Debug Dynamic|Win32 = DLL Debug Dynamic|Win32 DLL Debug Static|Win32 = DLL Debug Static|Win32 DLL Release Dynamic|Win32 = DLL Release Dynamic|Win32 DLL Release Static|Win32 = DLL Release Static|Win32 + Release Dynamic|Win32 = Release Dynamic|Win32 + Release Static|Win32 = Release Static|Win32 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {3C914FEE-C6E8-58AA-B046-6E951FCD6BFC}.Debug Dynamic|Win32.ActiveCfg = Debug Dynamic|Win32 {3C914FEE-C6E8-58AA-B046-6E951FCD6BFC}.Debug Dynamic|Win32.Build.0 = Debug Dynamic|Win32 {3C914FEE-C6E8-58AA-B046-6E951FCD6BFC}.Debug Static|Win32.ActiveCfg = Debug Static|Win32 {3C914FEE-C6E8-58AA-B046-6E951FCD6BFC}.Debug Static|Win32.Build.0 = Debug Static|Win32 - {3C914FEE-C6E8-58AA-B046-6E951FCD6BFC}.Release Dynamic|Win32.ActiveCfg = Release Dynamic|Win32 - {3C914FEE-C6E8-58AA-B046-6E951FCD6BFC}.Release Dynamic|Win32.Build.0 = Release Dynamic|Win32 - {3C914FEE-C6E8-58AA-B046-6E951FCD6BFC}.Release Static|Win32.ActiveCfg = Release Static|Win32 - {3C914FEE-C6E8-58AA-B046-6E951FCD6BFC}.Release Static|Win32.Build.0 = Release Static|Win32 {3C914FEE-C6E8-58AA-B046-6E951FCD6BFC}.DLL Debug Dynamic|Win32.ActiveCfg = DLL Debug Dynamic|Win32 {3C914FEE-C6E8-58AA-B046-6E951FCD6BFC}.DLL Debug Dynamic|Win32.Build.0 = DLL Debug Dynamic|Win32 {3C914FEE-C6E8-58AA-B046-6E951FCD6BFC}.DLL Debug Static|Win32.ActiveCfg = DLL Debug Static|Win32 @@ -36,14 +30,14 @@ Global {3C914FEE-C6E8-58AA-B046-6E951FCD6BFC}.DLL Release Dynamic|Win32.Build.0 = DLL Release Dynamic|Win32 {3C914FEE-C6E8-58AA-B046-6E951FCD6BFC}.DLL Release Static|Win32.ActiveCfg = DLL Release Static|Win32 {3C914FEE-C6E8-58AA-B046-6E951FCD6BFC}.DLL Release Static|Win32.Build.0 = DLL Release Static|Win32 + {3C914FEE-C6E8-58AA-B046-6E951FCD6BFC}.Release Dynamic|Win32.ActiveCfg = Release Dynamic|Win32 + {3C914FEE-C6E8-58AA-B046-6E951FCD6BFC}.Release Dynamic|Win32.Build.0 = Release Dynamic|Win32 + {3C914FEE-C6E8-58AA-B046-6E951FCD6BFC}.Release Static|Win32.ActiveCfg = Release Static|Win32 + {3C914FEE-C6E8-58AA-B046-6E951FCD6BFC}.Release Static|Win32.Build.0 = Release Static|Win32 {F98A5270-7698-516C-9430-13EBB667AEA5}.Debug Dynamic|Win32.ActiveCfg = Debug Dynamic|Win32 {F98A5270-7698-516C-9430-13EBB667AEA5}.Debug Dynamic|Win32.Build.0 = Debug Dynamic|Win32 {F98A5270-7698-516C-9430-13EBB667AEA5}.Debug Static|Win32.ActiveCfg = Debug Static|Win32 {F98A5270-7698-516C-9430-13EBB667AEA5}.Debug Static|Win32.Build.0 = Debug Static|Win32 - {F98A5270-7698-516C-9430-13EBB667AEA5}.Release Dynamic|Win32.ActiveCfg = Release Dynamic|Win32 - {F98A5270-7698-516C-9430-13EBB667AEA5}.Release Dynamic|Win32.Build.0 = Release Dynamic|Win32 - {F98A5270-7698-516C-9430-13EBB667AEA5}.Release Static|Win32.ActiveCfg = Release Static|Win32 - {F98A5270-7698-516C-9430-13EBB667AEA5}.Release Static|Win32.Build.0 = Release Static|Win32 {F98A5270-7698-516C-9430-13EBB667AEA5}.DLL Debug Dynamic|Win32.ActiveCfg = DLL Debug Dynamic|Win32 {F98A5270-7698-516C-9430-13EBB667AEA5}.DLL Debug Dynamic|Win32.Build.0 = DLL Debug Dynamic|Win32 {F98A5270-7698-516C-9430-13EBB667AEA5}.DLL Debug Static|Win32.ActiveCfg = DLL Debug Static|Win32 @@ -52,9 +46,15 @@ Global {F98A5270-7698-516C-9430-13EBB667AEA5}.DLL Release Dynamic|Win32.Build.0 = DLL Release Dynamic|Win32 {F98A5270-7698-516C-9430-13EBB667AEA5}.DLL Release Static|Win32.ActiveCfg = DLL Release Static|Win32 {F98A5270-7698-516C-9430-13EBB667AEA5}.DLL Release Static|Win32.Build.0 = DLL Release Static|Win32 + {F98A5270-7698-516C-9430-13EBB667AEA5}.Release Dynamic|Win32.ActiveCfg = Release Dynamic|Win32 + {F98A5270-7698-516C-9430-13EBB667AEA5}.Release Dynamic|Win32.Build.0 = Release Dynamic|Win32 + {F98A5270-7698-516C-9430-13EBB667AEA5}.Release Static|Win32.ActiveCfg = Release Static|Win32 + {F98A5270-7698-516C-9430-13EBB667AEA5}.Release Static|Win32.Build.0 = Release Static|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {DA2F3312-7A9E-4DD4-97E7-3C5BD6644232} + EndGlobalSection EndGlobal - diff --git a/flamerobin.xcodeproj/project.pbxproj b/flamerobin.xcodeproj/project.pbxproj index 64698171..2debe1d7 100644 --- a/flamerobin.xcodeproj/project.pbxproj +++ b/flamerobin.xcodeproj/project.pbxproj @@ -287,13 +287,13 @@ isa = PBXBuildFile; fileRef = 0000000000000000000000ad; }; - 0000000000000000000000b1 = { + 0000000000000000000000b0 = { isa = PBXBuildFile; - fileRef = 0000000000000000000000b0; + fileRef = 0000000000000000000000af; }; - 0000000000000000000000b3 = { + 0000000000000000000000b2 = { isa = PBXBuildFile; - fileRef = 0000000000000000000000b2; + fileRef = 0000000000000000000000b1; }; 0000000000000000000000b5 = { isa = PBXBuildFile; @@ -327,13 +327,13 @@ isa = PBXBuildFile; fileRef = 0000000000000000000000c2; }; - 0000000000000000000000c6 = { + 0000000000000000000000c5 = { isa = PBXBuildFile; - fileRef = 0000000000000000000000c5; + fileRef = 0000000000000000000000c4; }; - 0000000000000000000000c8 = { + 0000000000000000000000c7 = { isa = PBXBuildFile; - fileRef = 0000000000000000000000c7; + fileRef = 0000000000000000000000c6; }; 0000000000000000000000ca = { isa = PBXBuildFile; @@ -447,13 +447,13 @@ isa = PBXBuildFile; fileRef = 0000000000000000000000ff; }; - 000000000000000000000103 = { + 000000000000000000000102 = { isa = PBXBuildFile; - fileRef = 000000000000000000000102; + fileRef = 000000000000000000000101; }; - 000000000000000000000105 = { + 000000000000000000000104 = { isa = PBXBuildFile; - fileRef = 000000000000000000000104; + fileRef = 000000000000000000000103; }; 000000000000000000000107 = { isa = PBXBuildFile; @@ -475,21 +475,17 @@ isa = PBXBuildFile; fileRef = 00000000000000000000010e; }; - 000000000000000000000112 = { - isa = PBXBuildFile; - fileRef = 000000000000000000000111; - }; - 00000000000000000000019b = { + 000000000000000000000111 = { isa = PBXBuildFile; - fileRef = 00000000000000000000019a; + fileRef = 000000000000000000000110; }; - 00000000000000000000019d = { + 000000000000000000000113 = { isa = PBXBuildFile; - fileRef = 00000000000000000000019c; + fileRef = 000000000000000000000112; }; - 00000000000000000000019f = { + 000000000000000000000116 = { isa = PBXBuildFile; - fileRef = 00000000000000000000019e; + fileRef = 000000000000000000000115; }; 0000000000000000000001a1 = { isa = PBXBuildFile; @@ -559,6 +555,18 @@ isa = PBXBuildFile; fileRef = 0000000000000000000001c0; }; + 0000000000000000000001c3 = { + isa = PBXBuildFile; + fileRef = 0000000000000000000001c2; + }; + 0000000000000000000001c5 = { + isa = PBXBuildFile; + fileRef = 0000000000000000000001c4; + }; + 0000000000000000000001c7 = { + isa = PBXBuildFile; + fileRef = 0000000000000000000001c6; + }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -576,14 +584,14 @@ remoteGlobalIDString = 00000000000000000000000d; remoteInfo = ibpp; }; - 00000000000000000000018a = { + 000000000000000000000190 = { isa = PBXContainerItemProxy; containerPortal = "39ACD7DD-98A0-5E99-B44E-57A2569BE8B1"; proxyType = 1; remoteGlobalIDString = 00000000000000000000000d; remoteInfo = ibpp; }; - 00000000000000000000018c = { + 000000000000000000000192 = { isa = PBXContainerItemProxy; containerPortal = "39ACD7DD-98A0-5E99-B44E-57A2569BE8B1"; proxyType = 1; @@ -832,1204 +840,1224 @@ }; 00000000000000000000007f = { isa = PBXFileReference; - path = GUIURIHandlerHelper.cpp; + path = FRStyleManager.cpp; sourceTree = ""; }; 000000000000000000000081 = { isa = PBXFileReference; - path = HtmlHeaderMetadataItemVisitor.cpp; + path = GUIURIHandlerHelper.cpp; sourceTree = ""; }; 000000000000000000000083 = { isa = PBXFileReference; - path = HtmlTemplateProcessor.cpp; + path = HtmlHeaderMetadataItemVisitor.cpp; sourceTree = ""; }; 000000000000000000000085 = { isa = PBXFileReference; - path = InsertDialog.cpp; + path = HtmlTemplateProcessor.cpp; sourceTree = ""; }; 000000000000000000000087 = { isa = PBXFileReference; - path = InsertParametersDialog.cpp; + path = InsertDialog.cpp; sourceTree = ""; }; 000000000000000000000089 = { isa = PBXFileReference; - path = MainFrame.cpp; + path = InsertParametersDialog.cpp; sourceTree = ""; }; 00000000000000000000008b = { isa = PBXFileReference; - path = MetadataItemPropertiesFrame.cpp; + path = MainFrame.cpp; sourceTree = ""; }; 00000000000000000000008d = { isa = PBXFileReference; - path = MultilineEnterDialog.cpp; + path = MetadataItemPropertiesFrame.cpp; sourceTree = ""; }; 00000000000000000000008f = { isa = PBXFileReference; - path = PreferencesDialog.cpp; + path = MultilineEnterDialog.cpp; sourceTree = ""; }; 000000000000000000000091 = { isa = PBXFileReference; - path = PreferencesDialogSettings.cpp; + path = PreferencesDialog.cpp; sourceTree = ""; }; 000000000000000000000093 = { isa = PBXFileReference; - path = PrivilegesDialog.cpp; + path = PreferencesDialogSettings.cpp; sourceTree = ""; }; 000000000000000000000095 = { isa = PBXFileReference; - path = ProgressDialog.cpp; + path = PreferencesDialogStyle.cpp; sourceTree = ""; }; 000000000000000000000099 = { isa = PBXFileReference; - path = RestoreFrame.cpp; + path = ProgressDialog.cpp; sourceTree = ""; }; 00000000000000000000009b = { isa = PBXFileReference; - path = ServerRegistrationDialog.cpp; + path = ReorderFieldsDialog.cpp; sourceTree = ""; }; 00000000000000000000009d = { isa = PBXFileReference; - path = ServiceBaseFrame.cpp; + path = RestoreFrame.cpp; sourceTree = ""; }; 00000000000000000000009f = { isa = PBXFileReference; - path = ShutdownFrame.cpp; + path = ServerRegistrationDialog.cpp; sourceTree = ""; }; 0000000000000000000000a1 = { isa = PBXFileReference; - path = ShutdownStartupBaseFrame.cpp; + path = ServiceBaseFrame.cpp; sourceTree = ""; }; 0000000000000000000000a3 = { isa = PBXFileReference; - path = SimpleHtmlFrame.cpp; + path = ShutdownFrame.cpp; sourceTree = ""; }; 0000000000000000000000a5 = { isa = PBXFileReference; - path = StartupFrame.cpp; + path = ShutdownStartupBaseFrame.cpp; sourceTree = ""; }; 0000000000000000000000a7 = { isa = PBXFileReference; - path = StatementHistoryDialog.cpp; + path = SimpleHtmlFrame.cpp; sourceTree = ""; }; 0000000000000000000000a9 = { isa = PBXFileReference; - path = StyleGuide.cpp; + path = StartupFrame.cpp; sourceTree = ""; }; 0000000000000000000000ab = { isa = PBXFileReference; - path = UserDialog.cpp; + path = StatementHistoryDialog.cpp; sourceTree = ""; }; 0000000000000000000000ad = { + isa = PBXFileReference; + path = StyleGuide.cpp; + sourceTree = ""; + }; + 0000000000000000000000af = { + isa = PBXFileReference; + path = UserDialog.cpp; + sourceTree = ""; + }; + 0000000000000000000000b1 = { isa = PBXFileReference; path = UsernamePasswordDialog.cpp; sourceTree = ""; }; - 0000000000000000000000b0 = { + 0000000000000000000000b4 = { isa = PBXFileReference; path = ControlUtils.cpp; sourceTree = ""; }; - 0000000000000000000000b2 = { + 0000000000000000000000b6 = { isa = PBXFileReference; path = DataGrid.cpp; sourceTree = ""; }; - 0000000000000000000000b4 = { + 0000000000000000000000b8 = { isa = PBXFileReference; path = DataGridRowBuffer.cpp; sourceTree = ""; }; - 0000000000000000000000b6 = { + 0000000000000000000000ba = { isa = PBXFileReference; path = DataGridRows.cpp; sourceTree = ""; }; - 0000000000000000000000b8 = { + 0000000000000000000000bc = { isa = PBXFileReference; path = DataGridTable.cpp; sourceTree = ""; }; - 0000000000000000000000ba = { + 0000000000000000000000be = { isa = PBXFileReference; path = DBHTreeControl.cpp; sourceTree = ""; }; - 0000000000000000000000bc = { + 0000000000000000000000c0 = { isa = PBXFileReference; path = DndTextControls.cpp; sourceTree = ""; }; - 0000000000000000000000be = { + 0000000000000000000000c2 = { isa = PBXFileReference; path = LogTextControl.cpp; sourceTree = ""; }; - 0000000000000000000000c0 = { + 0000000000000000000000c4 = { isa = PBXFileReference; path = PrintableHtmlWindow.cpp; sourceTree = ""; }; - 0000000000000000000000c2 = { + 0000000000000000000000c6 = { isa = PBXFileReference; path = TextControl.cpp; sourceTree = ""; }; - 0000000000000000000000c5 = { + 0000000000000000000000c9 = { isa = PBXFileReference; path = CharacterSet.cpp; sourceTree = ""; }; - 0000000000000000000000c7 = { + 0000000000000000000000cb = { isa = PBXFileReference; path = Collation.cpp; sourceTree = ""; }; - 0000000000000000000000c9 = { + 0000000000000000000000cd = { isa = PBXFileReference; path = column.cpp; sourceTree = ""; }; - 0000000000000000000000cb = { + 0000000000000000000000cf = { isa = PBXFileReference; path = constraints.cpp; sourceTree = ""; }; - 0000000000000000000000cd = { + 0000000000000000000000d1 = { isa = PBXFileReference; path = CreateDDLVisitor.cpp; sourceTree = ""; }; - 0000000000000000000000cf = { + 0000000000000000000000d3 = { isa = PBXFileReference; path = database.cpp; sourceTree = ""; }; - 0000000000000000000000d1 = { + 0000000000000000000000d5 = { isa = PBXFileReference; path = domain.cpp; sourceTree = ""; }; - 0000000000000000000000d3 = { + 0000000000000000000000d7 = { isa = PBXFileReference; path = exception.cpp; sourceTree = ""; }; - 0000000000000000000000d5 = { + 0000000000000000000000d9 = { isa = PBXFileReference; path = function.cpp; sourceTree = ""; }; - 0000000000000000000000d7 = { + 0000000000000000000000db = { isa = PBXFileReference; path = generator.cpp; sourceTree = ""; }; - 0000000000000000000000d9 = { + 0000000000000000000000dd = { isa = PBXFileReference; path = Index.cpp; sourceTree = ""; }; - 0000000000000000000000db = { + 0000000000000000000000df = { isa = PBXFileReference; path = metadataitem.cpp; sourceTree = ""; }; - 0000000000000000000000dd = { + 0000000000000000000000e1 = { isa = PBXFileReference; path = MetadataItemCreateStatementVisitor.cpp; sourceTree = ""; }; - 0000000000000000000000df = { + 0000000000000000000000e3 = { isa = PBXFileReference; path = MetadataItemDescriptionVisitor.cpp; sourceTree = ""; }; - 0000000000000000000000e1 = { + 0000000000000000000000e5 = { isa = PBXFileReference; path = MetadataItemURIHandlerHelper.cpp; sourceTree = ""; }; - 0000000000000000000000e3 = { + 0000000000000000000000e7 = { isa = PBXFileReference; path = MetadataItemVisitor.cpp; sourceTree = ""; }; - 0000000000000000000000e5 = { + 0000000000000000000000e9 = { isa = PBXFileReference; path = MetadataTemplateCmdHandler.cpp; sourceTree = ""; }; - 0000000000000000000000e7 = { + 0000000000000000000000eb = { isa = PBXFileReference; path = MetadataTemplateManager.cpp; sourceTree = ""; }; - 0000000000000000000000e9 = { + 0000000000000000000000ed = { isa = PBXFileReference; path = package.cpp; sourceTree = ""; }; - 0000000000000000000000eb = { + 0000000000000000000000ef = { isa = PBXFileReference; path = parameter.cpp; sourceTree = ""; }; - 0000000000000000000000ed = { + 0000000000000000000000f1 = { isa = PBXFileReference; path = privilege.cpp; sourceTree = ""; }; - 0000000000000000000000ef = { + 0000000000000000000000f3 = { isa = PBXFileReference; path = procedure.cpp; sourceTree = ""; }; - 0000000000000000000000f1 = { + 0000000000000000000000f5 = { isa = PBXFileReference; path = relation.cpp; sourceTree = ""; }; - 0000000000000000000000f3 = { + 0000000000000000000000f7 = { isa = PBXFileReference; path = role.cpp; sourceTree = ""; }; - 0000000000000000000000f5 = { + 0000000000000000000000f9 = { isa = PBXFileReference; path = root.cpp; sourceTree = ""; }; - 0000000000000000000000f7 = { + 0000000000000000000000fb = { isa = PBXFileReference; path = server.cpp; sourceTree = ""; }; - 0000000000000000000000f9 = { + 0000000000000000000000fd = { isa = PBXFileReference; path = table.cpp; sourceTree = ""; }; - 0000000000000000000000fb = { + 0000000000000000000000ff = { isa = PBXFileReference; path = trigger.cpp; sourceTree = ""; }; - 0000000000000000000000fd = { + 000000000000000000000101 = { isa = PBXFileReference; path = User.cpp; sourceTree = ""; }; - 0000000000000000000000ff = { + 000000000000000000000103 = { isa = PBXFileReference; path = view.cpp; sourceTree = ""; }; - 000000000000000000000102 = { + 000000000000000000000106 = { isa = PBXFileReference; path = Identifier.cpp; sourceTree = ""; }; - 000000000000000000000104 = { + 000000000000000000000108 = { isa = PBXFileReference; path = IncompleteStatement.cpp; sourceTree = ""; }; - 000000000000000000000106 = { + 00000000000000000000010a = { isa = PBXFileReference; path = MultiStatement.cpp; sourceTree = ""; }; - 000000000000000000000108 = { + 00000000000000000000010c = { isa = PBXFileReference; path = SelectStatement.cpp; sourceTree = ""; }; - 00000000000000000000010a = { + 00000000000000000000010e = { isa = PBXFileReference; path = SqlStatement.cpp; sourceTree = ""; }; - 00000000000000000000010c = { + 000000000000000000000110 = { isa = PBXFileReference; path = SqlTokenizer.cpp; sourceTree = ""; }; - 00000000000000000000010e = { + 000000000000000000000112 = { isa = PBXFileReference; path = StatementBuilder.cpp; sourceTree = ""; }; - 000000000000000000000111 = { + 000000000000000000000115 = { isa = PBXFileReference; path = StyleGuideMAC.cpp; sourceTree = ""; }; - 000000000000000000000113 = { + 000000000000000000000117 = { isa = PBXFileReference; path = frutils.h; sourceTree = ""; }; - 000000000000000000000114 = { + 000000000000000000000118 = { isa = PBXFileReference; path = frversion.h; sourceTree = ""; }; - 000000000000000000000115 = { + 000000000000000000000119 = { isa = PBXFileReference; path = Isaac.h; sourceTree = ""; }; - 000000000000000000000116 = { + 00000000000000000000011a = { isa = PBXFileReference; path = logger.h; sourceTree = ""; }; - 000000000000000000000117 = { + 00000000000000000000011b = { isa = PBXFileReference; path = main.h; sourceTree = ""; }; - 000000000000000000000118 = { + 00000000000000000000011c = { isa = PBXFileReference; path = MasterPassword.h; sourceTree = ""; }; - 000000000000000000000119 = { + 00000000000000000000011d = { isa = PBXFileReference; path = revisioninfo.h; sourceTree = ""; }; - 00000000000000000000011a = { + 00000000000000000000011e = { isa = PBXFileReference; path = statementHistory.h; sourceTree = ""; }; - 00000000000000000000011b = { + 00000000000000000000011f = { isa = PBXFileReference; path = Config.h; sourceTree = ""; }; - 00000000000000000000011c = { + 000000000000000000000120 = { isa = PBXFileReference; path = DatabaseConfig.h; sourceTree = ""; }; - 00000000000000000000011d = { + 000000000000000000000121 = { isa = PBXFileReference; path = LocalSettings.h; sourceTree = ""; }; - 00000000000000000000011e = { + 000000000000000000000122 = { isa = PBXFileReference; path = ArtProvider.h; sourceTree = ""; }; - 00000000000000000000011f = { + 000000000000000000000123 = { isa = PBXFileReference; path = CodeTemplateProcessor.h; sourceTree = ""; }; - 000000000000000000000120 = { + 000000000000000000000124 = { isa = PBXFileReference; path = FRDecimal.h; sourceTree = ""; }; - 000000000000000000000121 = { + 000000000000000000000125 = { isa = PBXFileReference; path = FRError.h; sourceTree = ""; }; - 000000000000000000000122 = { + 000000000000000000000126 = { isa = PBXFileReference; path = FRInt128.h; sourceTree = ""; }; - 000000000000000000000123 = { + 000000000000000000000127 = { isa = PBXFileReference; path = ObjectWithHandle.h; sourceTree = ""; }; - 000000000000000000000124 = { + 000000000000000000000128 = { isa = PBXFileReference; path = Observer.h; sourceTree = ""; }; - 000000000000000000000125 = { + 000000000000000000000129 = { isa = PBXFileReference; path = ProcessableObject.h; sourceTree = ""; }; - 000000000000000000000126 = { + 00000000000000000000012a = { isa = PBXFileReference; path = ProgressIndicator.h; sourceTree = ""; }; - 000000000000000000000127 = { + 00000000000000000000012b = { isa = PBXFileReference; path = StringUtils.h; sourceTree = ""; }; - 000000000000000000000128 = { + 00000000000000000000012c = { isa = PBXFileReference; path = Subject.h; sourceTree = ""; }; - 000000000000000000000129 = { + 00000000000000000000012d = { isa = PBXFileReference; path = TemplateProcessor.h; sourceTree = ""; }; - 00000000000000000000012a = { + 00000000000000000000012e = { isa = PBXFileReference; path = URIProcessor.h; sourceTree = ""; }; - 00000000000000000000012b = { + 00000000000000000000012f = { isa = PBXFileReference; path = Visitor.h; sourceTree = ""; }; - 00000000000000000000012c = { + 000000000000000000000130 = { isa = PBXFileReference; path = MetadataLoader.h; sourceTree = ""; }; - 00000000000000000000012d = { + 000000000000000000000131 = { isa = PBXFileReference; path = AboutBox.h; sourceTree = ""; }; - 00000000000000000000012e = { + 000000000000000000000132 = { isa = PBXFileReference; path = AdvancedMessageDialog.h; sourceTree = ""; }; - 00000000000000000000012f = { + 000000000000000000000133 = { isa = PBXFileReference; path = AdvancedSearchFrame.h; sourceTree = ""; }; - 000000000000000000000130 = { + 000000000000000000000134 = { isa = PBXFileReference; path = BackupFrame.h; sourceTree = ""; }; - 000000000000000000000131 = { + 000000000000000000000135 = { isa = PBXFileReference; path = BackupRestoreBaseFrame.h; sourceTree = ""; }; - 000000000000000000000132 = { + 000000000000000000000136 = { isa = PBXFileReference; path = BaseDialog.h; sourceTree = ""; }; - 000000000000000000000133 = { + 000000000000000000000137 = { isa = PBXFileReference; path = BaseFrame.h; sourceTree = ""; }; - 000000000000000000000134 = { + 000000000000000000000138 = { isa = PBXFileReference; path = CommandIds.h; sourceTree = ""; }; - 000000000000000000000135 = { + 000000000000000000000139 = { isa = PBXFileReference; path = CommandManager.h; sourceTree = ""; }; - 000000000000000000000136 = { + 00000000000000000000013a = { isa = PBXFileReference; path = ConfdefTemplateProcessor.h; sourceTree = ""; }; - 000000000000000000000137 = { + 00000000000000000000013b = { isa = PBXFileReference; path = ContextMenuMetadataItemVisitor.h; sourceTree = ""; }; - 000000000000000000000138 = { + 00000000000000000000013c = { isa = PBXFileReference; path = CreateIndexDialog.h; sourceTree = ""; }; - 000000000000000000000139 = { + 00000000000000000000013d = { isa = PBXFileReference; path = DatabaseRegistrationDialog.h; sourceTree = ""; }; - 00000000000000000000013a = { + 00000000000000000000013e = { isa = PBXFileReference; path = DataGeneratorFrame.h; sourceTree = ""; }; - 00000000000000000000013b = { + 00000000000000000000013f = { isa = PBXFileReference; path = EditBlobDialog.h; sourceTree = ""; }; - 00000000000000000000013c = { + 000000000000000000000140 = { isa = PBXFileReference; path = EventWatcherFrame.h; sourceTree = ""; }; - 00000000000000000000013d = { + 000000000000000000000141 = { isa = PBXFileReference; path = ExecuteSql.h; sourceTree = ""; }; - 00000000000000000000013e = { + 000000000000000000000142 = { isa = PBXFileReference; path = ExecuteSqlFrame.h; sourceTree = ""; }; - 00000000000000000000013f = { + 000000000000000000000143 = { isa = PBXFileReference; path = FieldPropertiesDialog.h; sourceTree = ""; }; - 000000000000000000000140 = { + 000000000000000000000144 = { isa = PBXFileReference; path = FindDialog.h; sourceTree = ""; }; - 000000000000000000000141 = { + 000000000000000000000145 = { isa = PBXFileReference; path = FRLayoutConfig.h; sourceTree = ""; }; - 000000000000000000000142 = { + 000000000000000000000146 = { isa = PBXFileReference; path = FRStyle.h; sourceTree = ""; }; - 000000000000000000000143 = { + 000000000000000000000147 = { + isa = PBXFileReference; + path = FRStyleManager.h; + sourceTree = ""; + }; + 000000000000000000000148 = { isa = PBXFileReference; path = GUIURIHandlerHelper.h; sourceTree = ""; }; - 000000000000000000000144 = { + 000000000000000000000149 = { isa = PBXFileReference; path = HtmlHeaderMetadataItemVisitor.h; sourceTree = ""; }; - 000000000000000000000145 = { + 00000000000000000000014a = { isa = PBXFileReference; path = HtmlTemplateProcessor.h; sourceTree = ""; }; - 000000000000000000000146 = { + 00000000000000000000014b = { isa = PBXFileReference; path = InsertDialog.h; sourceTree = ""; }; - 000000000000000000000147 = { + 00000000000000000000014c = { isa = PBXFileReference; path = InsertParametersDialog.h; sourceTree = ""; }; - 000000000000000000000148 = { + 00000000000000000000014d = { isa = PBXFileReference; path = MainFrame.h; sourceTree = ""; }; - 000000000000000000000149 = { + 00000000000000000000014e = { isa = PBXFileReference; path = MetadataItemPropertiesFrame.h; sourceTree = ""; }; - 00000000000000000000014a = { + 00000000000000000000014f = { isa = PBXFileReference; path = MultilineEnterDialog.h; sourceTree = ""; }; - 00000000000000000000014b = { + 000000000000000000000150 = { isa = PBXFileReference; path = PreferencesDialog.h; sourceTree = ""; }; - 00000000000000000000014c = { + 000000000000000000000151 = { + isa = PBXFileReference; + path = PreferencesDialogStyle.h; + sourceTree = ""; + }; + 000000000000000000000152 = { isa = PBXFileReference; path = PrivilegesDialog.h; sourceTree = ""; }; - 00000000000000000000014d = { + 000000000000000000000153 = { isa = PBXFileReference; path = ProgressDialog.h; sourceTree = ""; }; - 00000000000000000000014e = { + 000000000000000000000154 = { isa = PBXFileReference; path = ReorderFieldsDialog.h; sourceTree = ""; }; - 00000000000000000000014f = { + 000000000000000000000155 = { isa = PBXFileReference; path = RestoreFrame.h; sourceTree = ""; }; - 000000000000000000000150 = { + 000000000000000000000156 = { isa = PBXFileReference; path = ServerRegistrationDialog.h; sourceTree = ""; }; - 000000000000000000000151 = { + 000000000000000000000157 = { isa = PBXFileReference; path = ServiceBaseFrame.h; sourceTree = ""; }; - 000000000000000000000152 = { + 000000000000000000000158 = { isa = PBXFileReference; path = ShutdownFrame.h; sourceTree = ""; }; - 000000000000000000000153 = { + 000000000000000000000159 = { isa = PBXFileReference; path = ShutdownStartupBaseFrame.h; sourceTree = ""; }; - 000000000000000000000154 = { + 00000000000000000000015a = { isa = PBXFileReference; path = SimpleHtmlFrame.h; sourceTree = ""; }; - 000000000000000000000155 = { + 00000000000000000000015b = { isa = PBXFileReference; path = StartupFrame.h; sourceTree = ""; }; - 000000000000000000000156 = { + 00000000000000000000015c = { isa = PBXFileReference; path = StatementHistoryDialog.h; sourceTree = ""; }; - 000000000000000000000157 = { + 00000000000000000000015d = { isa = PBXFileReference; path = StyleGuide.h; sourceTree = ""; }; - 000000000000000000000158 = { + 00000000000000000000015e = { isa = PBXFileReference; path = UserDialog.h; sourceTree = ""; }; - 000000000000000000000159 = { + 00000000000000000000015f = { isa = PBXFileReference; path = UsernamePasswordDialog.h; sourceTree = ""; }; - 00000000000000000000015a = { + 000000000000000000000160 = { isa = PBXFileReference; path = ControlUtils.h; sourceTree = ""; }; - 00000000000000000000015b = { + 000000000000000000000161 = { isa = PBXFileReference; path = DataGrid.h; sourceTree = ""; }; - 00000000000000000000015c = { + 000000000000000000000162 = { isa = PBXFileReference; path = DataGridRowBuffer.h; sourceTree = ""; }; - 00000000000000000000015d = { + 000000000000000000000163 = { isa = PBXFileReference; path = DataGridRows.h; sourceTree = ""; }; - 00000000000000000000015e = { + 000000000000000000000164 = { isa = PBXFileReference; path = DataGridTable.h; sourceTree = ""; }; - 00000000000000000000015f = { + 000000000000000000000165 = { isa = PBXFileReference; path = DBHTreeControl.h; sourceTree = ""; }; - 000000000000000000000160 = { + 000000000000000000000166 = { isa = PBXFileReference; path = DndTextControls.h; sourceTree = ""; }; - 000000000000000000000161 = { + 000000000000000000000167 = { isa = PBXFileReference; path = LogTextControl.h; sourceTree = ""; }; - 000000000000000000000162 = { + 000000000000000000000168 = { isa = PBXFileReference; path = PrintableHtmlWindow.h; sourceTree = ""; }; - 000000000000000000000163 = { + 000000000000000000000169 = { isa = PBXFileReference; path = TextControl.h; sourceTree = ""; }; - 000000000000000000000164 = { + 00000000000000000000016a = { isa = PBXFileReference; path = CharacterSet.h; sourceTree = ""; }; - 000000000000000000000165 = { + 00000000000000000000016b = { isa = PBXFileReference; path = Collation.h; sourceTree = ""; }; - 000000000000000000000166 = { + 00000000000000000000016c = { isa = PBXFileReference; path = collection.h; sourceTree = ""; }; - 000000000000000000000167 = { + 00000000000000000000016d = { isa = PBXFileReference; path = column.h; sourceTree = ""; }; - 000000000000000000000168 = { + 00000000000000000000016e = { isa = PBXFileReference; path = constraints.h; sourceTree = ""; }; - 000000000000000000000169 = { + 00000000000000000000016f = { isa = PBXFileReference; path = CreateDDLVisitor.h; sourceTree = ""; }; - 00000000000000000000016a = { + 000000000000000000000170 = { isa = PBXFileReference; path = database.h; sourceTree = ""; }; - 00000000000000000000016b = { + 000000000000000000000171 = { isa = PBXFileReference; path = domain.h; sourceTree = ""; }; - 00000000000000000000016c = { + 000000000000000000000172 = { isa = PBXFileReference; path = exception.h; sourceTree = ""; }; - 00000000000000000000016d = { + 000000000000000000000173 = { isa = PBXFileReference; path = function.h; sourceTree = ""; }; - 00000000000000000000016e = { + 000000000000000000000174 = { isa = PBXFileReference; path = generator.h; sourceTree = ""; }; - 00000000000000000000016f = { + 000000000000000000000175 = { isa = PBXFileReference; path = Index.h; sourceTree = ""; }; - 000000000000000000000170 = { + 000000000000000000000176 = { isa = PBXFileReference; path = MetadataClasses.h; sourceTree = ""; }; - 000000000000000000000171 = { + 000000000000000000000177 = { isa = PBXFileReference; path = metadataitem.h; sourceTree = ""; }; - 000000000000000000000172 = { + 000000000000000000000178 = { isa = PBXFileReference; path = MetadataItemCreateStatementVisitor.h; sourceTree = ""; }; - 000000000000000000000173 = { + 000000000000000000000179 = { isa = PBXFileReference; path = MetadataItemDescriptionVisitor.h; sourceTree = ""; }; - 000000000000000000000174 = { + 00000000000000000000017a = { isa = PBXFileReference; path = MetadataItemURIHandlerHelper.h; sourceTree = ""; }; - 000000000000000000000175 = { + 00000000000000000000017b = { isa = PBXFileReference; path = MetadataItemVisitor.h; sourceTree = ""; }; - 000000000000000000000176 = { + 00000000000000000000017c = { isa = PBXFileReference; path = MetadataTemplateManager.h; sourceTree = ""; }; - 000000000000000000000177 = { + 00000000000000000000017d = { isa = PBXFileReference; path = package.h; sourceTree = ""; }; - 000000000000000000000178 = { + 00000000000000000000017e = { isa = PBXFileReference; path = parameter.h; sourceTree = ""; }; - 000000000000000000000179 = { + 00000000000000000000017f = { isa = PBXFileReference; path = privilege.h; sourceTree = ""; }; - 00000000000000000000017a = { + 000000000000000000000180 = { isa = PBXFileReference; path = procedure.h; sourceTree = ""; }; - 00000000000000000000017b = { + 000000000000000000000181 = { isa = PBXFileReference; path = relation.h; sourceTree = ""; }; - 00000000000000000000017c = { + 000000000000000000000182 = { isa = PBXFileReference; path = role.h; sourceTree = ""; }; - 00000000000000000000017d = { + 000000000000000000000183 = { isa = PBXFileReference; path = root.h; sourceTree = ""; }; - 00000000000000000000017e = { + 000000000000000000000184 = { isa = PBXFileReference; path = server.h; sourceTree = ""; }; - 00000000000000000000017f = { + 000000000000000000000185 = { isa = PBXFileReference; path = table.h; sourceTree = ""; }; - 000000000000000000000180 = { + 000000000000000000000186 = { isa = PBXFileReference; path = trigger.h; sourceTree = ""; }; - 000000000000000000000181 = { + 000000000000000000000187 = { isa = PBXFileReference; path = User.h; sourceTree = ""; }; - 000000000000000000000182 = { + 000000000000000000000188 = { isa = PBXFileReference; path = view.h; sourceTree = ""; }; - 000000000000000000000183 = { + 000000000000000000000189 = { isa = PBXFileReference; path = Identifier.h; sourceTree = ""; }; - 000000000000000000000184 = { + 00000000000000000000018a = { isa = PBXFileReference; path = IncompleteStatement.h; sourceTree = ""; }; - 000000000000000000000185 = { + 00000000000000000000018b = { isa = PBXFileReference; path = MultiStatement.h; sourceTree = ""; }; - 000000000000000000000186 = { + 00000000000000000000018c = { isa = PBXFileReference; path = SelectStatement.h; sourceTree = ""; }; - 000000000000000000000187 = { + 00000000000000000000018d = { isa = PBXFileReference; path = SqlStatement.h; sourceTree = ""; }; - 000000000000000000000188 = { + 00000000000000000000018e = { isa = PBXFileReference; path = SqlTokenizer.h; sourceTree = ""; }; - 000000000000000000000189 = { + 00000000000000000000018f = { isa = PBXFileReference; path = StatementBuilder.h; sourceTree = ""; }; - 000000000000000000000197 = { + 00000000000000000000019d = { isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = archive.ar; path = ibpp; sourceTree = BUILT_PRODUCTS_DIR; }; - 00000000000000000000019a = { + 0000000000000000000001a0 = { isa = PBXFileReference; path = _dpb.cpp; sourceTree = ""; }; - 00000000000000000000019c = { + 0000000000000000000001a2 = { isa = PBXFileReference; path = _ibpp.cpp; sourceTree = ""; }; - 00000000000000000000019e = { + 0000000000000000000001a4 = { isa = PBXFileReference; path = _ibs.cpp; sourceTree = ""; }; - 0000000000000000000001a0 = { + 0000000000000000000001a6 = { isa = PBXFileReference; path = _rb.cpp; sourceTree = ""; }; - 0000000000000000000001a2 = { + 0000000000000000000001a8 = { isa = PBXFileReference; path = _spb.cpp; sourceTree = ""; }; - 0000000000000000000001a4 = { + 0000000000000000000001aa = { isa = PBXFileReference; path = _tpb.cpp; sourceTree = ""; }; - 0000000000000000000001a6 = { + 0000000000000000000001ac = { isa = PBXFileReference; path = array.cpp; sourceTree = ""; }; - 0000000000000000000001a8 = { + 0000000000000000000001ae = { isa = PBXFileReference; path = blob.cpp; sourceTree = ""; }; - 0000000000000000000001aa = { + 0000000000000000000001b0 = { isa = PBXFileReference; path = database.cpp; sourceTree = ""; }; - 0000000000000000000001ac = { + 0000000000000000000001b2 = { isa = PBXFileReference; path = date.cpp; sourceTree = ""; }; - 0000000000000000000001ae = { + 0000000000000000000001b4 = { isa = PBXFileReference; path = dbkey.cpp; sourceTree = ""; }; - 0000000000000000000001b0 = { + 0000000000000000000001b6 = { isa = PBXFileReference; path = events.cpp; sourceTree = ""; }; - 0000000000000000000001b2 = { + 0000000000000000000001b8 = { isa = PBXFileReference; path = exception.cpp; sourceTree = ""; }; - 0000000000000000000001b4 = { + 0000000000000000000001ba = { isa = PBXFileReference; path = ibint128.cpp; sourceTree = ""; }; - 0000000000000000000001b6 = { + 0000000000000000000001bc = { isa = PBXFileReference; path = row.cpp; sourceTree = ""; }; - 0000000000000000000001b8 = { + 0000000000000000000001be = { isa = PBXFileReference; path = service.cpp; sourceTree = ""; }; - 0000000000000000000001ba = { + 0000000000000000000001c0 = { isa = PBXFileReference; path = statement.cpp; sourceTree = ""; }; - 0000000000000000000001bc = { + 0000000000000000000001c2 = { isa = PBXFileReference; path = time.cpp; sourceTree = ""; }; - 0000000000000000000001be = { + 0000000000000000000001c4 = { isa = PBXFileReference; path = transaction.cpp; sourceTree = ""; }; - 0000000000000000000001c0 = { + 0000000000000000000001c6 = { isa = PBXFileReference; path = user.cpp; sourceTree = ""; }; - 0000000000000000000001c3 = { + 0000000000000000000001c9 = { isa = PBXFileReference; path = constants.h; sourceTree = ""; }; - 0000000000000000000001c5 = { + 0000000000000000000001cb = { isa = PBXFileReference; path = ibase.h; sourceTree = ""; }; - 0000000000000000000001c6 = { + 0000000000000000000001cc = { isa = PBXFileReference; path = iberror.h; sourceTree = ""; }; - 0000000000000000000001c8 = { + 0000000000000000000001ce = { isa = PBXFileReference; path = blr.h; sourceTree = ""; }; - 0000000000000000000001c9 = { + 0000000000000000000001cf = { isa = PBXFileReference; path = consts_pub.h; sourceTree = ""; }; - 0000000000000000000001ca = { + 0000000000000000000001d0 = { isa = PBXFileReference; path = dsc_pub.h; sourceTree = ""; }; - 0000000000000000000001cb = { + 0000000000000000000001d1 = { isa = PBXFileReference; path = inf_pub.h; sourceTree = ""; }; - 0000000000000000000001cc = { + 0000000000000000000001d2 = { isa = PBXFileReference; path = msg_helper.h; sourceTree = ""; }; - 0000000000000000000001cd = { + 0000000000000000000001d3 = { isa = PBXFileReference; path = sqlda_pub.h; sourceTree = ""; }; - 0000000000000000000001ce = { + 0000000000000000000001d4 = { isa = PBXFileReference; path = types_pub.h; sourceTree = ""; }; - 0000000000000000000001d0 = { + 0000000000000000000001d6 = { isa = PBXFileReference; path = all.h; sourceTree = ""; }; - 0000000000000000000001d1 = { + 0000000000000000000001d7 = { isa = PBXFileReference; path = dsql.h; sourceTree = ""; }; - 0000000000000000000001d2 = { + 0000000000000000000001d8 = { isa = PBXFileReference; path = dyn.h; sourceTree = ""; }; - 0000000000000000000001d3 = { + 0000000000000000000001d9 = { isa = PBXFileReference; path = fbsvcmgr.h; sourceTree = ""; }; - 0000000000000000000001d4 = { + 0000000000000000000001da = { isa = PBXFileReference; path = fbtracemgr.h; sourceTree = ""; }; - 0000000000000000000001d5 = { + 0000000000000000000001db = { isa = PBXFileReference; path = gbak.h; sourceTree = ""; }; - 0000000000000000000001d6 = { + 0000000000000000000001dc = { isa = PBXFileReference; path = gfix.h; sourceTree = ""; }; - 0000000000000000000001d7 = { + 0000000000000000000001dd = { isa = PBXFileReference; path = gsec.h; sourceTree = ""; }; - 0000000000000000000001d8 = { + 0000000000000000000001de = { isa = PBXFileReference; path = gstat.h; sourceTree = ""; }; - 0000000000000000000001d9 = { + 0000000000000000000001df = { isa = PBXFileReference; path = isql.h; sourceTree = ""; }; - 0000000000000000000001da = { + 0000000000000000000001e0 = { isa = PBXFileReference; path = jrd.h; sourceTree = ""; }; - 0000000000000000000001db = { + 0000000000000000000001e1 = { isa = PBXFileReference; path = jrd_bugchk.h; sourceTree = ""; }; - 0000000000000000000001dc = { + 0000000000000000000001e2 = { isa = PBXFileReference; path = nbackup.h; sourceTree = ""; }; - 0000000000000000000001dd = { + 0000000000000000000001e3 = { isa = PBXFileReference; path = sqlerr.h; sourceTree = ""; }; - 0000000000000000000001de = { + 0000000000000000000001e4 = { isa = PBXFileReference; path = sqlwarn.h; sourceTree = ""; }; - 0000000000000000000001df = { + 0000000000000000000001e5 = { isa = PBXFileReference; path = utl.h; sourceTree = ""; }; - 0000000000000000000001e0 = { + 0000000000000000000001e6 = { isa = PBXFileReference; path = _ibpp.h; sourceTree = ""; }; - 0000000000000000000001e1 = { + 0000000000000000000001e7 = { isa = PBXFileReference; path = ibpp.h; sourceTree = ""; }; 000000000000000000000097 = { isa = PBXFileReference; - path = ReorderFieldsDialog.cpp; + path = PrivilegesDialog.cpp; sourceTree = ""; }; /* End PBXFileReference section */ @@ -2044,15 +2072,15 @@ 000000000000000000000038, 000000000000000000000051, 000000000000000000000054, - 0000000000000000000000af, - 0000000000000000000000c4, - 000000000000000000000101, - 000000000000000000000110, - 000000000000000000000199, - 0000000000000000000001c2, - 0000000000000000000001c4, - 0000000000000000000001c7, - 0000000000000000000001cf, + 0000000000000000000000b3, + 0000000000000000000000c8, + 000000000000000000000105, + 000000000000000000000114, + 00000000000000000000019f, + 0000000000000000000001c8, + 0000000000000000000001ca, + 0000000000000000000001cd, + 0000000000000000000001d5, ); name = flamerobin; sourceTree = ""; @@ -2061,7 +2089,7 @@ isa = PBXGroup; children = ( 00000000000000000000001c, - 000000000000000000000197, + 00000000000000000000019d, ); name = Products; sourceTree = ""; @@ -2078,14 +2106,14 @@ 00000000000000000000002b, 00000000000000000000002d, 00000000000000000000002f, - 000000000000000000000113, - 000000000000000000000114, - 000000000000000000000115, - 000000000000000000000116, 000000000000000000000117, 000000000000000000000118, 000000000000000000000119, 00000000000000000000011a, + 00000000000000000000011b, + 00000000000000000000011c, + 00000000000000000000011d, + 00000000000000000000011e, ); path = src; sourceTree = ""; @@ -2096,9 +2124,9 @@ 000000000000000000000032, 000000000000000000000034, 000000000000000000000036, - 00000000000000000000011b, - 00000000000000000000011c, - 00000000000000000000011d, + 00000000000000000000011f, + 000000000000000000000120, + 000000000000000000000121, ); path = src/config; sourceTree = ""; @@ -2118,10 +2146,6 @@ 00000000000000000000004b, 00000000000000000000004d, 00000000000000000000004f, - 00000000000000000000011e, - 00000000000000000000011f, - 000000000000000000000120, - 000000000000000000000121, 000000000000000000000122, 000000000000000000000123, 000000000000000000000124, @@ -2132,6 +2156,10 @@ 000000000000000000000129, 00000000000000000000012a, 00000000000000000000012b, + 00000000000000000000012c, + 00000000000000000000012d, + 00000000000000000000012e, + 00000000000000000000012f, ); path = src/core; sourceTree = ""; @@ -2140,7 +2168,7 @@ isa = PBXGroup; children = ( 000000000000000000000052, - 00000000000000000000012c, + 000000000000000000000130, ); path = src/engine; sourceTree = ""; @@ -2193,10 +2221,8 @@ 0000000000000000000000a9, 0000000000000000000000ab, 0000000000000000000000ad, - 00000000000000000000012d, - 00000000000000000000012e, - 00000000000000000000012f, - 000000000000000000000130, + 0000000000000000000000af, + 0000000000000000000000b1, 000000000000000000000131, 000000000000000000000132, 000000000000000000000133, @@ -2238,15 +2264,19 @@ 000000000000000000000157, 000000000000000000000158, 000000000000000000000159, + 00000000000000000000015a, + 00000000000000000000015b, + 00000000000000000000015c, + 00000000000000000000015d, + 00000000000000000000015e, + 00000000000000000000015f, ); path = src/gui; sourceTree = ""; }; - 0000000000000000000000af = { + 0000000000000000000000b3 = { isa = PBXGroup; children = ( - 0000000000000000000000b0, - 0000000000000000000000b2, 0000000000000000000000b4, 0000000000000000000000b6, 0000000000000000000000b8, @@ -2255,25 +2285,25 @@ 0000000000000000000000be, 0000000000000000000000c0, 0000000000000000000000c2, - 00000000000000000000015a, - 00000000000000000000015b, - 00000000000000000000015c, - 00000000000000000000015d, - 00000000000000000000015e, - 00000000000000000000015f, + 0000000000000000000000c4, + 0000000000000000000000c6, 000000000000000000000160, 000000000000000000000161, 000000000000000000000162, 000000000000000000000163, + 000000000000000000000164, + 000000000000000000000165, + 000000000000000000000166, + 000000000000000000000167, + 000000000000000000000168, + 000000000000000000000169, ); path = src/gui/controls; sourceTree = ""; }; - 0000000000000000000000c4 = { + 0000000000000000000000c8 = { isa = PBXGroup; children = ( - 0000000000000000000000c5, - 0000000000000000000000c7, 0000000000000000000000c9, 0000000000000000000000cb, 0000000000000000000000cd, @@ -2302,12 +2332,8 @@ 0000000000000000000000fb, 0000000000000000000000fd, 0000000000000000000000ff, - 000000000000000000000164, - 000000000000000000000165, - 000000000000000000000166, - 000000000000000000000167, - 000000000000000000000168, - 000000000000000000000169, + 000000000000000000000101, + 000000000000000000000103, 00000000000000000000016a, 00000000000000000000016b, 00000000000000000000016c, @@ -2333,45 +2359,48 @@ 000000000000000000000180, 000000000000000000000181, 000000000000000000000182, + 000000000000000000000183, + 000000000000000000000184, + 000000000000000000000185, + 000000000000000000000186, + 000000000000000000000187, + 000000000000000000000188, ); path = src/metadata; sourceTree = ""; }; - 000000000000000000000101 = { + 000000000000000000000105 = { isa = PBXGroup; children = ( - 000000000000000000000102, - 000000000000000000000104, 000000000000000000000106, 000000000000000000000108, 00000000000000000000010a, 00000000000000000000010c, 00000000000000000000010e, - 000000000000000000000183, - 000000000000000000000184, - 000000000000000000000185, - 000000000000000000000186, - 000000000000000000000187, - 000000000000000000000188, + 000000000000000000000110, + 000000000000000000000112, 000000000000000000000189, + 00000000000000000000018a, + 00000000000000000000018b, + 00000000000000000000018c, + 00000000000000000000018d, + 00000000000000000000018e, + 00000000000000000000018f, ); path = src/sql; sourceTree = ""; }; - 000000000000000000000110 = { + 000000000000000000000114 = { isa = PBXGroup; children = ( - 000000000000000000000111, + 000000000000000000000115, ); path = src/gui/mac; sourceTree = ""; }; - 000000000000000000000199 = { + 00000000000000000000019f = { isa = PBXGroup; children = ( - 00000000000000000000019a, - 00000000000000000000019c, - 00000000000000000000019e, 0000000000000000000001a0, 0000000000000000000001a2, 0000000000000000000001a4, @@ -2389,52 +2418,49 @@ 0000000000000000000001bc, 0000000000000000000001be, 0000000000000000000001c0, - 0000000000000000000001e0, - 0000000000000000000001e1, + 0000000000000000000001c2, + 0000000000000000000001c4, + 0000000000000000000001c6, + 0000000000000000000001e6, + 0000000000000000000001e7, ); path = src/ibpp; sourceTree = ""; }; - 0000000000000000000001c2 = { + 0000000000000000000001c8 = { isa = PBXGroup; children = ( - 0000000000000000000001c3, + 0000000000000000000001c9, ); path = src/firebird; sourceTree = ""; }; - 0000000000000000000001c4 = { + 0000000000000000000001ca = { isa = PBXGroup; children = ( - 0000000000000000000001c5, - 0000000000000000000001c6, + 0000000000000000000001cb, + 0000000000000000000001cc, ); path = src/firebird/include; sourceTree = ""; }; - 0000000000000000000001c7 = { + 0000000000000000000001cd = { isa = PBXGroup; children = ( - 0000000000000000000001c8, - 0000000000000000000001c9, - 0000000000000000000001ca, - 0000000000000000000001cb, - 0000000000000000000001cc, - 0000000000000000000001cd, 0000000000000000000001ce, + 0000000000000000000001cf, + 0000000000000000000001d0, + 0000000000000000000001d1, + 0000000000000000000001d2, + 0000000000000000000001d3, + 0000000000000000000001d4, ); path = src/firebird/include/firebird/impl; sourceTree = ""; }; - 0000000000000000000001cf = { + 0000000000000000000001d5 = { isa = PBXGroup; children = ( - 0000000000000000000001d0, - 0000000000000000000001d1, - 0000000000000000000001d2, - 0000000000000000000001d3, - 0000000000000000000001d4, - 0000000000000000000001d5, 0000000000000000000001d6, 0000000000000000000001d7, 0000000000000000000001d8, @@ -2445,6 +2471,12 @@ 0000000000000000000001dd, 0000000000000000000001de, 0000000000000000000001df, + 0000000000000000000001e0, + 0000000000000000000001e1, + 0000000000000000000001e2, + 0000000000000000000001e3, + 0000000000000000000001e4, + 0000000000000000000001e5, ); path = src/firebird/include/firebird/impl/msg; sourceTree = ""; @@ -2454,16 +2486,16 @@ /* Begin PBXNativeTarget section */ 00000000000000000000000d = { isa = PBXNativeTarget; - buildConfigurationList = 000000000000000000000196; + buildConfigurationList = 00000000000000000000019c; buildPhases = ( - 000000000000000000000198, + 00000000000000000000019e, ); buildRules = ( ); dependencies = ( ); name = ibpp; - productReference = 000000000000000000000197; + productReference = 00000000000000000000019d; productType = "com.apple.product-type.library.static"; }; 000000000000000000000012 = { @@ -2590,8 +2622,8 @@ 0000000000000000000000aa, 0000000000000000000000ac, 0000000000000000000000ae, - 0000000000000000000000b1, - 0000000000000000000000b3, + 0000000000000000000000b0, + 0000000000000000000000b2, 0000000000000000000000b5, 0000000000000000000000b7, 0000000000000000000000b9, @@ -2600,8 +2632,8 @@ 0000000000000000000000bf, 0000000000000000000000c1, 0000000000000000000000c3, - 0000000000000000000000c6, - 0000000000000000000000c8, + 0000000000000000000000c5, + 0000000000000000000000c7, 0000000000000000000000ca, 0000000000000000000000cc, 0000000000000000000000ce, @@ -2630,24 +2662,23 @@ 0000000000000000000000fc, 0000000000000000000000fe, 000000000000000000000100, - 000000000000000000000103, - 000000000000000000000105, + 000000000000000000000102, + 000000000000000000000104, 000000000000000000000107, 000000000000000000000109, 00000000000000000000010b, 00000000000000000000010d, 00000000000000000000010f, - 000000000000000000000112, + 000000000000000000000111, + 000000000000000000000113, + 000000000000000000000116, ); runOnlyForDeploymentPostprocessing = 0; }; - 000000000000000000000198 = { + 00000000000000000000019e = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 00000000000000000000019b, - 00000000000000000000019d, - 00000000000000000000019f, 0000000000000000000001a1, 0000000000000000000001a3, 0000000000000000000001a5, @@ -2665,6 +2696,9 @@ 0000000000000000000001bd, 0000000000000000000001bf, 0000000000000000000001c1, + 0000000000000000000001c3, + 0000000000000000000001c5, + 0000000000000000000001c7, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2681,15 +2715,15 @@ target = 00000000000000000000000d; targetProxy = 000000000000000000000010; }; - 00000000000000000000018b = { + 000000000000000000000191 = { isa = PBXTargetDependency; target = 00000000000000000000000d; - targetProxy = 00000000000000000000018a; + targetProxy = 000000000000000000000190; }; - 00000000000000000000018d = { + 000000000000000000000193 = { isa = PBXTargetDependency; target = 00000000000000000000000d; - targetProxy = 00000000000000000000018c; + targetProxy = 000000000000000000000192; }; /* End PBXTargetDependency section */ @@ -2870,7 +2904,7 @@ }; name = "DLL Debug Dynamic"; }; - 00000000000000000000018e = { + 000000000000000000000194 = { isa = XCBuildConfiguration; buildSettings = { GCC_ENABLE_CPP_RTTI = YES; @@ -2886,7 +2920,7 @@ }; name = "Release Static"; }; - 00000000000000000000018f = { + 000000000000000000000195 = { isa = XCBuildConfiguration; buildSettings = { GCC_ENABLE_CPP_RTTI = YES; @@ -2902,7 +2936,7 @@ }; name = "Debug Dynamic"; }; - 000000000000000000000190 = { + 000000000000000000000196 = { isa = XCBuildConfiguration; buildSettings = { GCC_ENABLE_CPP_RTTI = YES; @@ -2918,7 +2952,7 @@ }; name = "Release Dynamic"; }; - 000000000000000000000191 = { + 000000000000000000000197 = { isa = XCBuildConfiguration; buildSettings = { GCC_ENABLE_CPP_RTTI = YES; @@ -2934,7 +2968,7 @@ }; name = "DLL Debug Static"; }; - 000000000000000000000192 = { + 000000000000000000000198 = { isa = XCBuildConfiguration; buildSettings = { GCC_ENABLE_CPP_RTTI = YES; @@ -2950,7 +2984,7 @@ }; name = "Debug Static"; }; - 000000000000000000000193 = { + 000000000000000000000199 = { isa = XCBuildConfiguration; buildSettings = { GCC_ENABLE_CPP_RTTI = YES; @@ -2966,7 +3000,7 @@ }; name = "DLL Release Dynamic"; }; - 000000000000000000000194 = { + 00000000000000000000019a = { isa = XCBuildConfiguration; buildSettings = { GCC_ENABLE_CPP_RTTI = YES; @@ -2982,7 +3016,7 @@ }; name = "DLL Release Static"; }; - 000000000000000000000195 = { + 00000000000000000000019b = { isa = XCBuildConfiguration; buildSettings = { GCC_ENABLE_CPP_RTTI = YES; @@ -3031,17 +3065,17 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = "DLL Debug Dynamic"; }; - 000000000000000000000196 = { + 00000000000000000000019c = { isa = XCConfigurationList; buildConfigurations = ( - 00000000000000000000018e, - 00000000000000000000018f, - 000000000000000000000190, - 000000000000000000000191, - 000000000000000000000192, - 000000000000000000000193, 000000000000000000000194, 000000000000000000000195, + 000000000000000000000196, + 000000000000000000000197, + 000000000000000000000198, + 000000000000000000000199, + 00000000000000000000019a, + 00000000000000000000019b, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = "DLL Debug Dynamic"; diff --git a/flamerobin_flamerobin.dsp b/flamerobin_flamerobin.dsp index 8392bb3d..81bfac2b 100644 --- a/flamerobin_flamerobin.dsp +++ b/flamerobin_flamerobin.dsp @@ -57,8 +57,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxmsw32u_aui.lib wxmsw32u_stc.lib wxmsw32u_html.lib wxmsw32u_adv.lib wxmsw32u_core.lib wxbase32u_xml.lib wxbase32u.lib wxscintilla.lib wxexpat.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comctl32.lib rpcrt4.lib wsock32.lib vcus\ibpp.lib /nologo /machine:i386 /out:"vcus\flamerobin.exe" /pdb:"vcus\flamerobin.pdb" /nologo /subsystem:windows /libpath:"$(WXDIR)\lib\vc_dll" /subsystem:windows -# ADD LINK32 wxmsw32u_aui.lib wxmsw32u_stc.lib wxmsw32u_html.lib wxmsw32u_adv.lib wxmsw32u_core.lib wxbase32u_xml.lib wxbase32u.lib wxscintilla.lib wxexpat.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comctl32.lib rpcrt4.lib wsock32.lib vcus\ibpp.lib /nologo /machine:i386 /out:"vcus\flamerobin.exe" /pdb:"vcus\flamerobin.pdb" /nologo /subsystem:windows /libpath:"$(WXDIR)\lib\vc_dll" /subsystem:windows +# ADD BASE LINK32 wxmsw32u_aui.lib wxmsw32u_stc.lib wxmsw32u_html.lib wxmsw32u_adv.lib wxmsw32u_core.lib wxbase32u_xml.lib wxbase32u.lib wxscintilla.lib wxexpat.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comctl32.lib rpcrt4.lib wsock32.lib vcus\ibpp.lib /nologo /machine:i386 /out:"flamerobin.exe" /pdb:"vcus\flamerobin.pdb" /nologo /subsystem:windows /libpath:"$(WXDIR)\lib\vc_dll" /subsystem:windows +# ADD LINK32 wxmsw32u_aui.lib wxmsw32u_stc.lib wxmsw32u_html.lib wxmsw32u_adv.lib wxmsw32u_core.lib wxbase32u_xml.lib wxbase32u.lib wxscintilla.lib wxexpat.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comctl32.lib rpcrt4.lib wsock32.lib vcus\ibpp.lib /nologo /machine:i386 /out:"flamerobin.exe" /pdb:"vcus\flamerobin.pdb" /nologo /subsystem:windows /libpath:"$(WXDIR)\lib\vc_dll" /subsystem:windows !ELSEIF "$(CFG)" == "flamerobin - Win32 DLL Release Dynamic" @@ -82,8 +82,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxmsw32u_aui.lib wxmsw32u_stc.lib wxmsw32u_html.lib wxmsw32u_adv.lib wxmsw32u_core.lib wxbase32u_xml.lib wxbase32u.lib wxscintilla.lib wxexpat.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comctl32.lib rpcrt4.lib wsock32.lib vcu\ibpp.lib /nologo /machine:i386 /out:"vcu\flamerobin.exe" /pdb:"vcu\flamerobin.pdb" /nologo /subsystem:windows /libpath:"$(WXDIR)\lib\vc_dll" /subsystem:windows -# ADD LINK32 wxmsw32u_aui.lib wxmsw32u_stc.lib wxmsw32u_html.lib wxmsw32u_adv.lib wxmsw32u_core.lib wxbase32u_xml.lib wxbase32u.lib wxscintilla.lib wxexpat.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comctl32.lib rpcrt4.lib wsock32.lib vcu\ibpp.lib /nologo /machine:i386 /out:"vcu\flamerobin.exe" /pdb:"vcu\flamerobin.pdb" /nologo /subsystem:windows /libpath:"$(WXDIR)\lib\vc_dll" /subsystem:windows +# ADD BASE LINK32 wxmsw32u_aui.lib wxmsw32u_stc.lib wxmsw32u_html.lib wxmsw32u_adv.lib wxmsw32u_core.lib wxbase32u_xml.lib wxbase32u.lib wxscintilla.lib wxexpat.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comctl32.lib rpcrt4.lib wsock32.lib vcu\ibpp.lib /nologo /machine:i386 /out:"flamerobin.exe" /pdb:"vcu\flamerobin.pdb" /nologo /subsystem:windows /libpath:"$(WXDIR)\lib\vc_dll" /subsystem:windows +# ADD LINK32 wxmsw32u_aui.lib wxmsw32u_stc.lib wxmsw32u_html.lib wxmsw32u_adv.lib wxmsw32u_core.lib wxbase32u_xml.lib wxbase32u.lib wxscintilla.lib wxexpat.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comctl32.lib rpcrt4.lib wsock32.lib vcu\ibpp.lib /nologo /machine:i386 /out:"flamerobin.exe" /pdb:"vcu\flamerobin.pdb" /nologo /subsystem:windows /libpath:"$(WXDIR)\lib\vc_dll" /subsystem:windows !ELSEIF "$(CFG)" == "flamerobin - Win32 DLL Debug Static" @@ -107,8 +107,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxmsw32ud_aui.lib wxmsw32ud_stc.lib wxmsw32ud_html.lib wxmsw32ud_adv.lib wxmsw32ud_core.lib wxbase32ud_xml.lib wxbase32ud.lib wxscintillad.lib wxexpatd.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comctl32.lib rpcrt4.lib wsock32.lib vcusd\ibpp.lib /nologo /machine:i386 /out:"vcusd\flamerobin.exe" /debug /pdb:"vcusd\flamerobin.pdb" /nologo /subsystem:windows /libpath:"$(WXDIR)\lib\vc_dll" /subsystem:windows -# ADD LINK32 wxmsw32ud_aui.lib wxmsw32ud_stc.lib wxmsw32ud_html.lib wxmsw32ud_adv.lib wxmsw32ud_core.lib wxbase32ud_xml.lib wxbase32ud.lib wxscintillad.lib wxexpatd.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comctl32.lib rpcrt4.lib wsock32.lib vcusd\ibpp.lib /nologo /machine:i386 /out:"vcusd\flamerobin.exe" /debug /pdb:"vcusd\flamerobin.pdb" /nologo /subsystem:windows /libpath:"$(WXDIR)\lib\vc_dll" /subsystem:windows +# ADD BASE LINK32 wxmsw32ud_aui.lib wxmsw32ud_stc.lib wxmsw32ud_html.lib wxmsw32ud_adv.lib wxmsw32ud_core.lib wxbase32ud_xml.lib wxbase32ud.lib wxscintillad.lib wxexpatd.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comctl32.lib rpcrt4.lib wsock32.lib vcusd\ibpp.lib /nologo /machine:i386 /out:"flamerobin.exe" /debug /pdb:"vcusd\flamerobin.pdb" /nologo /subsystem:windows /libpath:"$(WXDIR)\lib\vc_dll" /subsystem:windows +# ADD LINK32 wxmsw32ud_aui.lib wxmsw32ud_stc.lib wxmsw32ud_html.lib wxmsw32ud_adv.lib wxmsw32ud_core.lib wxbase32ud_xml.lib wxbase32ud.lib wxscintillad.lib wxexpatd.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comctl32.lib rpcrt4.lib wsock32.lib vcusd\ibpp.lib /nologo /machine:i386 /out:"flamerobin.exe" /debug /pdb:"vcusd\flamerobin.pdb" /nologo /subsystem:windows /libpath:"$(WXDIR)\lib\vc_dll" /subsystem:windows !ELSEIF "$(CFG)" == "flamerobin - Win32 DLL Debug Dynamic" @@ -132,8 +132,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxmsw32ud_aui.lib wxmsw32ud_stc.lib wxmsw32ud_html.lib wxmsw32ud_adv.lib wxmsw32ud_core.lib wxbase32ud_xml.lib wxbase32ud.lib wxscintillad.lib wxexpatd.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comctl32.lib rpcrt4.lib wsock32.lib vcud\ibpp.lib /nologo /machine:i386 /out:"vcud\flamerobin.exe" /debug /pdb:"vcud\flamerobin.pdb" /nologo /subsystem:windows /libpath:"$(WXDIR)\lib\vc_dll" /subsystem:windows -# ADD LINK32 wxmsw32ud_aui.lib wxmsw32ud_stc.lib wxmsw32ud_html.lib wxmsw32ud_adv.lib wxmsw32ud_core.lib wxbase32ud_xml.lib wxbase32ud.lib wxscintillad.lib wxexpatd.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comctl32.lib rpcrt4.lib wsock32.lib vcud\ibpp.lib /nologo /machine:i386 /out:"vcud\flamerobin.exe" /debug /pdb:"vcud\flamerobin.pdb" /nologo /subsystem:windows /libpath:"$(WXDIR)\lib\vc_dll" /subsystem:windows +# ADD BASE LINK32 wxmsw32ud_aui.lib wxmsw32ud_stc.lib wxmsw32ud_html.lib wxmsw32ud_adv.lib wxmsw32ud_core.lib wxbase32ud_xml.lib wxbase32ud.lib wxscintillad.lib wxexpatd.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comctl32.lib rpcrt4.lib wsock32.lib vcud\ibpp.lib /nologo /machine:i386 /out:"flamerobin.exe" /debug /pdb:"vcud\flamerobin.pdb" /nologo /subsystem:windows /libpath:"$(WXDIR)\lib\vc_dll" /subsystem:windows +# ADD LINK32 wxmsw32ud_aui.lib wxmsw32ud_stc.lib wxmsw32ud_html.lib wxmsw32ud_adv.lib wxmsw32ud_core.lib wxbase32ud_xml.lib wxbase32ud.lib wxscintillad.lib wxexpatd.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comctl32.lib rpcrt4.lib wsock32.lib vcud\ibpp.lib /nologo /machine:i386 /out:"flamerobin.exe" /debug /pdb:"vcud\flamerobin.pdb" /nologo /subsystem:windows /libpath:"$(WXDIR)\lib\vc_dll" /subsystem:windows !ELSEIF "$(CFG)" == "flamerobin - Win32 Release Static" @@ -157,8 +157,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxmsw32u_aui.lib wxmsw32u_stc.lib wxmsw32u_html.lib wxmsw32u_adv.lib wxmsw32u_core.lib wxbase32u_xml.lib wxbase32u.lib wxscintilla.lib wxexpat.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comctl32.lib rpcrt4.lib wsock32.lib vcus\ibpp.lib /nologo /machine:i386 /out:"vcus\flamerobin.exe" /pdb:"vcus\flamerobin.pdb" /nologo /subsystem:windows /libpath:"$(WXDIR)\lib\vc_lib" /subsystem:windows -# ADD LINK32 wxmsw32u_aui.lib wxmsw32u_stc.lib wxmsw32u_html.lib wxmsw32u_adv.lib wxmsw32u_core.lib wxbase32u_xml.lib wxbase32u.lib wxscintilla.lib wxexpat.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comctl32.lib rpcrt4.lib wsock32.lib vcus\ibpp.lib /nologo /machine:i386 /out:"vcus\flamerobin.exe" /pdb:"vcus\flamerobin.pdb" /nologo /subsystem:windows /libpath:"$(WXDIR)\lib\vc_lib" /subsystem:windows +# ADD BASE LINK32 wxmsw32u_aui.lib wxmsw32u_stc.lib wxmsw32u_html.lib wxmsw32u_adv.lib wxmsw32u_core.lib wxbase32u_xml.lib wxbase32u.lib wxscintilla.lib wxexpat.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comctl32.lib rpcrt4.lib wsock32.lib vcus\ibpp.lib /nologo /machine:i386 /out:"flamerobin.exe" /pdb:"vcus\flamerobin.pdb" /nologo /subsystem:windows /libpath:"$(WXDIR)\lib\vc_lib" /subsystem:windows +# ADD LINK32 wxmsw32u_aui.lib wxmsw32u_stc.lib wxmsw32u_html.lib wxmsw32u_adv.lib wxmsw32u_core.lib wxbase32u_xml.lib wxbase32u.lib wxscintilla.lib wxexpat.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comctl32.lib rpcrt4.lib wsock32.lib vcus\ibpp.lib /nologo /machine:i386 /out:"flamerobin.exe" /pdb:"vcus\flamerobin.pdb" /nologo /subsystem:windows /libpath:"$(WXDIR)\lib\vc_lib" /subsystem:windows !ELSEIF "$(CFG)" == "flamerobin - Win32 Release Dynamic" @@ -182,8 +182,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxmsw32u_aui.lib wxmsw32u_stc.lib wxmsw32u_html.lib wxmsw32u_adv.lib wxmsw32u_core.lib wxbase32u_xml.lib wxbase32u.lib wxscintilla.lib wxexpat.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comctl32.lib rpcrt4.lib wsock32.lib vcu\ibpp.lib /nologo /machine:i386 /out:"vcu\flamerobin.exe" /pdb:"vcu\flamerobin.pdb" /nologo /subsystem:windows /libpath:"$(WXDIR)\lib\vc_lib" /subsystem:windows -# ADD LINK32 wxmsw32u_aui.lib wxmsw32u_stc.lib wxmsw32u_html.lib wxmsw32u_adv.lib wxmsw32u_core.lib wxbase32u_xml.lib wxbase32u.lib wxscintilla.lib wxexpat.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comctl32.lib rpcrt4.lib wsock32.lib vcu\ibpp.lib /nologo /machine:i386 /out:"vcu\flamerobin.exe" /pdb:"vcu\flamerobin.pdb" /nologo /subsystem:windows /libpath:"$(WXDIR)\lib\vc_lib" /subsystem:windows +# ADD BASE LINK32 wxmsw32u_aui.lib wxmsw32u_stc.lib wxmsw32u_html.lib wxmsw32u_adv.lib wxmsw32u_core.lib wxbase32u_xml.lib wxbase32u.lib wxscintilla.lib wxexpat.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comctl32.lib rpcrt4.lib wsock32.lib vcu\ibpp.lib /nologo /machine:i386 /out:"flamerobin.exe" /pdb:"vcu\flamerobin.pdb" /nologo /subsystem:windows /libpath:"$(WXDIR)\lib\vc_lib" /subsystem:windows +# ADD LINK32 wxmsw32u_aui.lib wxmsw32u_stc.lib wxmsw32u_html.lib wxmsw32u_adv.lib wxmsw32u_core.lib wxbase32u_xml.lib wxbase32u.lib wxscintilla.lib wxexpat.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comctl32.lib rpcrt4.lib wsock32.lib vcu\ibpp.lib /nologo /machine:i386 /out:"flamerobin.exe" /pdb:"vcu\flamerobin.pdb" /nologo /subsystem:windows /libpath:"$(WXDIR)\lib\vc_lib" /subsystem:windows !ELSEIF "$(CFG)" == "flamerobin - Win32 Debug Static" @@ -207,8 +207,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxmsw32ud_aui.lib wxmsw32ud_stc.lib wxmsw32ud_html.lib wxmsw32ud_adv.lib wxmsw32ud_core.lib wxbase32ud_xml.lib wxbase32ud.lib wxscintillad.lib wxexpatd.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comctl32.lib rpcrt4.lib wsock32.lib vcusd\ibpp.lib /nologo /machine:i386 /out:"vcusd\flamerobin.exe" /debug /pdb:"vcusd\flamerobin.pdb" /nologo /subsystem:windows /libpath:"$(WXDIR)\lib\vc_lib" /subsystem:windows -# ADD LINK32 wxmsw32ud_aui.lib wxmsw32ud_stc.lib wxmsw32ud_html.lib wxmsw32ud_adv.lib wxmsw32ud_core.lib wxbase32ud_xml.lib wxbase32ud.lib wxscintillad.lib wxexpatd.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comctl32.lib rpcrt4.lib wsock32.lib vcusd\ibpp.lib /nologo /machine:i386 /out:"vcusd\flamerobin.exe" /debug /pdb:"vcusd\flamerobin.pdb" /nologo /subsystem:windows /libpath:"$(WXDIR)\lib\vc_lib" /subsystem:windows +# ADD BASE LINK32 wxmsw32ud_aui.lib wxmsw32ud_stc.lib wxmsw32ud_html.lib wxmsw32ud_adv.lib wxmsw32ud_core.lib wxbase32ud_xml.lib wxbase32ud.lib wxscintillad.lib wxexpatd.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comctl32.lib rpcrt4.lib wsock32.lib vcusd\ibpp.lib /nologo /machine:i386 /out:"flamerobin.exe" /debug /pdb:"vcusd\flamerobin.pdb" /nologo /subsystem:windows /libpath:"$(WXDIR)\lib\vc_lib" /subsystem:windows +# ADD LINK32 wxmsw32ud_aui.lib wxmsw32ud_stc.lib wxmsw32ud_html.lib wxmsw32ud_adv.lib wxmsw32ud_core.lib wxbase32ud_xml.lib wxbase32ud.lib wxscintillad.lib wxexpatd.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comctl32.lib rpcrt4.lib wsock32.lib vcusd\ibpp.lib /nologo /machine:i386 /out:"flamerobin.exe" /debug /pdb:"vcusd\flamerobin.pdb" /nologo /subsystem:windows /libpath:"$(WXDIR)\lib\vc_lib" /subsystem:windows !ELSEIF "$(CFG)" == "flamerobin - Win32 Debug Dynamic" @@ -232,8 +232,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxmsw32ud_aui.lib wxmsw32ud_stc.lib wxmsw32ud_html.lib wxmsw32ud_adv.lib wxmsw32ud_core.lib wxbase32ud_xml.lib wxbase32ud.lib wxscintillad.lib wxexpatd.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comctl32.lib rpcrt4.lib wsock32.lib vcud\ibpp.lib /nologo /machine:i386 /out:"vcud\flamerobin.exe" /debug /pdb:"vcud\flamerobin.pdb" /nologo /subsystem:windows /libpath:"$(WXDIR)\lib\vc_lib" /subsystem:windows -# ADD LINK32 wxmsw32ud_aui.lib wxmsw32ud_stc.lib wxmsw32ud_html.lib wxmsw32ud_adv.lib wxmsw32ud_core.lib wxbase32ud_xml.lib wxbase32ud.lib wxscintillad.lib wxexpatd.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comctl32.lib rpcrt4.lib wsock32.lib vcud\ibpp.lib /nologo /machine:i386 /out:"vcud\flamerobin.exe" /debug /pdb:"vcud\flamerobin.pdb" /nologo /subsystem:windows /libpath:"$(WXDIR)\lib\vc_lib" /subsystem:windows +# ADD BASE LINK32 wxmsw32ud_aui.lib wxmsw32ud_stc.lib wxmsw32ud_html.lib wxmsw32ud_adv.lib wxmsw32ud_core.lib wxbase32ud_xml.lib wxbase32ud.lib wxscintillad.lib wxexpatd.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comctl32.lib rpcrt4.lib wsock32.lib vcud\ibpp.lib /nologo /machine:i386 /out:"flamerobin.exe" /debug /pdb:"vcud\flamerobin.pdb" /nologo /subsystem:windows /libpath:"$(WXDIR)\lib\vc_lib" /subsystem:windows +# ADD LINK32 wxmsw32ud_aui.lib wxmsw32ud_stc.lib wxmsw32ud_html.lib wxmsw32ud_adv.lib wxmsw32ud_core.lib wxbase32ud_xml.lib wxbase32ud.lib wxscintillad.lib wxexpatd.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comctl32.lib rpcrt4.lib wsock32.lib vcud\ibpp.lib /nologo /machine:i386 /out:"flamerobin.exe" /debug /pdb:"vcud\flamerobin.pdb" /nologo /subsystem:windows /libpath:"$(WXDIR)\lib\vc_lib" /subsystem:windows !ENDIF diff --git a/flamerobin_flamerobin.vcproj b/flamerobin_flamerobin.vcproj index e8b70bf8..35caf98a 100644 --- a/flamerobin_flamerobin.vcproj +++ b/flamerobin_flamerobin.vcproj @@ -82,7 +82,7 @@ Name="VCLinkerTool" AdditionalOptions="/nologo /subsystem:windows" AdditionalDependencies="wxmsw32ud_aui.lib wxmsw32ud_stc.lib wxmsw32ud_html.lib wxmsw32ud_adv.lib wxmsw32ud_core.lib wxbase32ud_xml.lib wxbase32ud.lib wxscintillad.lib wxexpatd.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comctl32.lib rpcrt4.lib wsock32.lib vcud\ibpp.lib" - OutputFile="vcud\flamerobin.exe" + OutputFile="flamerobin.exe" LinkIncremental="2" SuppressStartupBanner="true" AdditionalLibraryDirectories="$(WXDIR)\lib\vc_lib" @@ -177,7 +177,7 @@ Name="VCLinkerTool" AdditionalOptions="/nologo /subsystem:windows" AdditionalDependencies="wxmsw32ud_aui.lib wxmsw32ud_stc.lib wxmsw32ud_html.lib wxmsw32ud_adv.lib wxmsw32ud_core.lib wxbase32ud_xml.lib wxbase32ud.lib wxscintillad.lib wxexpatd.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comctl32.lib rpcrt4.lib wsock32.lib vcusd\ibpp.lib" - OutputFile="vcusd\flamerobin.exe" + OutputFile="flamerobin.exe" LinkIncremental="2" SuppressStartupBanner="true" AdditionalLibraryDirectories="$(WXDIR)\lib\vc_lib" @@ -270,7 +270,7 @@ Name="VCLinkerTool" AdditionalOptions="/nologo /subsystem:windows" AdditionalDependencies="wxmsw32u_aui.lib wxmsw32u_stc.lib wxmsw32u_html.lib wxmsw32u_adv.lib wxmsw32u_core.lib wxbase32u_xml.lib wxbase32u.lib wxscintilla.lib wxexpat.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comctl32.lib rpcrt4.lib wsock32.lib vcu\ibpp.lib" - OutputFile="vcu\flamerobin.exe" + OutputFile="flamerobin.exe" LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories="$(WXDIR)\lib\vc_lib" @@ -362,7 +362,7 @@ Name="VCLinkerTool" AdditionalOptions="/nologo /subsystem:windows" AdditionalDependencies="wxmsw32u_aui.lib wxmsw32u_stc.lib wxmsw32u_html.lib wxmsw32u_adv.lib wxmsw32u_core.lib wxbase32u_xml.lib wxbase32u.lib wxscintilla.lib wxexpat.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comctl32.lib rpcrt4.lib wsock32.lib vcus\ibpp.lib" - OutputFile="vcus\flamerobin.exe" + OutputFile="flamerobin.exe" LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories="$(WXDIR)\lib\vc_lib" @@ -456,7 +456,7 @@ Name="VCLinkerTool" AdditionalOptions="/nologo /subsystem:windows" AdditionalDependencies="wxmsw32ud_aui.lib wxmsw32ud_stc.lib wxmsw32ud_html.lib wxmsw32ud_adv.lib wxmsw32ud_core.lib wxbase32ud_xml.lib wxbase32ud.lib wxscintillad.lib wxexpatd.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comctl32.lib rpcrt4.lib wsock32.lib vcud\ibpp.lib" - OutputFile="vcud\flamerobin.exe" + OutputFile="flamerobin.exe" LinkIncremental="2" SuppressStartupBanner="true" AdditionalLibraryDirectories="$(WXDIR)\lib\vc_dll" @@ -551,7 +551,7 @@ Name="VCLinkerTool" AdditionalOptions="/nologo /subsystem:windows" AdditionalDependencies="wxmsw32ud_aui.lib wxmsw32ud_stc.lib wxmsw32ud_html.lib wxmsw32ud_adv.lib wxmsw32ud_core.lib wxbase32ud_xml.lib wxbase32ud.lib wxscintillad.lib wxexpatd.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comctl32.lib rpcrt4.lib wsock32.lib vcusd\ibpp.lib" - OutputFile="vcusd\flamerobin.exe" + OutputFile="flamerobin.exe" LinkIncremental="2" SuppressStartupBanner="true" AdditionalLibraryDirectories="$(WXDIR)\lib\vc_dll" @@ -644,7 +644,7 @@ Name="VCLinkerTool" AdditionalOptions="/nologo /subsystem:windows" AdditionalDependencies="wxmsw32u_aui.lib wxmsw32u_stc.lib wxmsw32u_html.lib wxmsw32u_adv.lib wxmsw32u_core.lib wxbase32u_xml.lib wxbase32u.lib wxscintilla.lib wxexpat.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comctl32.lib rpcrt4.lib wsock32.lib vcu\ibpp.lib" - OutputFile="vcu\flamerobin.exe" + OutputFile="flamerobin.exe" LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories="$(WXDIR)\lib\vc_dll" @@ -736,7 +736,7 @@ Name="VCLinkerTool" AdditionalOptions="/nologo /subsystem:windows" AdditionalDependencies="wxmsw32u_aui.lib wxmsw32u_stc.lib wxmsw32u_html.lib wxmsw32u_adv.lib wxmsw32u_core.lib wxbase32u_xml.lib wxbase32u.lib wxscintilla.lib wxexpat.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comctl32.lib rpcrt4.lib wsock32.lib vcus\ibpp.lib" - OutputFile="vcus\flamerobin.exe" + OutputFile="flamerobin.exe" LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories="$(WXDIR)\lib\vc_dll" diff --git a/flamerobin_flamerobin.vcxproj b/flamerobin_flamerobin.vcxproj index 6a879080..68e024ee 100644 --- a/flamerobin_flamerobin.vcxproj +++ b/flamerobin_flamerobin.vcxproj @@ -208,7 +208,7 @@ <_ProjectFileVersion>12.0.30501.0 - vcud\ + . vcud\flamerobin\ true true @@ -454,7 +454,7 @@ /nologo /subsystem:windows %(AdditionalOptions) wxmsw32ud_aui.lib;wxmsw32ud_stc.lib;wxmsw32ud_html.lib;wxmsw32ud_adv.lib;wxmsw32ud_core.lib;wxbase32ud_xml.lib;wxbase32ud.lib;wxscintillad.lib;wxexpatd.lib;wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comctl32.lib;rpcrt4.lib;wsock32.lib;vcusd\ibpp.lib;%(AdditionalDependencies) - vcusd\flamerobin.exe + flamerobin.exe true $(WXDIR)\lib\vc_x64_lib;%(AdditionalLibraryDirectories) true @@ -496,7 +496,7 @@ /nologo /subsystem:windows %(AdditionalOptions) wxmsw32u_aui.lib;wxmsw32u_stc.lib;wxmsw32u_html.lib;wxmsw32u_adv.lib;wxmsw32u_core.lib;wxbase32u_xml.lib;wxbase32u.lib;wxscintilla.lib;wxexpat.lib;wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comctl32.lib;rpcrt4.lib;wsock32.lib;vcu\ibpp.lib;%(AdditionalDependencies) - vcu\flamerobin.exe + flamerobin.exe true $(WXDIR)\lib\vc_lib;$(BOOST_LIB_DIR);%(AdditionalLibraryDirectories) vcu\flamerobin.pdb @@ -539,7 +539,7 @@ /nologo /subsystem:windows %(AdditionalOptions) wxmsw32u_aui.lib;wxmsw32u_stc.lib;wxmsw32u_html.lib;wxmsw32u_adv.lib;wxmsw32u_core.lib;wxbase32u_xml.lib;wxbase32u.lib;wxscintilla.lib;wxexpat.lib;wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comctl32.lib;rpcrt4.lib;wsock32.lib;vcu\ibpp.lib;%(AdditionalDependencies) - vcu\flamerobin.exe + flamerobin.exe true $(WXDIR)\lib\vc_x64_lib;$(BOOST_LIB_DIR);%(AdditionalLibraryDirectories) vcu\flamerobin.pdb @@ -580,7 +580,7 @@ /nologo /subsystem:windows %(AdditionalOptions) wxmsw32u_aui.lib;wxmsw32u_stc.lib;wxmsw32u_html.lib;wxmsw32u_adv.lib;wxmsw32u_core.lib;wxbase32u_xml.lib;wxbase32u.lib;wxscintilla.lib;wxexpat.lib;wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comctl32.lib;rpcrt4.lib;wsock32.lib;vcus\ibpp.lib;%(AdditionalDependencies) - vcus\flamerobin.exe + flamerobin.exe true $(WXDIR)\lib\vc_lib;$(BOOST_LIB_DIR);%(AdditionalLibraryDirectories) vcus\flamerobin.pdb @@ -623,7 +623,7 @@ /nologo /subsystem:windows %(AdditionalOptions) wxmsw32u_aui.lib;wxmsw32u_stc.lib;wxmsw32u_html.lib;wxmsw32u_adv.lib;wxmsw32u_core.lib;wxbase32u_xml.lib;wxbase32u.lib;wxscintilla.lib;wxexpat.lib;wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comctl32.lib;rpcrt4.lib;wsock32.lib;vcus\ibpp.lib;%(AdditionalDependencies) - vcus\flamerobin.exe + flamerobin.exe true $(WXDIR)\lib\vc_x64_lib;$(BOOST_LIB_DIR);%(AdditionalLibraryDirectories) vcus\flamerobin.pdb @@ -666,7 +666,7 @@ /nologo /subsystem:windows %(AdditionalOptions) wxmsw32ud_aui.lib;wxmsw32ud_stc.lib;wxmsw32ud_html.lib;wxmsw32ud_adv.lib;wxmsw32ud_core.lib;wxbase32ud_xml.lib;wxbase32ud.lib;wxscintillad.lib;wxexpatd.lib;wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comctl32.lib;rpcrt4.lib;wsock32.lib;vcud\ibpp.lib;%(AdditionalDependencies) - vcud\flamerobin.exe + flamerobin.exe true $(WXDIR)\lib\vc_dll;$(BOOST_LIB_DIR);%(AdditionalLibraryDirectories) true @@ -711,7 +711,7 @@ /nologo /subsystem:windows %(AdditionalOptions) wxmsw32ud_aui.lib;wxmsw32ud_stc.lib;wxmsw32ud_html.lib;wxmsw32ud_adv.lib;wxmsw32ud_core.lib;wxbase32ud_xml.lib;wxbase32ud.lib;wxscintillad.lib;wxexpatd.lib;wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comctl32.lib;rpcrt4.lib;wsock32.lib;vcud\ibpp.lib;%(AdditionalDependencies) - vcud\flamerobin.exe + flamerobin.exe true $(WXDIR)\lib\vc_x64_dll;$(BOOST_LIB_DIR);%(AdditionalLibraryDirectories) true @@ -755,7 +755,7 @@ /nologo /subsystem:windows %(AdditionalOptions) wxmsw32ud_aui.lib;wxmsw32ud_stc.lib;wxmsw32ud_html.lib;wxmsw32ud_adv.lib;wxmsw32ud_core.lib;wxbase32ud_xml.lib;wxbase32ud.lib;wxscintillad.lib;wxexpatd.lib;wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comctl32.lib;rpcrt4.lib;wsock32.lib;vcusd\ibpp.lib;%(AdditionalDependencies) - vcusd\flamerobin.exe + flamerobin.exe true $(WXDIR)\lib\vc_dll;$(BOOST_LIB_DIR);%(AdditionalLibraryDirectories) true @@ -800,7 +800,7 @@ /nologo /subsystem:windows %(AdditionalOptions) wxmsw32ud_aui.lib;wxmsw32ud_stc.lib;wxmsw32ud_html.lib;wxmsw32ud_adv.lib;wxmsw32ud_core.lib;wxbase32ud_xml.lib;wxbase32ud.lib;wxscintillad.lib;wxexpatd.lib;wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comctl32.lib;rpcrt4.lib;wsock32.lib;vcusd\ibpp.lib;%(AdditionalDependencies) - vcusd\flamerobin.exe + flamerobin.exe true $(WXDIR)\lib\vc_x64_dll;$(BOOST_LIB_DIR);%(AdditionalLibraryDirectories) true @@ -842,7 +842,7 @@ /nologo /subsystem:windows %(AdditionalOptions) wxmsw32u_aui.lib;wxmsw32u_stc.lib;wxmsw32u_html.lib;wxmsw32u_adv.lib;wxmsw32u_core.lib;wxbase32u_xml.lib;wxbase32u.lib;wxscintilla.lib;wxexpat.lib;wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comctl32.lib;rpcrt4.lib;wsock32.lib;vcu\ibpp.lib;%(AdditionalDependencies) - vcu\flamerobin.exe + flamerobin.exe true $(WXDIR)\lib\vc_dll;$(BOOST_LIB_DIR);%(AdditionalLibraryDirectories) vcu\flamerobin.pdb @@ -885,7 +885,7 @@ /nologo /subsystem:windows %(AdditionalOptions) wxmsw32u_aui.lib;wxmsw32u_stc.lib;wxmsw32u_html.lib;wxmsw32u_adv.lib;wxmsw32u_core.lib;wxbase32u_xml.lib;wxbase32u.lib;wxscintilla.lib;wxexpat.lib;wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comctl32.lib;rpcrt4.lib;wsock32.lib;vcu\ibpp.lib;%(AdditionalDependencies) - vcu\flamerobin.exe + flamerobin.exe true $(WXDIR)\lib\vc_x64_dll;$(BOOST_LIB_DIR);%(AdditionalLibraryDirectories) vcu\flamerobin.pdb @@ -926,7 +926,7 @@ /nologo /subsystem:windows %(AdditionalOptions) wxmsw32u_aui.lib;wxmsw32u_stc.lib;wxmsw32u_html.lib;wxmsw32u_adv.lib;wxmsw32u_core.lib;wxbase32u_xml.lib;wxbase32u.lib;wxscintilla.lib;wxexpat.lib;wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comctl32.lib;rpcrt4.lib;wsock32.lib;vcus\ibpp.lib;%(AdditionalDependencies) - vcus\flamerobin.exe + flamerobin.exe true $(WXDIR)\lib\vc_dll;$(BOOST_LIB_DIR);%(AdditionalLibraryDirectories) vcus\flamerobin.pdb @@ -969,7 +969,7 @@ /nologo /subsystem:windows %(AdditionalOptions) wxmsw32u_aui.lib;wxmsw32u_stc.lib;wxmsw32u_html.lib;wxmsw32u_adv.lib;wxmsw32u_core.lib;wxbase32u_xml.lib;wxbase32u.lib;wxscintilla.lib;wxexpat.lib;wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comctl32.lib;rpcrt4.lib;wsock32.lib;vcus\ibpp.lib;%(AdditionalDependencies) - vcus\flamerobin.exe + flamerobin.exe true $(WXDIR)\lib\vc_x64_dll;$(BOOST_LIB_DIR);%(AdditionalLibraryDirectories) vcus\flamerobin.pdb @@ -1049,6 +1049,7 @@ + @@ -1060,6 +1061,7 @@ + @@ -1118,6 +1120,7 @@ + @@ -1170,6 +1173,7 @@ + @@ -1179,6 +1183,7 @@ + diff --git a/flamerobin_flamerobin.vcxproj.filters b/flamerobin_flamerobin.vcxproj.filters index f422ccb4..e04cb508 100644 --- a/flamerobin_flamerobin.vcxproj.filters +++ b/flamerobin_flamerobin.vcxproj.filters @@ -414,6 +414,12 @@ Source Files\metadata + + Source Files\gui + + + Source Files\gui + @@ -776,6 +782,15 @@ Header Files\metadata + + Header Files\gui + + + Header Files\gui + + + Source Files\gui + diff --git a/makefile.bcc b/makefile.bcc index 9f19c13a..98485e3d 100644 --- a/makefile.bcc +++ b/makefile.bcc @@ -113,6 +113,7 @@ FLAMEROBIN_OBJECTS = \ bccu$(R_OPT)$(D_OPT)\flamerobin_FindDialog.obj \ bccu$(R_OPT)$(D_OPT)\flamerobin_FRLayoutConfig.obj \ bccu$(R_OPT)$(D_OPT)\flamerobin_FRStyle.obj \ + bccu$(R_OPT)$(D_OPT)\flamerobin_FRStyleManager.obj \ bccu$(R_OPT)$(D_OPT)\flamerobin_GUIURIHandlerHelper.obj \ bccu$(R_OPT)$(D_OPT)\flamerobin_HtmlHeaderMetadataItemVisitor.obj \ bccu$(R_OPT)$(D_OPT)\flamerobin_HtmlTemplateProcessor.obj \ @@ -123,6 +124,7 @@ FLAMEROBIN_OBJECTS = \ bccu$(R_OPT)$(D_OPT)\flamerobin_MultilineEnterDialog.obj \ bccu$(R_OPT)$(D_OPT)\flamerobin_PreferencesDialog.obj \ bccu$(R_OPT)$(D_OPT)\flamerobin_PreferencesDialogSettings.obj \ + bccu$(R_OPT)$(D_OPT)\flamerobin_PreferencesDialogStyle.obj \ bccu$(R_OPT)$(D_OPT)\flamerobin_PrivilegesDialog.obj \ bccu$(R_OPT)$(D_OPT)\flamerobin_ProgressDialog.obj \ bccu$(R_OPT)$(D_OPT)\flamerobin_ReorderFieldsDialog.obj \ @@ -428,6 +430,9 @@ bccu$(R_OPT)$(D_OPT)\flamerobin_FRLayoutConfig.obj: .\src\gui\FRLayoutConfig.cpp bccu$(R_OPT)$(D_OPT)\flamerobin_FRStyle.obj: .\src\gui\FRStyle.cpp $(CXX) -q -c -P -o$@ $(FLAMEROBIN_CXXFLAGS) .\src\gui\FRStyle.cpp +bccu$(R_OPT)$(D_OPT)\flamerobin_FRStyleManager.obj: .\src\gui\FRStyleManager.cpp + $(CXX) -q -c -P -o$@ $(FLAMEROBIN_CXXFLAGS) .\src\gui\FRStyleManager.cpp + bccu$(R_OPT)$(D_OPT)\flamerobin_GUIURIHandlerHelper.obj: .\src\gui\GUIURIHandlerHelper.cpp $(CXX) -q -c -P -o$@ $(FLAMEROBIN_CXXFLAGS) .\src\gui\GUIURIHandlerHelper.cpp @@ -458,6 +463,9 @@ bccu$(R_OPT)$(D_OPT)\flamerobin_PreferencesDialog.obj: .\src\gui\PreferencesDial bccu$(R_OPT)$(D_OPT)\flamerobin_PreferencesDialogSettings.obj: .\src\gui\PreferencesDialogSettings.cpp $(CXX) -q -c -P -o$@ $(FLAMEROBIN_CXXFLAGS) .\src\gui\PreferencesDialogSettings.cpp +bccu$(R_OPT)$(D_OPT)\flamerobin_PreferencesDialogStyle.obj: .\src\gui\PreferencesDialogStyle.cpp + $(CXX) -q -c -P -o$@ $(FLAMEROBIN_CXXFLAGS) .\src\gui\PreferencesDialogStyle.cpp + bccu$(R_OPT)$(D_OPT)\flamerobin_PrivilegesDialog.obj: .\src\gui\PrivilegesDialog.cpp $(CXX) -q -c -P -o$@ $(FLAMEROBIN_CXXFLAGS) .\src\gui\PrivilegesDialog.cpp diff --git a/makefile.gcc b/makefile.gcc index 944fc0e3..e01a01a9 100644 --- a/makefile.gcc +++ b/makefile.gcc @@ -95,6 +95,7 @@ FLAMEROBIN_OBJECTS = \ gccu$(R_OPT)$(D_OPT)\flamerobin_FindDialog.o \ gccu$(R_OPT)$(D_OPT)\flamerobin_FRLayoutConfig.o \ gccu$(R_OPT)$(D_OPT)\flamerobin_FRStyle.o \ + gccu$(R_OPT)$(D_OPT)\flamerobin_FRStyleManager.o \ gccu$(R_OPT)$(D_OPT)\flamerobin_GUIURIHandlerHelper.o \ gccu$(R_OPT)$(D_OPT)\flamerobin_HtmlHeaderMetadataItemVisitor.o \ gccu$(R_OPT)$(D_OPT)\flamerobin_HtmlTemplateProcessor.o \ @@ -105,6 +106,7 @@ FLAMEROBIN_OBJECTS = \ gccu$(R_OPT)$(D_OPT)\flamerobin_MultilineEnterDialog.o \ gccu$(R_OPT)$(D_OPT)\flamerobin_PreferencesDialog.o \ gccu$(R_OPT)$(D_OPT)\flamerobin_PreferencesDialogSettings.o \ + gccu$(R_OPT)$(D_OPT)\flamerobin_PreferencesDialogStyle.o \ gccu$(R_OPT)$(D_OPT)\flamerobin_PrivilegesDialog.o \ gccu$(R_OPT)$(D_OPT)\flamerobin_ProgressDialog.o \ gccu$(R_OPT)$(D_OPT)\flamerobin_ReorderFieldsDialog.o \ @@ -413,6 +415,9 @@ gccu$(R_OPT)$(D_OPT)\flamerobin_FRLayoutConfig.o: ./src/gui/FRLayoutConfig.cpp gccu$(R_OPT)$(D_OPT)\flamerobin_FRStyle.o: ./src/gui/FRStyle.cpp $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< +gccu$(R_OPT)$(D_OPT)\flamerobin_FRStyleManager.o: ./src/gui/FRStyleManager.cpp + $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< + gccu$(R_OPT)$(D_OPT)\flamerobin_GUIURIHandlerHelper.o: ./src/gui/GUIURIHandlerHelper.cpp $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< @@ -443,6 +448,9 @@ gccu$(R_OPT)$(D_OPT)\flamerobin_PreferencesDialog.o: ./src/gui/PreferencesDialog gccu$(R_OPT)$(D_OPT)\flamerobin_PreferencesDialogSettings.o: ./src/gui/PreferencesDialogSettings.cpp $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< +gccu$(R_OPT)$(D_OPT)\flamerobin_PreferencesDialogStyle.o: ./src/gui/PreferencesDialogStyle.cpp + $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< + gccu$(R_OPT)$(D_OPT)\flamerobin_PrivilegesDialog.o: ./src/gui/PrivilegesDialog.cpp $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $<