Commit 3042fdf2 authored by Alexey.Musinov's avatar Alexey.Musinov Committed by Alexander Trofimov

[mobile] корректная сборка конвертера для ios

parent c17cd540
DO NOT REMOVE FOLDER
\ No newline at end of file
This source diff could not be displayed because it is too large. You can view the blob instead.
DO NOT REMOVE FOLDER
\ No newline at end of file
......@@ -932,7 +932,7 @@
CD8AE2AB16187F770095DC1B /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 0630;
LastUpgradeCheck = 0730;
ORGANIZATIONNAME = "Enthusiastic Code";
};
buildConfigurationList = CD8AE2AE16187F770095DC1B /* Build configuration list for PBXProject "libcurl" */;
......@@ -1128,6 +1128,7 @@
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COPY_PHASE_STRIP = NO;
ENABLE_TESTABILITY = YES;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_DYNAMIC_NO_PIC = NO;
GCC_OPTIMIZATION_LEVEL = 0;
......
This source diff could not be displayed because it is too large. You can view the blob instead.
DO NOT REMOVE FOLDER FOR XCODE
\ No newline at end of file
DO NOT REMOVE FOLDER FOR XCODE
\ No newline at end of file
DO NOT REMOVE FOLDER FOR XCODE
\ No newline at end of file
......@@ -7,16 +7,12 @@
objects = {
/* Begin PBXBuildFile section */
175CBEB21AC945DB007D7DEC /* jbig_tab.c in Sources */ = {isa = PBXBuildFile; fileRef = 175CBEA91AC945DB007D7DEC /* jbig_tab.c */; };
175CBEB31AC945DB007D7DEC /* jbig.c in Sources */ = {isa = PBXBuildFile; fileRef = 175CBEAD1AC945DB007D7DEC /* jbig.c */; };
175CBEB41AC945DB007D7DEC /* jbig.h in Headers */ = {isa = PBXBuildFile; fileRef = 175CBEB11AC945DB007D7DEC /* jbig.h */; };
17C100F11ACC4DCC006B99B3 /* jbig_tab.c in Sources */ = {isa = PBXBuildFile; fileRef = 175CBEA91AC945DB007D7DEC /* jbig_tab.c */; };
17C100F21ACC4DCC006B99B3 /* jbig.c in Sources */ = {isa = PBXBuildFile; fileRef = 175CBEAD1AC945DB007D7DEC /* jbig.c */; };
17C100F51ACC4DCC006B99B3 /* jbig.h in Headers */ = {isa = PBXBuildFile; fileRef = 175CBEB11AC945DB007D7DEC /* jbig.h */; };
/* End PBXBuildFile section */
/* Begin PBXFileReference section */
175CBE9B1AC9458E007D7DEC /* libjbig.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libjbig.a; sourceTree = BUILT_PRODUCTS_DIR; };
175CBEA91AC945DB007D7DEC /* jbig_tab.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = jbig_tab.c; path = ../../../../cximage/jbig/jbig_tab.c; sourceTree = "<group>"; };
175CBEAD1AC945DB007D7DEC /* jbig.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = jbig.c; path = ../../../../cximage/jbig/jbig.c; sourceTree = "<group>"; };
175CBEB11AC945DB007D7DEC /* jbig.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = jbig.h; path = ../../../../cximage/jbig/jbig.h; sourceTree = "<group>"; };
......@@ -24,13 +20,6 @@
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
175CBE981AC9458E007D7DEC /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
17C100F31ACC4DCC006B99B3 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
......@@ -52,7 +41,6 @@
175CBE9C1AC9458E007D7DEC /* Products */ = {
isa = PBXGroup;
children = (
175CBE9B1AC9458E007D7DEC /* libjbig.a */,
17C100F91ACC4DCC006B99B3 /* libjbig_ios.a */,
);
name = Products;
......@@ -71,14 +59,6 @@
/* End PBXGroup section */
/* Begin PBXHeadersBuildPhase section */
175CBE991AC9458E007D7DEC /* Headers */ = {
isa = PBXHeadersBuildPhase;
buildActionMask = 2147483647;
files = (
175CBEB41AC945DB007D7DEC /* jbig.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
17C100F41ACC4DCC006B99B3 /* Headers */ = {
isa = PBXHeadersBuildPhase;
buildActionMask = 2147483647;
......@@ -90,26 +70,9 @@
/* End PBXHeadersBuildPhase section */
/* Begin PBXNativeTarget section */
175CBE9A1AC9458E007D7DEC /* jbig */ = {
isa = PBXNativeTarget;
buildConfigurationList = 175CBEA61AC9458E007D7DEC /* Build configuration list for PBXNativeTarget "jbig" */;
buildPhases = (
175CBE971AC9458E007D7DEC /* Sources */,
175CBE981AC9458E007D7DEC /* Frameworks */,
175CBE991AC9458E007D7DEC /* Headers */,
);
buildRules = (
);
dependencies = (
);
name = jbig;
productName = jbig;
productReference = 175CBE9B1AC9458E007D7DEC /* libjbig.a */;
productType = "com.apple.product-type.library.static";
};
17C100EF1ACC4DCC006B99B3 /* jbig_ios */ = {
17C100EF1ACC4DCC006B99B3 /* jbig */ = {
isa = PBXNativeTarget;
buildConfigurationList = 17C100F61ACC4DCC006B99B3 /* Build configuration list for PBXNativeTarget "jbig_ios" */;
buildConfigurationList = 17C100F61ACC4DCC006B99B3 /* Build configuration list for PBXNativeTarget "jbig" */;
buildPhases = (
17C100F01ACC4DCC006B99B3 /* Sources */,
17C100F31ACC4DCC006B99B3 /* Frameworks */,
......@@ -119,7 +82,7 @@
);
dependencies = (
);
name = jbig_ios;
name = jbig;
productName = jbig;
productReference = 17C100F91ACC4DCC006B99B3 /* libjbig_ios.a */;
productType = "com.apple.product-type.library.static";
......@@ -132,11 +95,6 @@
attributes = {
LastUpgradeCheck = 0700;
ORGANIZATIONNAME = "Ascensio System SIA";
TargetAttributes = {
175CBE9A1AC9458E007D7DEC = {
CreatedOnToolsVersion = 6.2;
};
};
};
buildConfigurationList = 175CBE961AC9458E007D7DEC /* Build configuration list for PBXProject "jbig" */;
compatibilityVersion = "Xcode 3.2";
......@@ -150,22 +108,12 @@
projectDirPath = "";
projectRoot = "";
targets = (
175CBE9A1AC9458E007D7DEC /* jbig */,
17C100EF1ACC4DCC006B99B3 /* jbig_ios */,
17C100EF1ACC4DCC006B99B3 /* jbig */,
);
};
/* End PBXProject section */
/* Begin PBXSourcesBuildPhase section */
175CBE971AC9458E007D7DEC /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
175CBEB21AC945DB007D7DEC /* jbig_tab.c in Sources */,
175CBEB31AC945DB007D7DEC /* jbig.c in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
17C100F01ACC4DCC006B99B3 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
......@@ -253,40 +201,6 @@
};
name = Release;
};
175CBEA71AC9458E007D7DEC /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
COMBINE_HIDPI_IMAGES = YES;
EXECUTABLE_PREFIX = lib;
GCC_ENABLE_CPP_EXCEPTIONS = YES;
GCC_ENABLE_CPP_RTTI = YES;
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
HEADER_SEARCH_PATHS = (
"$(inherited)",
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
"$(PROJECT_DIR)/../../../cximage/zlib/",
);
PRODUCT_NAME = "$(TARGET_NAME)";
};
name = Debug;
};
175CBEA81AC9458E007D7DEC /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
COMBINE_HIDPI_IMAGES = YES;
EXECUTABLE_PREFIX = lib;
GCC_ENABLE_CPP_EXCEPTIONS = YES;
GCC_ENABLE_CPP_RTTI = YES;
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
HEADER_SEARCH_PATHS = (
"$(inherited)",
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
"$(PROJECT_DIR)/../../../cximage/zlib/",
);
PRODUCT_NAME = "$(TARGET_NAME)";
};
name = Release;
};
17C100F71ACC4DCC006B99B3 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
......@@ -339,16 +253,7 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
175CBEA61AC9458E007D7DEC /* Build configuration list for PBXNativeTarget "jbig" */ = {
isa = XCConfigurationList;
buildConfigurations = (
175CBEA71AC9458E007D7DEC /* Debug */,
175CBEA81AC9458E007D7DEC /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
17C100F61ACC4DCC006B99B3 /* Build configuration list for PBXNativeTarget "jbig_ios" */ = {
17C100F61ACC4DCC006B99B3 /* Build configuration list for PBXNativeTarget "jbig" */ = {
isa = XCConfigurationList;
buildConfigurations = (
17C100F71ACC4DCC006B99B3 /* Debug */,
......
......@@ -7,27 +7,17 @@
objects = {
/* Begin PBXBuildFile section */
175CC16D1AC95633007D7DEC /* libdcr.c in Sources */ = {isa = PBXBuildFile; fileRef = 175CC1681AC95633007D7DEC /* libdcr.c */; };
175CC16E1AC95633007D7DEC /* libdcr.h in Headers */ = {isa = PBXBuildFile; fileRef = 175CC16A1AC95633007D7DEC /* libdcr.h */; };
17C101D61ACC4F80006B99B3 /* libdcr.c in Sources */ = {isa = PBXBuildFile; fileRef = 175CC1681AC95633007D7DEC /* libdcr.c */; };
17C101D91ACC4F80006B99B3 /* libdcr.h in Headers */ = {isa = PBXBuildFile; fileRef = 175CC16A1AC95633007D7DEC /* libdcr.h */; };
/* End PBXBuildFile section */
/* Begin PBXFileReference section */
175CC1551AC95610007D7DEC /* libraw.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libraw.a; sourceTree = BUILT_PRODUCTS_DIR; };
175CC1681AC95633007D7DEC /* libdcr.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = libdcr.c; path = ../../../../cximage/raw/libdcr.c; sourceTree = "<group>"; };
175CC16A1AC95633007D7DEC /* libdcr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = libdcr.h; path = ../../../../cximage/raw/libdcr.h; sourceTree = "<group>"; };
17C101DD1ACC4F80006B99B3 /* libraw_ios.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libraw_ios.a; sourceTree = BUILT_PRODUCTS_DIR; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
175CC1521AC95610007D7DEC /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
17C101D71ACC4F80006B99B3 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
......@@ -49,7 +39,6 @@
175CC1561AC95610007D7DEC /* Products */ = {
isa = PBXGroup;
children = (
175CC1551AC95610007D7DEC /* libraw.a */,
17C101DD1ACC4F80006B99B3 /* libraw_ios.a */,
);
name = Products;
......@@ -67,14 +56,6 @@
/* End PBXGroup section */
/* Begin PBXHeadersBuildPhase section */
175CC1531AC95610007D7DEC /* Headers */ = {
isa = PBXHeadersBuildPhase;
buildActionMask = 2147483647;
files = (
175CC16E1AC95633007D7DEC /* libdcr.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
17C101D81ACC4F80006B99B3 /* Headers */ = {
isa = PBXHeadersBuildPhase;
buildActionMask = 2147483647;
......@@ -86,26 +67,9 @@
/* End PBXHeadersBuildPhase section */
/* Begin PBXNativeTarget section */
175CC1541AC95610007D7DEC /* raw */ = {
17C101D41ACC4F80006B99B3 /* raw */ = {
isa = PBXNativeTarget;
buildConfigurationList = 175CC1601AC95611007D7DEC /* Build configuration list for PBXNativeTarget "raw" */;
buildPhases = (
175CC1511AC95610007D7DEC /* Sources */,
175CC1521AC95610007D7DEC /* Frameworks */,
175CC1531AC95610007D7DEC /* Headers */,
);
buildRules = (
);
dependencies = (
);
name = raw;
productName = raw;
productReference = 175CC1551AC95610007D7DEC /* libraw.a */;
productType = "com.apple.product-type.library.static";
};
17C101D41ACC4F80006B99B3 /* raw_ios */ = {
isa = PBXNativeTarget;
buildConfigurationList = 17C101DA1ACC4F80006B99B3 /* Build configuration list for PBXNativeTarget "raw_ios" */;
buildConfigurationList = 17C101DA1ACC4F80006B99B3 /* Build configuration list for PBXNativeTarget "raw" */;
buildPhases = (
17C101D51ACC4F80006B99B3 /* Sources */,
17C101D71ACC4F80006B99B3 /* Frameworks */,
......@@ -115,7 +79,7 @@
);
dependencies = (
);
name = raw_ios;
name = raw;
productName = raw;
productReference = 17C101DD1ACC4F80006B99B3 /* libraw_ios.a */;
productType = "com.apple.product-type.library.static";
......@@ -128,11 +92,6 @@
attributes = {
LastUpgradeCheck = 0700;
ORGANIZATIONNAME = "Ascensio System SIA";
TargetAttributes = {
175CC1541AC95610007D7DEC = {
CreatedOnToolsVersion = 6.2;
};
};
};
buildConfigurationList = 175CC1501AC9560E007D7DEC /* Build configuration list for PBXProject "raw" */;
compatibilityVersion = "Xcode 3.2";
......@@ -146,21 +105,12 @@
projectDirPath = "";
projectRoot = "";
targets = (
175CC1541AC95610007D7DEC /* raw */,
17C101D41ACC4F80006B99B3 /* raw_ios */,
17C101D41ACC4F80006B99B3 /* raw */,
);
};
/* End PBXProject section */
/* Begin PBXSourcesBuildPhase section */
175CC1511AC95610007D7DEC /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
175CC16D1AC95633007D7DEC /* libdcr.c in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
17C101D51ACC4F80006B99B3 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
......@@ -247,30 +197,6 @@
};
name = Release;
};
175CC1611AC95611007D7DEC /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
COMBINE_HIDPI_IMAGES = YES;
EXECUTABLE_PREFIX = lib;
GCC_ENABLE_CPP_EXCEPTIONS = YES;
GCC_ENABLE_CPP_RTTI = YES;
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
PRODUCT_NAME = "$(TARGET_NAME)";
};
name = Debug;
};
175CC1621AC95611007D7DEC /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
COMBINE_HIDPI_IMAGES = YES;
EXECUTABLE_PREFIX = lib;
GCC_ENABLE_CPP_EXCEPTIONS = YES;
GCC_ENABLE_CPP_RTTI = YES;
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
PRODUCT_NAME = "$(TARGET_NAME)";
};
name = Release;
};
17C101DB1ACC4F80006B99B3 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
......@@ -311,16 +237,7 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
175CC1601AC95611007D7DEC /* Build configuration list for PBXNativeTarget "raw" */ = {
isa = XCConfigurationList;
buildConfigurations = (
175CC1611AC95611007D7DEC /* Debug */,
175CC1621AC95611007D7DEC /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
17C101DA1ACC4F80006B99B3 /* Build configuration list for PBXNativeTarget "raw_ios" */ = {
17C101DA1ACC4F80006B99B3 /* Build configuration list for PBXNativeTarget "raw" */ = {
isa = XCConfigurationList;
buildConfigurations = (
17C101DB1ACC4F80006B99B3 /* Debug */,
......
DO NOT REMOVE FOLDER FOR XCODE
\ No newline at end of file
DO NOT REMOVE FOLDER FOR XCODE
\ No newline at end of file
DO NOT REMOVE FOLDER FOR XCODE
\ No newline at end of file
DO NOT REMOVE FOLDER FOR XCODE
\ No newline at end of file
/*
* raster.h
* raster
*
* Created by alexey.musinov on 27.03.15.
* Copyright (c) 2015 Ascensio System SIA. All rights reserved.
*
*/
#ifndef raster_
#define raster_
/* The classes below are exported */
#pragma GCC visibility push(default)
class raster
{
public:
void HelloWorld(const char *);
};
#pragma GCC visibility pop
#endif
This diff is collapsed.
......@@ -2,7 +2,7 @@
<Workspace
version = "1.0">
<FileRef
location = "group:/Volumes/trunk/ServerComponents/X2tConverter/test/iosTest/iosTest.xcodeproj">
location = "group:../../test/iosTest/iosTest.xcodeproj">
</FileRef>
<FileRef
location = "group:TestMacX2tConverter/../X2tConverter/X2tConverter.xcodeproj">
......
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