Skip to content

O
onlyoffice_core
Commit 7595d189 authored by ElenaSubbotina's avatar ElenaSubbotina
Browse files
Options

Merge branch 'develop' of https://github.com/ONLYOFFICE/core into develop

parents 49934d52 c94dcf11
Show whitespace changes
Inline Side-by-side
Showing with 74 additions and 20 deletions
ASCOfficeDocxFile2/Mac/ASCOfficeDocxFile2Lib.xcodeproj/project.pbxproj
View file @ 7595d189
...@@ -45,6 +45,10 @@ ...@@ -45,6 +45,10 @@
17C1FEBE1ACC42C4006B99B3 /* CSVWriter.h in Headers */ = {isa = PBXBuildFile; fileRef = 17E17F301AC4549B00BEA2EA /* CSVWriter.h */; }; 17C1FEBE1ACC42C4006B99B3 /* CSVWriter.h in Headers */ = {isa = PBXBuildFile; fileRef = 17E17F301AC4549B00BEA2EA /* CSVWriter.h */; };
69414A301CB51666003E771B /* ChartWriter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 69414A2E1CB51666003E771B /* ChartWriter.cpp */; }; 69414A301CB51666003E771B /* ChartWriter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 69414A2E1CB51666003E771B /* ChartWriter.cpp */; };
69414A311CB51666003E771B /* ChartWriter.h in Headers */ = {isa = PBXBuildFile; fileRef = 69414A2F1CB51666003E771B /* ChartWriter.h */; }; 69414A311CB51666003E771B /* ChartWriter.h in Headers */ = {isa = PBXBuildFile; fileRef = 69414A2F1CB51666003E771B /* ChartWriter.h */; };
6967917C1D9E8AEE002CA4BA /* BinEquationWriter.h in Headers */ = {isa = PBXBuildFile; fileRef = 696791781D9E8AEE002CA4BA /* BinEquationWriter.h */; };
6967917D1D9E8AEE002CA4BA /* BinReaderWriterDefines.h in Headers */ = {isa = PBXBuildFile; fileRef = 696791791D9E8AEE002CA4BA /* BinReaderWriterDefines.h */; };
6967917E1D9E8AEE002CA4BA /* BinWriters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6967917A1D9E8AEE002CA4BA /* BinWriters.cpp */; };
6967917F1D9E8AEE002CA4BA /* BinWriters.h in Headers */ = {isa = PBXBuildFile; fileRef = 6967917B1D9E8AEE002CA4BA /* BinWriters.h */; };
69F181AF1C77274E00B2952B /* FileDownloader.h in Headers */ = {isa = PBXBuildFile; fileRef = 69F181AD1C77274E00B2952B /* FileDownloader.h */; }; 69F181AF1C77274E00B2952B /* FileDownloader.h in Headers */ = {isa = PBXBuildFile; fileRef = 69F181AD1C77274E00B2952B /* FileDownloader.h */; };
69F181B51C77276D00B2952B /* FileDownloader_curl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 69F181B31C77276D00B2952B /* FileDownloader_curl.cpp */; }; 69F181B51C77276D00B2952B /* FileDownloader_curl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 69F181B31C77276D00B2952B /* FileDownloader_curl.cpp */; };
/* End PBXBuildFile section */ /* End PBXBuildFile section */
...@@ -89,6 +93,10 @@ ...@@ -89,6 +93,10 @@
17E17F301AC4549B00BEA2EA /* CSVWriter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSVWriter.h; sourceTree = "<group>"; }; 17E17F301AC4549B00BEA2EA /* CSVWriter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSVWriter.h; sourceTree = "<group>"; };
69414A2E1CB51666003E771B /* ChartWriter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ChartWriter.cpp; sourceTree = "<group>"; }; 69414A2E1CB51666003E771B /* ChartWriter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ChartWriter.cpp; sourceTree = "<group>"; };
69414A2F1CB51666003E771B /* ChartWriter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ChartWriter.h; sourceTree = "<group>"; }; 69414A2F1CB51666003E771B /* ChartWriter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ChartWriter.h; sourceTree = "<group>"; };
696791781D9E8AEE002CA4BA /* BinEquationWriter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BinEquationWriter.h; path = ../../BinWriter/BinEquationWriter.h; sourceTree = "<group>"; };
696791791D9E8AEE002CA4BA /* BinReaderWriterDefines.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BinReaderWriterDefines.h; path = ../../BinWriter/BinReaderWriterDefines.h; sourceTree = "<group>"; };
6967917A1D9E8AEE002CA4BA /* BinWriters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = BinWriters.cpp; path = ../../BinWriter/BinWriters.cpp; sourceTree = "<group>"; };
6967917B1D9E8AEE002CA4BA /* BinWriters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BinWriters.h; path = ../../BinWriter/BinWriters.h; sourceTree = "<group>"; };
69F181AD1C77274E00B2952B /* FileDownloader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FileDownloader.h; path = ../../../Common/FileDownloader/FileDownloader.h; sourceTree = "<group>"; }; 69F181AD1C77274E00B2952B /* FileDownloader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FileDownloader.h; path = ../../../Common/FileDownloader/FileDownloader.h; sourceTree = "<group>"; };
69F181B31C77276D00B2952B /* FileDownloader_curl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = FileDownloader_curl.cpp; path = ../../../Common/FileDownloader/FileDownloader_curl.cpp; sourceTree = "<group>"; }; 69F181B31C77276D00B2952B /* FileDownloader_curl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = FileDownloader_curl.cpp; path = ../../../Common/FileDownloader/FileDownloader_curl.cpp; sourceTree = "<group>"; };
/* End PBXFileReference section */ /* End PBXFileReference section */
...@@ -126,6 +134,7 @@ ...@@ -126,6 +134,7 @@
17E17F4D1AC454E200BEA2EA /* Common */, 17E17F4D1AC454E200BEA2EA /* Common */,
17E17F1A1AC4549B00BEA2EA /* XlsxSerializerCom */, 17E17F1A1AC4549B00BEA2EA /* XlsxSerializerCom */,
17E17F0D1AC4546100BEA2EA /* DocWrapper */, 17E17F0D1AC4546100BEA2EA /* DocWrapper */,
696791771D9E8AD2002CA4BA /* BinWriter */,
17E17EEA1AC4544900BEA2EA /* BinReader */, 17E17EEA1AC4544900BEA2EA /* BinReader */,
); );
path = ASCOfficeDocxFile2Lib; path = ASCOfficeDocxFile2Lib;
...@@ -226,6 +235,17 @@ ...@@ -226,6 +235,17 @@
name = Common; name = Common;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
696791771D9E8AD2002CA4BA /* BinWriter */ = {
isa = PBXGroup;
children = (
696791781D9E8AEE002CA4BA /* BinEquationWriter.h */,
696791791D9E8AEE002CA4BA /* BinReaderWriterDefines.h */,
6967917A1D9E8AEE002CA4BA /* BinWriters.cpp */,
6967917B1D9E8AEE002CA4BA /* BinWriters.h */,
);
name = BinWriter;
sourceTree = "<group>";
};
/* End PBXGroup section */ /* End PBXGroup section */
/* Begin PBXHeadersBuildPhase section */ /* Begin PBXHeadersBuildPhase section */
...@@ -240,7 +260,9 @@ ...@@ -240,7 +260,9 @@
17C1FEA51ACC42C4006B99B3 /* CommonWriter.h in Headers */, 17C1FEA51ACC42C4006B99B3 /* CommonWriter.h in Headers */,
17C1FEA61ACC42C4006B99B3 /* NumberingWriter.h in Headers */, 17C1FEA61ACC42C4006B99B3 /* NumberingWriter.h in Headers */,
17C1FEA71ACC42C4006B99B3 /* BinReaderWriterDefines.h in Headers */, 17C1FEA71ACC42C4006B99B3 /* BinReaderWriterDefines.h in Headers */,
6967917C1D9E8AEE002CA4BA /* BinEquationWriter.h in Headers */,
17C1FEA81ACC42C4006B99B3 /* BinaryWriter.h in Headers */, 17C1FEA81ACC42C4006B99B3 /* BinaryWriter.h in Headers */,
6967917F1D9E8AEE002CA4BA /* BinWriters.h in Headers */,
17C1FEA91ACC42C4006B99B3 /* DocumentWriter.h in Headers */, 17C1FEA91ACC42C4006B99B3 /* DocumentWriter.h in Headers */,
17C1FEAA1ACC42C4006B99B3 /* FontProcessor.h in Headers */, 17C1FEAA1ACC42C4006B99B3 /* FontProcessor.h in Headers */,
17C1FEAB1ACC42C4006B99B3 /* StylesWriter.h in Headers */, 17C1FEAB1ACC42C4006B99B3 /* StylesWriter.h in Headers */,
...@@ -253,6 +275,7 @@ ...@@ -253,6 +275,7 @@
17C1FEB11ACC42C4006B99B3 /* Common.h in Headers */, 17C1FEB11ACC42C4006B99B3 /* Common.h in Headers */,
17C1FEB21ACC42C4006B99B3 /* XlsxSerializer.h in Headers */, 17C1FEB21ACC42C4006B99B3 /* XlsxSerializer.h in Headers */,
17C1FEB31ACC42C4006B99B3 /* CSVReader.h in Headers */, 17C1FEB31ACC42C4006B99B3 /* CSVReader.h in Headers */,
6967917D1D9E8AEE002CA4BA /* BinReaderWriterDefines.h in Headers */,
69414A311CB51666003E771B /* ChartWriter.h in Headers */, 69414A311CB51666003E771B /* ChartWriter.h in Headers */,
17C1FEB41ACC42C4006B99B3 /* ContentTypesWriter.h in Headers */, 17C1FEB41ACC42C4006B99B3 /* ContentTypesWriter.h in Headers */,
17C1FEB51ACC42C4006B99B3 /* HeaderFooterWriter.h in Headers */, 17C1FEB51ACC42C4006B99B3 /* HeaderFooterWriter.h in Headers */,
...@@ -325,6 +348,7 @@ ...@@ -325,6 +348,7 @@
17C1FE9A1ACC42C4006B99B3 /* CommonWriter.cpp in Sources */, 17C1FE9A1ACC42C4006B99B3 /* CommonWriter.cpp in Sources */,
17C1FE9B1ACC42C4006B99B3 /* CSVWriter.cpp in Sources */, 17C1FE9B1ACC42C4006B99B3 /* CSVWriter.cpp in Sources */,
69414A301CB51666003E771B /* ChartWriter.cpp in Sources */, 69414A301CB51666003E771B /* ChartWriter.cpp in Sources */,
6967917E1D9E8AEE002CA4BA /* BinWriters.cpp in Sources */,
17C1FE9C1ACC42C4006B99B3 /* XlsxSerializer.cpp in Sources */, 17C1FE9C1ACC42C4006B99B3 /* XlsxSerializer.cpp in Sources */,
17C1FE9D1ACC42C4006B99B3 /* FontProcessor.cpp in Sources */, 17C1FE9D1ACC42C4006B99B3 /* FontProcessor.cpp in Sources */,
); );
......
ASCOfficePPTXFile/PPTXLib/Mac/PPTXFormatLib.xcodeproj/project.pbxproj
View file @ 7595d189
...@@ -476,6 +476,8 @@ ...@@ -476,6 +476,8 @@
695BC0061C06FFC400817D7E /* Enums.h in Headers */ = {isa = PBXBuildFile; fileRef = 695BC0041C06FFC400817D7E /* Enums.h */; }; 695BC0061C06FFC400817D7E /* Enums.h in Headers */ = {isa = PBXBuildFile; fileRef = 695BC0041C06FFC400817D7E /* Enums.h */; };
695BC0371C070DE900817D7E /* ASCSVGWriter.h in Headers */ = {isa = PBXBuildFile; fileRef = 695BC0351C070DE900817D7E /* ASCSVGWriter.h */; }; 695BC0371C070DE900817D7E /* ASCSVGWriter.h in Headers */ = {isa = PBXBuildFile; fileRef = 695BC0351C070DE900817D7E /* ASCSVGWriter.h */; };
695BC03A1C070DEF00817D7E /* ASCSVGWriter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 695BC0381C070DEF00817D7E /* ASCSVGWriter.cpp */; }; 695BC03A1C070DEF00817D7E /* ASCSVGWriter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 695BC0381C070DEF00817D7E /* ASCSVGWriter.cpp */; };
696791821D9E8B81002CA4BA /* MathParaWrapper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 696791801D9E8B81002CA4BA /* MathParaWrapper.cpp */; };
696791831D9E8B81002CA4BA /* MathParaWrapper.h in Headers */ = {isa = PBXBuildFile; fileRef = 696791811D9E8B81002CA4BA /* MathParaWrapper.h */; };
/* End PBXBuildFile section */ /* End PBXBuildFile section */
/* Begin PBXFileReference section */ /* Begin PBXFileReference section */
...@@ -954,6 +956,8 @@ ...@@ -954,6 +956,8 @@
695BC0041C06FFC400817D7E /* Enums.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Enums.h; path = ../../Editor/Drawing/Enums.h; sourceTree = "<group>"; }; 695BC0041C06FFC400817D7E /* Enums.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Enums.h; path = ../../Editor/Drawing/Enums.h; sourceTree = "<group>"; };
695BC0351C070DE900817D7E /* ASCSVGWriter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ASCSVGWriter.h; path = ../../../HtmlRenderer/include/ASCSVGWriter.h; sourceTree = "<group>"; }; 695BC0351C070DE900817D7E /* ASCSVGWriter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ASCSVGWriter.h; path = ../../../HtmlRenderer/include/ASCSVGWriter.h; sourceTree = "<group>"; };
695BC0381C070DEF00817D7E /* ASCSVGWriter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ASCSVGWriter.cpp; path = ../../../HtmlRenderer/src/ASCSVGWriter.cpp; sourceTree = "<group>"; }; 695BC0381C070DEF00817D7E /* ASCSVGWriter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ASCSVGWriter.cpp; path = ../../../HtmlRenderer/src/ASCSVGWriter.cpp; sourceTree = "<group>"; };
696791801D9E8B81002CA4BA /* MathParaWrapper.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MathParaWrapper.cpp; sourceTree = "<group>"; };
696791811D9E8B81002CA4BA /* MathParaWrapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MathParaWrapper.h; sourceTree = "<group>"; };
/* End PBXFileReference section */ /* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */ /* Begin PBXFrameworksBuildPhase section */
...@@ -1498,6 +1502,8 @@ ...@@ -1498,6 +1502,8 @@
179A44A31AC57B83005A27F7 /* Fld.h */, 179A44A31AC57B83005A27F7 /* Fld.h */,
179A44A41AC57B83005A27F7 /* Run.h */, 179A44A41AC57B83005A27F7 /* Run.h */,
179A44A51AC57B83005A27F7 /* RunBase.h */, 179A44A51AC57B83005A27F7 /* RunBase.h */,
696791801D9E8B81002CA4BA /* MathParaWrapper.cpp */,
696791811D9E8B81002CA4BA /* MathParaWrapper.h */,
); );
path = Runs; path = Runs;
sourceTree = "<group>"; sourceTree = "<group>";
...@@ -1767,6 +1773,7 @@ ...@@ -1767,6 +1773,7 @@
17C1FD2D1ACC429D006B99B3 /* Blur.h in Headers */, 17C1FD2D1ACC429D006B99B3 /* Blur.h in Headers */,
17C1FD2E1ACC429D006B99B3 /* CxnSp.h in Headers */, 17C1FD2E1ACC429D006B99B3 /* CxnSp.h in Headers */,
17C1FD2F1ACC429D006B99B3 /* Transition.h in Headers */, 17C1FD2F1ACC429D006B99B3 /* Transition.h in Headers */,
696791831D9E8B81002CA4BA /* MathParaWrapper.h in Headers */,
17C1FD301ACC429D006B99B3 /* EmbeddedFontDataId.h in Headers */, 17C1FD301ACC429D006B99B3 /* EmbeddedFontDataId.h in Headers */,
17C1FD321ACC429D006B99B3 /* TransitionBase.h in Headers */, 17C1FD321ACC429D006B99B3 /* TransitionBase.h in Headers */,
17C1FD331ACC429D006B99B3 /* TLNodeFillType.h in Headers */, 17C1FD331ACC429D006B99B3 /* TLNodeFillType.h in Headers */,
...@@ -2189,6 +2196,7 @@ ...@@ -2189,6 +2196,7 @@
695BC03A1C070DEF00817D7E /* ASCSVGWriter.cpp in Sources */, 695BC03A1C070DEF00817D7E /* ASCSVGWriter.cpp in Sources */,
17C1FCC11ACC429D006B99B3 /* FileMap.cpp in Sources */, 17C1FCC11ACC429D006B99B3 /* FileMap.cpp in Sources */,
17C1FCC21ACC429D006B99B3 /* ShapeTextProperties.cpp in Sources */, 17C1FCC21ACC429D006B99B3 /* ShapeTextProperties.cpp in Sources */,
696791821D9E8B81002CA4BA /* MathParaWrapper.cpp in Sources */,
17C1FCC31ACC429D006B99B3 /* TransitionBase.cpp in Sources */, 17C1FCC31ACC429D006B99B3 /* TransitionBase.cpp in Sources */,
17C1FCC51ACC429D006B99B3 /* Shape.cpp in Sources */, 17C1FCC51ACC429D006B99B3 /* Shape.cpp in Sources */,
17C1FCC61ACC429D006B99B3 /* ShapeProperties.cpp in Sources */, 17C1FCC61ACC429D006B99B3 /* ShapeProperties.cpp in Sources */,
......
Common/DocxFormat/Mac/DocxFormatLib.xcodeproj/project.pbxproj
View file @ 7595d189
...@@ -1424,6 +1424,8 @@ ...@@ -1424,6 +1424,8 @@
"$(PROJECT_DIR)/../../../UnicodeConverter/icubuilds/mac/icu/icu/common", "$(PROJECT_DIR)/../../../UnicodeConverter/icubuilds/mac/icu/icu/common",
"$(PROJECT_DIR)/../../../UnicodeConverter/icubuilds/mac/icu/icu/i18n", "$(PROJECT_DIR)/../../../UnicodeConverter/icubuilds/mac/icu/icu/i18n",
"$(PROJECT_DIR)/../../../UnicodeConverter/icubuilds/mac/icu/icu/io", "$(PROJECT_DIR)/../../../UnicodeConverter/icubuilds/mac/icu/icu/io",
"$(PROJECT_DIR)/../../../DesktopEditor/freetype-2.5.2/include",
"$(PROJECT_DIR)/../../../DesktopEditor/freetype-2.5.2/devel",
); );
IPHONEOS_DEPLOYMENT_TARGET = 8.0; IPHONEOS_DEPLOYMENT_TARGET = 8.0;
PRODUCT_NAME = DocxFormatLib_ios; PRODUCT_NAME = DocxFormatLib_ios;
...@@ -1460,6 +1462,8 @@ ...@@ -1460,6 +1462,8 @@
"$(PROJECT_DIR)/../../../UnicodeConverter/icubuilds/mac/icu/icu/common", "$(PROJECT_DIR)/../../../UnicodeConverter/icubuilds/mac/icu/icu/common",
"$(PROJECT_DIR)/../../../UnicodeConverter/icubuilds/mac/icu/icu/i18n", "$(PROJECT_DIR)/../../../UnicodeConverter/icubuilds/mac/icu/icu/i18n",
"$(PROJECT_DIR)/../../../UnicodeConverter/icubuilds/mac/icu/icu/io", "$(PROJECT_DIR)/../../../UnicodeConverter/icubuilds/mac/icu/icu/io",
"$(PROJECT_DIR)/../../../DesktopEditor/freetype-2.5.2/include",
"$(PROJECT_DIR)/../../../DesktopEditor/freetype-2.5.2/devel",
); );
IPHONEOS_DEPLOYMENT_TARGET = 8.0; IPHONEOS_DEPLOYMENT_TARGET = 8.0;
PRODUCT_NAME = DocxFormatLib_ios; PRODUCT_NAME = DocxFormatLib_ios;
......
DesktopEditor/mac_build/freetype/freetype.xcodeproj/project.pbxproj
View file @ 7595d189
...@@ -72,6 +72,7 @@ ...@@ -72,6 +72,7 @@
17C100841ACC4BC4006B99B3 /* ftmodule.h in Headers */ = {isa = PBXBuildFile; fileRef = 17D914171AC59CE60096D788 /* ftmodule.h */; }; 17C100841ACC4BC4006B99B3 /* ftmodule.h in Headers */ = {isa = PBXBuildFile; fileRef = 17D914171AC59CE60096D788 /* ftmodule.h */; };
17C100851ACC4BC4006B99B3 /* ftoption.h in Headers */ = {isa = PBXBuildFile; fileRef = 17D914181AC59CE60096D788 /* ftoption.h */; }; 17C100851ACC4BC4006B99B3 /* ftoption.h in Headers */ = {isa = PBXBuildFile; fileRef = 17D914181AC59CE60096D788 /* ftoption.h */; };
17C100861ACC4BC4006B99B3 /* ftbase.h in Headers */ = {isa = PBXBuildFile; fileRef = 17D914F41AC59CFB0096D788 /* ftbase.h */; }; 17C100861ACC4BC4006B99B3 /* ftbase.h in Headers */ = {isa = PBXBuildFile; fileRef = 17D914F41AC59CFB0096D788 /* ftbase.h */; };
696791751D9E881F002CA4BA /* ft2build.h in Headers */ = {isa = PBXBuildFile; fileRef = 696791741D9E881F002CA4BA /* ft2build.h */; };
/* End PBXBuildFile section */ /* End PBXBuildFile section */
/* Begin PBXFileReference section */ /* Begin PBXFileReference section */
...@@ -142,6 +143,7 @@ ...@@ -142,6 +143,7 @@
17D9168B1AC59CFD0096D788 /* type1.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = type1.c; sourceTree = "<group>"; }; 17D9168B1AC59CFD0096D788 /* type1.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = type1.c; sourceTree = "<group>"; };
17D916981AC59CFD0096D788 /* type42.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = type42.c; sourceTree = "<group>"; }; 17D916981AC59CFD0096D788 /* type42.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = type42.c; sourceTree = "<group>"; };
17D9169E1AC59CFD0096D788 /* winfnt.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = winfnt.c; sourceTree = "<group>"; }; 17D9169E1AC59CFD0096D788 /* winfnt.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = winfnt.c; sourceTree = "<group>"; };
696791741D9E881F002CA4BA /* ft2build.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ft2build.h; path = "../../../freetype-2.5.2/devel/ft2build.h"; sourceTree = "<group>"; };
/* End PBXFileReference section */ /* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */ /* Begin PBXFrameworksBuildPhase section */
...@@ -174,6 +176,7 @@ ...@@ -174,6 +176,7 @@
17D914071AC59C860096D788 /* freetype */ = { 17D914071AC59C860096D788 /* freetype */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
696791731D9E8819002CA4BA /* devel */,
17D914C71AC59CFA0096D788 /* src */, 17D914C71AC59CFA0096D788 /* src */,
17D914131AC59CE60096D788 /* include */, 17D914131AC59CE60096D788 /* include */,
); );
...@@ -438,6 +441,14 @@ ...@@ -438,6 +441,14 @@
path = winfonts; path = winfonts;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
696791731D9E8819002CA4BA /* devel */ = {
isa = PBXGroup;
children = (
696791741D9E881F002CA4BA /* ft2build.h */,
);
name = devel;
sourceTree = "<group>";
};
/* End PBXGroup section */ /* End PBXGroup section */
/* Begin PBXHeadersBuildPhase section */ /* Begin PBXHeadersBuildPhase section */
...@@ -451,6 +462,7 @@ ...@@ -451,6 +462,7 @@
17C100811ACC4BC4006B99B3 /* ftstdlib.h in Headers */, 17C100811ACC4BC4006B99B3 /* ftstdlib.h in Headers */,
17C100821ACC4BC4006B99B3 /* basepic.h in Headers */, 17C100821ACC4BC4006B99B3 /* basepic.h in Headers */,
17C100831ACC4BC4006B99B3 /* ftheader.h in Headers */, 17C100831ACC4BC4006B99B3 /* ftheader.h in Headers */,
696791751D9E881F002CA4BA /* ft2build.h in Headers */,
17C100841ACC4BC4006B99B3 /* ftmodule.h in Headers */, 17C100841ACC4BC4006B99B3 /* ftmodule.h in Headers */,
17C100851ACC4BC4006B99B3 /* ftoption.h in Headers */, 17C100851ACC4BC4006B99B3 /* ftoption.h in Headers */,
17C100861ACC4BC4006B99B3 /* ftbase.h in Headers */, 17C100861ACC4BC4006B99B3 /* ftbase.h in Headers */,
...@@ -586,6 +598,7 @@ ...@@ -586,6 +598,7 @@
"$(inherited)", "$(inherited)",
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
"$(PROJECT_DIR)/../../freetype-2.5.2/include", "$(PROJECT_DIR)/../../freetype-2.5.2/include",
"$(PROJECT_DIR)/../../freetype-2.5.2/devel",
); );
IPHONEOS_DEPLOYMENT_TARGET = 8.0; IPHONEOS_DEPLOYMENT_TARGET = 8.0;
PRODUCT_NAME = freetype_ios; PRODUCT_NAME = freetype_ios;
...@@ -609,6 +622,7 @@ ...@@ -609,6 +622,7 @@
"$(inherited)", "$(inherited)",
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
"$(PROJECT_DIR)/../../freetype-2.5.2/include", "$(PROJECT_DIR)/../../freetype-2.5.2/include",
"$(PROJECT_DIR)/../../freetype-2.5.2/devel",
); );
IPHONEOS_DEPLOYMENT_TARGET = 8.0; IPHONEOS_DEPLOYMENT_TARGET = 8.0;
PRODUCT_NAME = freetype_ios; PRODUCT_NAME = freetype_ios;
......
DesktopEditor/mac_build/freetype/freetype/NOTE.txt 0 → 100644
View file @ 7595d189
DO NOT REMOVE FOLDER FOR XCODE
\ No newline at end of file
X2tConverter/test/iosTest/iosTest.xcodeproj/project.pbxproj
View file @ 7595d189
...@@ -17,23 +17,23 @@ ...@@ -17,23 +17,23 @@
17DAB6891ACC371F005AF479 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 17DAB6881ACC371F005AF479 /* Images.xcassets */; }; 17DAB6891ACC371F005AF479 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 17DAB6881ACC371F005AF479 /* Images.xcassets */; };
17DAB68C1ACC371F005AF479 /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 17DAB68A1ACC371F005AF479 /* LaunchScreen.xib */; }; 17DAB68C1ACC371F005AF479 /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 17DAB68A1ACC371F005AF479 /* LaunchScreen.xib */; };
17DAB70E1ACC3B96005AF479 /* Demo-Hayden-Management-v2.docx in Resources */ = {isa = PBXBuildFile; fileRef = 17DAB70D1ACC3B90005AF479 /* Demo-Hayden-Management-v2.docx */; }; 17DAB70E1ACC3B96005AF479 /* Demo-Hayden-Management-v2.docx in Resources */ = {isa = PBXBuildFile; fileRef = 17DAB70D1ACC3B90005AF479 /* Demo-Hayden-Management-v2.docx */; };
694149741CB5048C003E771B /* libX2tConverter.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 694149711CB5047F003E771B /* libX2tConverter.a */; }; 6965353A1D9E85BB0093C60D /* libX2tConverter.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 696535371D9E85B00093C60D /* libX2tConverter.a */; };
/* End PBXBuildFile section */ /* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */ /* Begin PBXContainerItemProxy section */
694149701CB5047F003E771B /* PBXContainerItemProxy */ = { 696535361D9E85B00093C60D /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy; isa = PBXContainerItemProxy;
containerPortal = 6941496B1CB5047F003E771B /* X2tConverter.xcodeproj */; containerPortal = 696535311D9E85B00093C60D /* X2tConverter.xcodeproj */;
proxyType = 2; proxyType = 2;
remoteGlobalIDString = 17C8DED01ACD696100902C85; remoteGlobalIDString = 17C8DED01ACD696100902C85;
remoteInfo = X2tConverter; remoteInfo = x2tconverter;
}; };
694149721CB50485003E771B /* PBXContainerItemProxy */ = { 696535381D9E85B40093C60D /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy; isa = PBXContainerItemProxy;
containerPortal = 6941496B1CB5047F003E771B /* X2tConverter.xcodeproj */; containerPortal = 696535311D9E85B00093C60D /* X2tConverter.xcodeproj */;
proxyType = 1; proxyType = 1;
remoteGlobalIDString = 17C8DEC11ACD696100902C85; remoteGlobalIDString = 17C8DEC11ACD696100902C85;
remoteInfo = X2tConverter; remoteInfo = x2tconverter;
}; };
/* End PBXContainerItemProxy section */ /* End PBXContainerItemProxy section */
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
17DAB68B1ACC371F005AF479 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/LaunchScreen.xib; sourceTree = "<group>"; }; 17DAB68B1ACC371F005AF479 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/LaunchScreen.xib; sourceTree = "<group>"; };
17DAB70D1ACC3B90005AF479 /* Demo-Hayden-Management-v2.docx */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Demo-Hayden-Management-v2.docx"; sourceTree = "<group>"; }; 17DAB70D1ACC3B90005AF479 /* Demo-Hayden-Management-v2.docx */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Demo-Hayden-Management-v2.docx"; sourceTree = "<group>"; };
6905975F1CA137D000000D4D /* X2tConverter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = X2tConverter.h; path = ../../../build/Mac/X2tConverter/X2tConverter/X2tConverter.h; sourceTree = "<group>"; }; 6905975F1CA137D000000D4D /* X2tConverter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = X2tConverter.h; path = ../../../build/Mac/X2tConverter/X2tConverter/X2tConverter.h; sourceTree = "<group>"; };
6941496B1CB5047F003E771B /* X2tConverter.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = X2tConverter.xcodeproj; path = /Volumes/GIT/components/X2tConverter/build/Mac/TestMacX2tConverter/../X2tConverter/X2tConverter.xcodeproj; sourceTree = "<absolute>"; }; 696535311D9E85B00093C60D /* X2tConverter.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = X2tConverter.xcodeproj; path = /Users/amusinov/sources/core/X2tConverter/build/Mac/TestMacX2tConverter/../X2tConverter/X2tConverter.xcodeproj; sourceTree = "<absolute>"; };
/* End PBXFileReference section */ /* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */ /* Begin PBXFrameworksBuildPhase section */
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
isa = PBXFrameworksBuildPhase; isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647; buildActionMask = 2147483647;
files = ( files = (
694149741CB5048C003E771B /* libX2tConverter.a in Frameworks */, 6965353A1D9E85BB0093C60D /* libX2tConverter.a in Frameworks */,
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
}; };
...@@ -79,7 +79,7 @@ ...@@ -79,7 +79,7 @@
17DAB66F1ACC371E005AF479 = { 17DAB66F1ACC371E005AF479 = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
6941496B1CB5047F003E771B /* X2tConverter.xcodeproj */, 696535311D9E85B00093C60D /* X2tConverter.xcodeproj */,
17DAB67A1ACC371E005AF479 /* iosTest */, 17DAB67A1ACC371E005AF479 /* iosTest */,
17DAB6791ACC371E005AF479 /* Products */, 17DAB6791ACC371E005AF479 /* Products */,
); );
...@@ -131,10 +131,10 @@ ...@@ -131,10 +131,10 @@
name = Files; name = Files;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
6941496C1CB5047F003E771B /* Products */ = { 696535321D9E85B00093C60D /* Products */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
694149711CB5047F003E771B /* libX2tConverter.a */, 696535371D9E85B00093C60D /* libX2tConverter.a */,
); );
name = Products; name = Products;
sourceTree = "<group>"; sourceTree = "<group>";
...@@ -153,7 +153,7 @@ ...@@ -153,7 +153,7 @@
buildRules = ( buildRules = (
); );
dependencies = ( dependencies = (
694149731CB50485003E771B /* PBXTargetDependency */, 696535391D9E85B40093C60D /* PBXTargetDependency */,
); );
name = iosTest; name = iosTest;
productName = TestIOSX2tConverter; productName = TestIOSX2tConverter;
...@@ -171,6 +171,7 @@ ...@@ -171,6 +171,7 @@
TargetAttributes = { TargetAttributes = {
17DAB6771ACC371E005AF479 = { 17DAB6771ACC371E005AF479 = {
CreatedOnToolsVersion = 6.2; CreatedOnToolsVersion = 6.2;
ProvisioningStyle = Manual;
}; };
}; };
}; };
...@@ -187,8 +188,8 @@ ...@@ -187,8 +188,8 @@
projectDirPath = ""; projectDirPath = "";
projectReferences = ( projectReferences = (
{ {
ProductGroup = 6941496C1CB5047F003E771B /* Products */; ProductGroup = 696535321D9E85B00093C60D /* Products */;
ProjectRef = 6941496B1CB5047F003E771B /* X2tConverter.xcodeproj */; ProjectRef = 696535311D9E85B00093C60D /* X2tConverter.xcodeproj */;
}, },
); );
projectRoot = ""; projectRoot = "";
...@@ -199,11 +200,11 @@ ...@@ -199,11 +200,11 @@
/* End PBXProject section */ /* End PBXProject section */
/* Begin PBXReferenceProxy section */ /* Begin PBXReferenceProxy section */
694149711CB5047F003E771B /* libX2tConverter.a */ = { 696535371D9E85B00093C60D /* libX2tConverter.a */ = {
isa = PBXReferenceProxy; isa = PBXReferenceProxy;
fileType = archive.ar; fileType = archive.ar;
path = libX2tConverter.a; path = libX2tConverter.a;
remoteRef = 694149701CB5047F003E771B /* PBXContainerItemProxy */; remoteRef = 696535361D9E85B00093C60D /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR; sourceTree = BUILT_PRODUCTS_DIR;
}; };
/* End PBXReferenceProxy section */ /* End PBXReferenceProxy section */
...@@ -239,10 +240,10 @@ ...@@ -239,10 +240,10 @@
/* End PBXSourcesBuildPhase section */ /* End PBXSourcesBuildPhase section */
/* Begin PBXTargetDependency section */ /* Begin PBXTargetDependency section */
694149731CB50485003E771B /* PBXTargetDependency */ = { 696535391D9E85B40093C60D /* PBXTargetDependency */ = {
isa = PBXTargetDependency; isa = PBXTargetDependency;
name = X2tConverter; name = x2tconverter;
targetProxy = 694149721CB50485003E771B /* PBXContainerItemProxy */; targetProxy = 696535381D9E85B40093C60D /* PBXContainerItemProxy */;
}; };
/* End PBXTargetDependency section */ /* End PBXTargetDependency section */
...@@ -349,6 +350,7 @@ ...@@ -349,6 +350,7 @@
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
DEVELOPMENT_TEAM = "";
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
INFOPLIST_FILE = TestIOSX2tConverter/Info.plist; INFOPLIST_FILE = TestIOSX2tConverter/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 8.0; IPHONEOS_DEPLOYMENT_TARGET = 8.0;
...@@ -367,6 +369,7 @@ ...@@ -367,6 +369,7 @@
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
DEVELOPMENT_TEAM = "";
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
INFOPLIST_FILE = TestIOSX2tConverter/Info.plist; INFOPLIST_FILE = TestIOSX2tConverter/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 8.0; IPHONEOS_DEPLOYMENT_TARGET = 8.0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7