瀏覽代碼

no message

Hongtae Kim 8 年之前
父節點
當前提交
8e26167251
共有 3 個檔案被更改,包括 18 行新增2 行删除
  1. 1
    0
      .gitignore
  2. 3
    0
      DKGL2_Test.xcworkspace/contents.xcworkspacedata
  3. 14
    2
      TestApp1/TestApp1.xcodeproj/project.pbxproj

+ 1
- 0
.gitignore 查看文件

@@ -46,6 +46,7 @@ xcuserdata
46 46
 *.xccheckout
47 47
 *.moved-aside
48 48
 *.xcuserstate
49
+*.xcscmblueprint
49 50
 
50 51
 # Python
51 52
 __pycache__/

+ 3
- 0
DKGL2_Test.xcworkspace/contents.xcworkspacedata 查看文件

@@ -2,6 +2,9 @@
2 2
 <Workspace
3 3
    version = "1.0">
4 4
    <FileRef
5
+      location = "group:.gitignore">
6
+   </FileRef>
7
+   <FileRef
5 8
       location = "group:TestApp1/TestApp1.xcodeproj">
6 9
    </FileRef>
7 10
 </Workspace>

+ 14
- 2
TestApp1/TestApp1.xcodeproj/project.pbxproj 查看文件

@@ -9,6 +9,9 @@
9 9
 /* Begin PBXBuildFile section */
10 10
 		66DA89301DD1898C00338015 /* libDK.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 66DA89231DD1895700338015 /* libDK.a */; };
11 11
 		66DA89311DD1899500338015 /* libDK.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 66DA89251DD1895700338015 /* libDK.a */; };
12
+		66DA89941DD3117F00338015 /* TestApp1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 844A9A801DD0C080007DCC89 /* TestApp1.cpp */; };
13
+		66DA89971DD3118000338015 /* TestApp1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 844A9A801DD0C080007DCC89 /* TestApp1.cpp */; };
14
+		66DA899B1DD3164E00338015 /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 66DA899A1DD3164E00338015 /* AppKit.framework */; };
12 15
 		844A9A851DD0C080007DCC89 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 844A9A781DD0C080007DCC89 /* Assets.xcassets */; };
13 16
 		844A9A871DD0C080007DCC89 /* small.ico in Resources */ = {isa = PBXBuildFile; fileRef = 844A9A7C1DD0C080007DCC89 /* small.ico */; };
14 17
 		844A9A881DD0C080007DCC89 /* TestApp1.ico in Resources */ = {isa = PBXBuildFile; fileRef = 844A9A7E1DD0C080007DCC89 /* TestApp1.ico */; };
@@ -67,6 +70,7 @@
67 70
 		66DA89171DD1891900338015 /* libDK.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libDK.a; path = ../../dkgl2/DK/build/Debug/libDK.a; sourceTree = "<group>"; };
68 71
 		66DA89191DD1892200338015 /* libDK.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libDK.a; path = "../../dkgl2/DK/build/Debug-iphoneos/libDK.a"; sourceTree = "<group>"; };
69 72
 		66DA891B1DD1895700338015 /* DK.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = DK.xcodeproj; path = /Users/plgrim/Desktop/DK/dkgl2_test/../dkgl2/DK/DK.xcodeproj; sourceTree = "<absolute>"; };
73
+		66DA899A1DD3164E00338015 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; };
70 74
 		844A9A441DD0BCFD007DCC89 /* TestApp1_macOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = TestApp1_macOS.app; sourceTree = BUILT_PRODUCTS_DIR; };
71 75
 		844A9A5C1DD0BEDD007DCC89 /* TestApp1_iOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = TestApp1_iOS.app; sourceTree = BUILT_PRODUCTS_DIR; };
72 76
 		844A9A741DD0C080007DCC89 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
@@ -87,6 +91,7 @@
87 91
 			isa = PBXFrameworksBuildPhase;
88 92
 			buildActionMask = 2147483647;
89 93
 			files = (
94
+				66DA899B1DD3164E00338015 /* AppKit.framework in Frameworks */,
90 95
 				66DA89301DD1898C00338015 /* libDK.a in Frameworks */,
