Skip to content

Commit 491f972

Browse files
revmischarevmischa
committed
removing absolute lib paths
1 parent 04001c2 commit 491f972

File tree

2 files changed

+58
-17
lines changed

2 files changed

+58
-17
lines changed

‎src/projectM-iTunes/macos/contrib/libGLEW.a‎

-169 KB
Binary file not shown.

‎src/projectM-iTunes/projectM Visualizer.xcodeproj/project.pbxproj‎

Lines changed: 58 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10-
C34045C01B1E21B500139822 /* Cg.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C34045BF1B1E21B500139822 /* Cg.framework */; };
11-
C34045C11B1E21B500139822 /* Cg.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C34045BF1B1E21B500139822 /* Cg.framework */; };
12-
C34045C31B1E220800139822 /* Cg.framework in Copy Files */ = {isa = PBXBuildFile; fileRef = C34045BF1B1E21B500139822 /* Cg.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
1310
C34E81141956D096001AC5B5 /* libRenderer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C34E81131956D096001AC5B5 /* libRenderer.a */; };
1411
C34E81171956D0AC001AC5B5 /* libMilkdropPresetFactory.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C34E81151956D0AC001AC5B5 /* libMilkdropPresetFactory.a */; };
1512
C34E81181956D0AC001AC5B5 /* libNativePresetFactory.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C34E81161956D0AC001AC5B5 /* libNativePresetFactory.a */; };
@@ -45,14 +42,23 @@
4542
C3FAF97B17B8A45200F4B110 /* fonts in share */ = {isa = PBXBuildFile; fileRef = C3FAF97917B8A43B00F4B110 /* fonts */; };
4643
/* End PBXBuildFile section */
4744

45+
/* Begin PBXContainerItemProxy section */
46+
169501421F6EC5E6008FAF86 /* PBXContainerItemProxy */ = {
47+
isa = PBXContainerItemProxy;
48+
containerPortal = 1695013E1F6EC5E5008FAF86 /* libprojectM.xcodeproj */;
49+
proxyType = 2;
50+
remoteGlobalIDString = 169501301F6EC5E5008FAF86;
51+
remoteInfo = libprojectM;
52+
};
53+
/* End PBXContainerItemProxy section */
54+
4855
/* Begin PBXCopyFilesBuildPhase section */
4956
C3C24430195764660021FCD4 /* Copy Files */ = {
5057
isa = PBXCopyFilesBuildPhase;
5158
buildActionMask = 2147483647;
5259
dstPath = "";
5360
dstSubfolderSpec = 10;
5461
files = (
55-
C34045C31B1E220800139822 /* Cg.framework in Copy Files */,
5662
);
5763
name = "Copy Files";
5864
runOnlyForDeploymentPostprocessing = 0;
@@ -84,7 +90,7 @@
8490
/* End PBXCopyFilesBuildPhase section */
8591

8692
/* Begin PBXFileReference section */
87-
C34045BF1B1E21B500139822 /* Cg.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cg.framework; path = /Library/Frameworks/Cg.framework; sourceTree = "<absolute>"; };
93+
1695013E1F6EC5E5008FAF86 /* libprojectM.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = libprojectM.xcodeproj; path = ../libprojectM/libprojectM/libprojectM.xcodeproj; sourceTree = "<group>"; };
8894
C34E810E1956CD2F001AC5B5 /* libstdc++.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "libstdc++.dylib"; path = "usr/lib/libstdc++.dylib"; sourceTree = SDKROOT; };
8995
C34E81101956CD3A001AC5B5 /* libc++.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "libc++.dylib"; path = "usr/lib/libc++.dylib"; sourceTree = SDKROOT; };
9096
C34E81131956D096001AC5B5 /* libRenderer.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libRenderer.a; path = ../libprojectM/Renderer/libRenderer.a; sourceTree = SOURCE_ROOT; };
@@ -146,7 +152,6 @@
146152
isa = PBXFrameworksBuildPhase;
147153
buildActionMask = 2147483647;
148154
files = (
149-
C34045C11B1E21B500139822 /* Cg.framework in Frameworks */,
150155
C37EBD2C19A0112900220265 /* Cocoa.framework in Frameworks */,
151156
);
152157
runOnlyForDeploymentPostprocessing = 0;
@@ -159,7 +164,6 @@
159164
C37822041956D90D0058A694 /* libprojectM.a in Frameworks */,
160165
C34E81241956D0DA001AC5B5 /* libbz2.a in Frameworks */,
161166
C34E81221956D0D9001AC5B5 /* libfreetype.a in Frameworks */,
162-
C34045C01B1E21B500139822 /* Cg.framework in Frameworks */,
163167
C34E81201956D0D8001AC5B5 /* libftgl.a in Frameworks */,
164168
C34E811E1956D0D6001AC5B5 /* libpng15.a in Frameworks */,
165169
C34E811C1956D0D4001AC5B5 /* libz.a in Frameworks */,
@@ -174,6 +178,14 @@
174178
/* End PBXFrameworksBuildPhase section */
175179

