Skip to content

Commit

Permalink
macOS and iOS project update
Browse files Browse the repository at this point in the history
  • Loading branch information
@vinjn
vinjn committed Oct 17, 2017
1 parent 2e997b5 commit 6d904e9
Show file tree
Hide file tree
Showing 2 changed files with 419 additions and 130 deletions.
106 changes: 71 additions & 35 deletions xcode/FaceVFX.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,16 @@
2237EEE8588B43DBA8E48E7A /* CinderApp.icns in Resources */ = {isa = PBXBuildFile; fileRef = 440B1FEF603A4D35BA33F977 /* CinderApp.icns */; };
38FBF0514EEB4923B74FC5B0 /* AssetManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 69A4FBA3522946C68C0A7236 /* AssetManager.cpp */; };
5323E6B20EAFCA74003A9687 /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5323E6B10EAFCA74003A9687 /* CoreVideo.framework */; };
742513AE1D09B4D10073FBCA /* IFaceTracker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 742513951D09B4D10073FBCA /* IFaceTracker.cpp */; };
742513AF1D09B4D10073FBCA /* ciFaceTracker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 742513981D09B4D10073FBCA /* ciFaceTracker.cpp */; };
740846BC1F9651A0009F9658 /* OpenFaceTracker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 740846B31F96519F009F9658 /* OpenFaceTracker.cpp */; };
740846BD1F9651A0009F9658 /* BaseFaceTracker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 740846B61F96519F009F9658 /* BaseFaceTracker.cpp */; };
740846BF1F9651A0009F9658 /* JasonFaceTracker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 740846B81F9651A0009F9658 /* JasonFaceTracker.cpp */; };
740846C01F9651A0009F9658 /* Clone.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 740846B91F9651A0009F9658 /* Clone.cpp */; };
74265F7A1D1173E8002EE405 /* MiniConfig.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 74265F781D1173E8002EE405 /* MiniConfig.cpp */; };
74727D4F1D0F001C00EF7B50 /* imgui.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 74727C231D0F001C00EF7B50 /* imgui.cpp */; };
74727D501D0F001C00EF7B50 /* imgui_demo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 74727C251D0F001C00EF7B50 /* imgui_demo.cpp */; };
74727D511D0F001C00EF7B50 /* imgui_draw.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 74727C261D0F001C00EF7B50 /* imgui_draw.cpp */; };
74727D541D0F001C00EF7B50 /* CinderImGui.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 74727C2E1D0F001C00EF7B50 /* CinderImGui.cpp */; };
74A547521CFADFF900C05CAC /* item.def in Resources */ = {isa = PBXBuildFile; fileRef = 74A547511CFADFF900C05CAC /* item.def */; };
74A547551CFAE06300C05CAC /* Clone.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 74A547531CFAE06300C05CAC /* Clone.cpp */; };
74E49D8D1F578FF90067A532 /* _PAW.cc in Sources */ = {isa = PBXBuildFile; fileRef = 74E49CCD1F578FF90067A532 /* _PAW.cc */; };
74E49D8E1F578FF90067A532 /* _PDM.cc in Sources */ = {isa = PBXBuildFile; fileRef = 74E49CCE1F578FF90067A532 /* _PDM.cc */; };
74E49D8F1F578FF90067A532 /* CLM.cc in Sources */ = {isa = PBXBuildFile; fileRef = 74E49CCF1F578FF90067A532 /* CLM.cc */; };
Expand Down Expand Up @@ -122,10 +123,15 @@
440B1FEF603A4D35BA33F977 /* CinderApp.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = CinderApp.icns; path = ../resources/CinderApp.icns; sourceTree = "<group>"; };
5323E6B10EAFCA74003A9687 /* CoreVideo.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreVideo.framework; path = /System/Library/Frameworks/CoreVideo.framework; sourceTree = "<absolute>"; };
69A4FBA3522946C68C0A7236 /* AssetManager.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.cpp; name = AssetManager.cpp; path = "../../Cinder/blocks/Cinder-VNM/src/AssetManager.cpp"; sourceTree = "<group>"; };
742513951D09B4D10073FBCA /* IFaceTracker.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = IFaceTracker.cpp; sourceTree = "<group>"; };
742513961D09B4D10073FBCA /* IFaceTracker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IFaceTracker.h; sourceTree = "<group>"; };
742513981D09B4D10073FBCA /* ciFaceTracker.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ciFaceTracker.cpp; sourceTree = "<group>"; };
742513991D09B4D10073FBCA /* ciFaceTracker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ciFaceTracker.h; sourceTree = "<group>"; };
740846B31F96519F009F9658 /* OpenFaceTracker.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = OpenFaceTracker.cpp; path = ../src/OpenFaceTracker.cpp; sourceTree = "<group>"; };
740846B41F96519F009F9658 /* OpenFaceTracker.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = OpenFaceTracker.h; path = ../src/OpenFaceTracker.h; sourceTree = "<group>"; };
740846B51F96519F009F9658 /* Clone.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = Clone.h; path = ../src/Clone.h; sourceTree = "<group>"; };
740846B61F96519F009F9658 /* BaseFaceTracker.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = BaseFaceTracker.cpp; path = ../src/BaseFaceTracker.cpp; sourceTree = "<group>"; };
740846B71F96519F009F9658 /* FaceVFXApp.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = FaceVFXApp.cpp; path = ../src/FaceVFXApp.cpp; sourceTree = "<group>"; };
740846B81F9651A0009F9658 /* JasonFaceTracker.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = JasonFaceTracker.cpp; path = ../src/JasonFaceTracker.cpp; sourceTree = "<group>"; };
740846B91F9651A0009F9658 /* Clone.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Clone.cpp; path = ../src/Clone.cpp; sourceTree = "<group>"; };
740846BA1F9651A0009F9658 /* JasonFaceTracker.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = JasonFaceTracker.h; path = ../src/JasonFaceTracker.h; sourceTree = "<group>"; };
740846BB1F9651A0009F9658 /* BaseFaceTracker.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = BaseFaceTracker.h; path = ../src/BaseFaceTracker.h; sourceTree = "<group>"; };
74265F781D1173E8002EE405 /* MiniConfig.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = MiniConfig.cpp; path = "../../Cinder/blocks/Cinder-VNM/src/MiniConfig.cpp"; sourceTree = "<group>"; };
7462E2241D12F39B0064F40D /* AssetManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AssetManager.h; sourceTree = "<group>"; };
7462E2251D12F39B0064F40D /* CaptureHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CaptureHelper.h; sourceTree = "<group>"; };
Expand All @@ -146,8 +152,6 @@
74727C2C1D0F001C00EF7B50 /* stb_truetype.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = stb_truetype.h; sourceTree = "<group>"; };
74727C2E1D0F001C00EF7B50 /* CinderImGui.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CinderImGui.cpp; sourceTree = "<group>"; };
74A547511CFADFF900C05CAC /* item.def */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = item.def; path = ../include/item.def; sourceTree = "<group>"; };
74A547531CFAE06300C05CAC /* Clone.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Clone.cpp; path = ../src/Clone.cpp; sourceTree = "<group>"; };
74A547541CFAE06300C05CAC /* Clone.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Clone.h; path = ../src/Clone.h; sourceTree = "<group>"; };
74E49CCD1F578FF90067A532 /* _PAW.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = _PAW.cc; sourceTree = "<group>"; };
74E49CCE1F578FF90067A532 /* _PDM.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = _PDM.cc; sourceTree = "<group>"; };
74E49CCF1F578FF90067A532 /* CLM.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CLM.cc; sourceTree = "<group>"; };
Expand Down Expand Up @@ -287,9 +291,15 @@
children = (
74E49CCC1F578FF90067A532 /* FaceTracker */,
74E49CDF1F578FF90067A532 /* OpenFace */,
742513941D09B4D10073FBCA /* IFaceTracker */,
74A547531CFAE06300C05CAC /* Clone.cpp */,
74A547541CFAE06300C05CAC /* Clone.h */,
740846B61F96519F009F9658 /* BaseFaceTracker.cpp */,
740846BB1F9651A0009F9658 /* BaseFaceTracker.h */,
740846B91F9651A0009F9658 /* Clone.cpp */,
740846B51F96519F009F9658 /* Clone.h */,
740846B71F96519F009F9658 /* FaceVFXApp.cpp */,
740846B81F9651A0009F9658 /* JasonFaceTracker.cpp */,
740846BA1F9651A0009F9658 /* JasonFaceTracker.h */,
740846B31F96519F009F9658 /* OpenFaceTracker.cpp */,
740846B41F96519F009F9658 /* OpenFaceTracker.h */,
B93F7ABE481247C2AA97F074 /* FaceVFXApp.cpp */,
);
name = Source;
Expand Down Expand Up @@ -389,26 +399,6 @@
name = src;
sourceTree = "<group>";
};
742513941D09B4D10073FBCA /* IFaceTracker */ = {
isa = PBXGroup;
children = (
742513951D09B4D10073FBCA /* IFaceTracker.cpp */,
742513961D09B4D10073FBCA /* IFaceTracker.h */,
742513971D09B4D10073FBCA /* jason_saragih_tracker */,
);
name = IFaceTracker;
path = ../src/IFaceTracker;
sourceTree = "<group>";
};
742513971D09B4D10073FBCA /* jason_saragih_tracker */ = {
isa = PBXGroup;
children = (
742513981D09B4D10073FBCA /* ciFaceTracker.cpp */,
742513991D09B4D10073FBCA /* ciFaceTracker.h */,
);
path = jason_saragih_tracker;
sourceTree = "<group>";
};
7462E2231D12F39B0064F40D /* include */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -742,6 +732,7 @@
29B97313FDCFA39411CA2CEA /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 0900;
};
buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "FaceVFX" */;
compatibilityVersion = "Xcode 3.2";
Expand Down Expand Up @@ -835,7 +826,6 @@
74E49E141F578FF90067A532 /* LandmarkDetectorModel.cpp in Sources */,
74E49D911F578FF90067A532 /* FCheck.cc in Sources */,
74E49E151F578FF90067A532 /* LandmarkDetectorParameters.cpp in Sources */,
742513AF1D09B4D10073FBCA /* ciFaceTracker.cpp in Sources */,
74E49E161F578FF90067A532 /* LandmarkDetectorUtils.cpp in Sources */,
74E49D941F578FF90067A532 /* Patch.cc in Sources */,
74E49E1A1F578FF90067A532 /* stdafx.cpp in Sources */,
Expand All @@ -844,19 +834,21 @@
74E49E111F578FF90067A532 /* CCNF_patch_expert.cpp in Sources */,
74727D541D0F001C00EF7B50 /* CinderImGui.cpp in Sources */,
D5701A71C9844149A33FDA8C /* FaceVFXApp.cpp in Sources */,
740846C01F9651A0009F9658 /* Clone.cpp in Sources */,
74727D501D0F001C00EF7B50 /* imgui_demo.cpp in Sources */,
38FBF0514EEB4923B74FC5B0 /* AssetManager.cpp in Sources */,
74A547551CFAE06300C05CAC /* Clone.cpp in Sources */,
74E49E191F578FF90067A532 /* PDM.cpp in Sources */,
74E49D961F578FF90067A532 /* Tracker.cc in Sources */,
74E49E131F578FF90067A532 /* LandmarkDetectorFunc.cpp in Sources */,
74FDA6041EBF744C004A3A0B /* ImGuizmo.cpp in Sources */,
74E49D8E1F578FF90067A532 /* _PDM.cc in Sources */,
74E49D8F1F578FF90067A532 /* CLM.cc in Sources */,
74727D511D0F001C00EF7B50 /* imgui_draw.cpp in Sources */,
740846BC1F9651A0009F9658 /* OpenFaceTracker.cpp in Sources */,
74E49E1D1F578FF90067A532 /* README.md in Sources */,
742513AE1D09B4D10073FBCA /* IFaceTracker.cpp in Sources */,
740846BF1F9651A0009F9658 /* JasonFaceTracker.cpp in Sources */,
74E49D921F578FF90067A532 /* FDet.cc in Sources */,
740846BD1F9651A0009F9658 /* BaseFaceTracker.cpp in Sources */,
74E49E121F578FF90067A532 /* LandmarkDetectionValidator.cpp in Sources */,
74E49D931F578FF90067A532 /* IO.cc in Sources */,
74727D4F1D0F001C00EF7B50 /* imgui.cpp in Sources */,
Expand Down Expand Up @@ -971,10 +963,32 @@
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CINDER_PATH = ../../Cinder;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_CXX_LANGUAGE_STANDARD = "c++11";
CLANG_CXX_LIBRARY = "libc++";
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
GCC_NO_COMMON_BLOCKS = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = "\"$(CINDER_PATH)/include\"";
MACOSX_DEPLOYMENT_TARGET = 10.8;
Expand All @@ -989,9 +1003,31 @@
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CINDER_PATH = ../../Cinder;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_CXX_LANGUAGE_STANDARD = "c++11";
CLANG_CXX_LIBRARY = "libc++";
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_NO_COMMON_BLOCKS = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = "\"$(CINDER_PATH)/include\"";
MACOSX_DEPLOYMENT_TARGET = 10.8;
Expand Down
Loading

0 comments on commit 6d904e9

Please sign in to comment.