91 96
 			);
92 97
 			runOnlyForDeploymentPostprocessing = 0;
@@ -105,6 +110,7 @@
105 110
 		66DA89141DD1887A00338015 /* Frameworks */ = {
106 111
 			isa = PBXGroup;
107 112
 			children = (
113
+				66DA899A1DD3164E00338015 /* AppKit.framework */,
108 114
 				66DA89191DD1892200338015 /* libDK.a */,
109 115
 				66DA89171DD1891900338015 /* libDK.a */,
110 116
 				66DA89151DD1887A00338015 /* DK.framework */,
@@ -326,6 +332,7 @@
326 332
 			isa = PBXSourcesBuildPhase;
327 333
 			buildActionMask = 2147483647;
328 334
 			files = (
335
+				66DA89941DD3117F00338015 /* TestApp1.cpp in Sources */,
329 336
 			);
330 337
 			runOnlyForDeploymentPostprocessing = 0;
331 338
 		};
@@ -333,6 +340,7 @@
333 340
 			isa = PBXSourcesBuildPhase;
334 341
 			buildActionMask = 2147483647;
335 342
 			files = (
343
+				66DA89971DD3118000338015 /* TestApp1.cpp in Sources */,
336 344
 			);
337 345
 			runOnlyForDeploymentPostprocessing = 0;
338 346
 		};
@@ -373,7 +381,7 @@
373 381
 				CLANG_WARN_SUSPICIOUS_MOVES = YES;
374 382
 				CLANG_WARN_UNREACHABLE_CODE = YES;
375 383
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
376
-				CODE_SIGN_IDENTITY = "-";
384
+				CODE_SIGN_IDENTITY = "";
377 385
 				COPY_PHASE_STRIP = NO;
378 386
 				DEBUG_INFORMATION_FORMAT = dwarf;
379 387
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -383,6 +391,7 @@
383 391
 				GCC_NO_COMMON_BLOCKS = YES;
384 392
 				GCC_OPTIMIZATION_LEVEL = 0;
385 393
 				GCC_PREPROCESSOR_DEFINITIONS = (
394
+					DKGL_STATIC,
386 395
 					"DEBUG=1",
387 396
 					"$(inherited)",
388 397
 				);
@@ -392,6 +401,7 @@
392 401
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
393 402
 				GCC_WARN_UNUSED_FUNCTION = YES;
394 403
 				GCC_WARN_UNUSED_VARIABLE = YES;
404
+				HEADER_SEARCH_PATHS = ../DK;
395 405
 				MACOSX_DEPLOYMENT_TARGET = 10.12;
396 406
 				MTL_ENABLE_DEBUG_INFO = YES;
397 407
 				ONLY_ACTIVE_ARCH = YES;
@@ -420,19 +430,21 @@
420 430
 				CLANG_WARN_SUSPICIOUS_MOVES = YES;
421 431
 				CLANG_WARN_UNREACHABLE_CODE = YES;
422 432
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
423
-				CODE_SIGN_IDENTITY = "-";
433
+				CODE_SIGN_IDENTITY = "";
424 434
 				COPY_PHASE_STRIP = NO;
425 435
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
426 436
 				ENABLE_NS_ASSERTIONS = NO;
427 437
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
428 438
 				GCC_C_LANGUAGE_STANDARD = gnu99;
429 439
 				GCC_NO_COMMON_BLOCKS = YES;
440
+				GCC_PREPROCESSOR_DEFINITIONS = "DKGL_STATIC=1";
430 441
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
431 442
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
432 443
 				GCC_WARN_UNDECLARED_SELECTOR = YES;
433 444
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
434 445
 				GCC_WARN_UNUSED_FUNCTION = YES;
435 446
 				GCC_WARN_UNUSED_VARIABLE = YES;
447
+				HEADER_SEARCH_PATHS = ../DK;
436 448
 				MACOSX_DEPLOYMENT_TARGET = 10.12;
437 449
 				MTL_ENABLE_DEBUG_INFO = NO;
438 450
 				SDKROOT = macosx;