176180
/* Begin PBXGroup section */
181+
1695013F1F6EC5E5008FAF86 /* Products */ = {
182+
isa = PBXGroup;
183+
children = (
184+
169501431F6EC5E6008FAF86 /* liblibprojectM.a */,
185+
);
186+
name = Products;
187+
sourceTree = "<group>";
188+
};
177189
C37EBD2D19A0112900220265 /* projectM Visualizer */ = {
178190
isa = PBXGroup;
179191
children = (
@@ -208,10 +220,10 @@
208220
C3F9D7A617B82CC3009E58CB = {
209221
isa = PBXGroup;
210222
children = (
223+
1695013E1F6EC5E5008FAF86 /* libprojectM.xcodeproj */,
211224
C38212791A5A2114002A8D78 /* gles_conv.txt */,
212225
C37EBD5E19A0164400220265 /* selectViz.png */,
213226
C37EBD5A19A0118600220265 /* iProjectM.pkg */,
214-
C34045BF1B1E21B500139822 /* Cg.framework */,
215227
C34E81191956D0C3001AC5B5 /* contrib */,
216228
C3FAF97A17B8A44100F4B110 /* share */,
217229
C3FAE5A417B88C5B00F4B110 /* libprojectM */,
@@ -354,7 +366,7 @@
354366
C3F9D7A717B82CC3009E58CB /* Project object */ = {
355367
isa = PBXProject;
356368
attributes = {
357-
LastUpgradeCheck = 0630;
369+
LastUpgradeCheck = 0830;
358370
ORGANIZATIONNAME = projectM;
359371
TargetAttributes = {
360372
C37EBD2A19A0112900220265 = {
@@ -378,6 +390,12 @@
378390
mainGroup = C3F9D7A617B82CC3009E58CB;
379391
productRefGroup = C3F9D7B017B82CC3009E58CB /* Products */;
380392
projectDirPath = "";
393+
projectReferences = (
394+
{
395+
ProductGroup = 1695013F1F6EC5E5008FAF86 /* Products */;
396+
ProjectRef = 1695013E1F6EC5E5008FAF86 /* libprojectM.xcodeproj */;
397+
},
398+
);
381399
projectRoot = "";
382400
targets = (
383401
C3F9D7AE17B82CC3009E58CB /* iProjectM */,
@@ -386,6 +404,16 @@
386404
};
387405
/* End PBXProject section */
388406

407+
/* Begin PBXReferenceProxy section */
408+
169501431F6EC5E6008FAF86 /* liblibprojectM.a */ = {
409+
isa = PBXReferenceProxy;
410+
fileType = archive.ar;
411+
path = liblibprojectM.a;
412+
remoteRef = 169501421F6EC5E6008FAF86 /* PBXContainerItemProxy */;
413+
sourceTree = BUILT_PRODUCTS_DIR;
414+
};
415+
/* End PBXReferenceProxy section */
416+
389417
/* Begin PBXResourcesBuildPhase section */
390418
C37EBD2919A0112900220265 /* Resources */ = {
391419
isa = PBXResourcesBuildPhase;
@@ -506,6 +534,7 @@
506534
INFOPLIST_FILE = "projectM Visualizer/projectM Visualizer-Info.plist";
507535
MACOSX_DEPLOYMENT_TARGET = 10.8;
508536
ONLY_ACTIVE_ARCH = YES;
537+
PRODUCT_BUNDLE_IDENTIFIER = biz.int80.iProjectM;
509538
PRODUCT_NAME = "projectM Visualizer";
510539
WRAPPER_EXTENSION = app;
511540
};
@@ -538,6 +567,7 @@
538567
GCC_WARN_UNUSED_FUNCTION = YES;
539568
INFOPLIST_FILE = "projectM Visualizer/projectM Visualizer-Info.plist";
540569
MACOSX_DEPLOYMENT_TARGET = 10.8;
570+
PRODUCT_BUNDLE_IDENTIFIER = biz.int80.iProjectM;
541571
PRODUCT_NAME = "projectM Visualizer";
542572
WRAPPER_EXTENSION = app;
543573
};
@@ -550,20 +580,27 @@
550580
CLANG_CXX_LANGUAGE_STANDARD = "compiler-default";
551581
CLANG_CXX_LIBRARY = "libc++";
552582
CLANG_ENABLE_MODULES = NO;
583+
CLANG_WARN_BOOL_CONVERSION = YES;
553584
CLANG_WARN_CONSTANT_CONVERSION = YES;
554585
CLANG_WARN_EMPTY_BODY = YES;
555586
CLANG_WARN_ENUM_CONVERSION = YES;
587+
CLANG_WARN_INFINITE_RECURSION = YES;
556588
CLANG_WARN_INT_CONVERSION = YES;
589+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
590+
CLANG_WARN_UNREACHABLE_CODE = YES;
557591
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
558592
CODE_SIGN_IDENTITY = "";
559593
COPY_PHASE_STRIP = NO;
560594
DEPLOYMENT_LOCATION = YES;
561595
DYLIB_CURRENT_VERSION = 1.0.0;
596+
ENABLE_STRICT_OBJC_MSGSEND = YES;
597+
ENABLE_TESTABILITY = YES;
562598
FRAMEWORK_SEARCH_PATHS = /Library/Frameworks;
563599
GCC_C_LANGUAGE_STANDARD = "compiler-default";
564600
GCC_DYNAMIC_NO_PIC = NO;
565601
GCC_ENABLE_OBJC_EXCEPTIONS = YES;
566602
GCC_INPUT_FILETYPE = automatic;
603+
GCC_NO_COMMON_BLOCKS = YES;
567604
GCC_OPTIMIZATION_LEVEL = s;
568605
GCC_PREPROCESSOR_DEFINITIONS = (
569606
"DEBUG=1",
@@ -572,7 +609,9 @@
572609
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
573610
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
574611
GCC_WARN_ABOUT_RETURN_TYPE = YES;
612+
GCC_WARN_UNDECLARED_SELECTOR = YES;
575613
GCC_WARN_UNINITIALIZED_AUTOS = YES;
614+
GCC_WARN_UNUSED_FUNCTION = YES;
576615
GCC_WARN_UNUSED_VARIABLE = YES;
577616
HEADER_SEARCH_PATHS = "${SRCROOT}/..";
578617
LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks/";
@@ -592,24 +631,32 @@
592631
CLANG_CXX_LANGUAGE_STANDARD = "compiler-default";
593632
CLANG_CXX_LIBRARY = "libc++";
594633
CLANG_ENABLE_MODULES = NO;
634+
CLANG_WARN_BOOL_CONVERSION = YES;
595635
CLANG_WARN_CONSTANT_CONVERSION = YES;
596636
CLANG_WARN_EMPTY_BODY = YES;
597637
CLANG_WARN_ENUM_CONVERSION = YES;
638+
CLANG_WARN_INFINITE_RECURSION = YES;
598639
CLANG_WARN_INT_CONVERSION = YES;
640+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
641+
CLANG_WARN_UNREACHABLE_CODE = YES;
599642
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
600643
CODE_SIGN_IDENTITY = "";
601644
COPY_PHASE_STRIP = YES;
602645
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
603646
DEPLOYMENT_LOCATION = YES;
604647
DYLIB_CURRENT_VERSION = 1.0.0;
648+
ENABLE_STRICT_OBJC_MSGSEND = YES;
605649
FRAMEWORK_SEARCH_PATHS = /Library/Frameworks;
606650
GCC_C_LANGUAGE_STANDARD = "compiler-default";
607651
GCC_ENABLE_OBJC_EXCEPTIONS = YES;
608652
GCC_INPUT_FILETYPE = automatic;
653+
GCC_NO_COMMON_BLOCKS = YES;
609654
GCC_OPTIMIZATION_LEVEL = s;
610655
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
611656
GCC_WARN_ABOUT_RETURN_TYPE = YES;
657+
GCC_WARN_UNDECLARED_SELECTOR = YES;
612658
GCC_WARN_UNINITIALIZED_AUTOS = YES;
659+
GCC_WARN_UNUSED_FUNCTION = YES;
613660
GCC_WARN_UNUSED_VARIABLE = YES;
614661
HEADER_SEARCH_PATHS = "${SRCROOT}/..";
615662
LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks/";
@@ -645,12 +692,9 @@
645692
"\"$(SRCROOT)/../NativePresets\"",
646693
"\"$(SRCROOT)/..\"",
647694
"\"$(SRCROOT)/macos/contrib\"",
648-
/Users/snooz/dev/projectm/src/libprojectM,
649-
/Users/snooz/dev/projectm/src/libprojectM/Renderer,
650-
/Users/snooz/dev/projectm/src/libprojectM/MilkdropPresetFactory,
651-
/Users/snooz/dev/projectm/src/libprojectM/NativePresetFactory,
652695
"$(PROJECT_DIR)/macos/contrib",
653696
);
697+
PRODUCT_BUNDLE_IDENTIFIER = "biz.int80.${PRODUCT_NAME:rfc1034identifier}";
654698
PRODUCT_NAME = iProjectM;
655699
WRAPPER_EXTENSION = bundle;
656700
};
@@ -679,12 +723,9 @@
679723
"\"$(SRCROOT)/../NativePresets\"",
680724
"\"$(SRCROOT)/..\"",
681725
"\"$(SRCROOT)/macos/contrib\"",
682-
/Users/snooz/dev/projectm/src/libprojectM,
683-
/Users/snooz/dev/projectm/src/libprojectM/Renderer,
684-
/Users/snooz/dev/projectm/src/libprojectM/MilkdropPresetFactory,
685-
/Users/snooz/dev/projectm/src/libprojectM/NativePresetFactory,
686726
"$(PROJECT_DIR)/macos/contrib",
687727
);
728+
PRODUCT_BUNDLE_IDENTIFIER = "biz.int80.${PRODUCT_NAME:rfc1034identifier}";
688729
PRODUCT_NAME = iProjectM;
689730
WRAPPER_EXTENSION = bundle;
690731
};

0 commit comments

Comments
 (0)