Skip to content

Commit f8d1684

Browse files
committed
xcode update for glm headers
1 parent c5533e3 commit f8d1684

File tree

3 files changed

+7
-10
lines changed

3 files changed

+7
-10
lines changed

Makefile.am

+1
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ build-mac: macOS/Build/Products/Debug/presets
4141

4242
# do a macOS build
4343
dist-mac: dist
44+
./autogen.sh
4445
make clean
4546
./configure --disable-sdlframework
4647
rm -rf dist

src/libprojectM/libprojectM.xcodeproj/project.pbxproj

+2
Original file line numberDiff line numberDiff line change
@@ -943,6 +943,7 @@
943943
"$(inherited)",
944944
/usr/local/include,
945945
"$(SRCROOT)/Renderer/hlslparser/src",
946+
"$(SRCROOT)/../../vendor",
946947
);
947948
LIBRARY_SEARCH_PATHS = /Library/Frameworks;
948949
MTL_ENABLE_DEBUG_INFO = YES;
@@ -1007,6 +1008,7 @@
10071008
"$(inherited)",
10081009
/usr/local/include,
10091010
"$(SRCROOT)/Renderer/hlslparser/src",
1011+
"$(SRCROOT)/../../vendor",
10101012
);
10111013
LIBRARY_SEARCH_PATHS = /Library/Frameworks;
10121014
MTL_ENABLE_DEBUG_INFO = NO;

src/projectM-sdl/SDLprojectM.xcodeproj/project.pbxproj

+4-10
Original file line numberDiff line numberDiff line change
@@ -602,6 +602,8 @@
602602
HEADER_SEARCH_PATHS = (
603603
"$(SRCROOT)/../libprojectM",
604604
/usr/local/include,
605+
"$(SRCROOT)/../../vendor",
606+
"$(SRCROOT)/../../mac",
605607
);
606608
LD_RUNPATH_SEARCH_PATHS = "@executable_path/ @loader_path/Frameworks/";
607609
LIBRARY_SEARCH_PATHS = "$(SRCROOT)/../projectM-iTunes/macos/contrib";
@@ -656,6 +658,8 @@
656658
HEADER_SEARCH_PATHS = (
657659
"$(SRCROOT)/../libprojectM",
658660
/usr/local/include,
661+
"$(SRCROOT)/../../vendor",
662+
"$(SRCROOT)/../../mac",
659663
);
660664
LD_RUNPATH_SEARCH_PATHS = "@executable_path/ @loader_path/Frameworks/";
661665
LIBRARY_SEARCH_PATHS = "$(SRCROOT)/../projectM-iTunes/macos/contrib";
@@ -676,11 +680,6 @@
676680
"$(PROJECT_DIR)",
677681
);
678682
GCC_LINK_WITH_DYNAMIC_LIBRARIES = YES;
679-
HEADER_SEARCH_PATHS = (
680-
"$(SRCROOT)/../libprojectM",
681-
/usr/local/include,
682-
"$(SRCROOT)/../../mac",
683-
);
684683
INFOPLIST_FILE = "$(SRCROOT)/projectM-SDL/Info.plist";
685684
LD_RUNPATH_SEARCH_PATHS = "@executable_path/ @loader_path/../Frameworks/ @loader_path/Frameworks/";
686685
LIBRARY_SEARCH_PATHS = (
@@ -706,11 +705,6 @@
706705
"$(PROJECT_DIR)",
707706
);
708707
GCC_LINK_WITH_DYNAMIC_LIBRARIES = YES;
709-
HEADER_SEARCH_PATHS = (
710-
"$(SRCROOT)/../libprojectM",
711-
/usr/local/include,
712-
"$(SRCROOT)/../../mac",
713-
);
714708
INFOPLIST_FILE = "$(SRCROOT)/projectM-SDL/Info.plist";
715709
LD_RUNPATH_SEARCH_PATHS = "@executable_path/ @loader_path/../Frameworks/ @loader_path/Frameworks/";
716710
LIBRARY_SEARCH_PATHS = (

0 commit comments

Comments
 (0)