From 9df7f011fcd9c2b103423cfeffbb818df10c9004 Mon Sep 17 00:00:00 2001 From: codereader Date: Wed, 28 Apr 2021 12:14:56 +0200 Subject: [PATCH] Add xcconfig file needed for Eigen --- README.md | 4 ++-- tools/xcode/DarkRadiant.xcodeproj/project.pbxproj | 2 ++ tools/xcode/base.xcconfig | 3 ++- tools/xcode/eigen3.xcconfig | 8 ++++++++ 4 files changed, 14 insertions(+), 3 deletions(-) create mode 100644 tools/xcode/eigen3.xcconfig diff --git a/README.md b/README.md index 6992e89853..9c29d542fd 100644 --- a/README.md +++ b/README.md @@ -61,7 +61,7 @@ To compile DarkRadiant, a number of libraries (with development headers) and a s * libalut-dev * libvorbis-dev * libgtest-dev -* libeigen-dev +* libeigen3-dev This does not include core development tools such as g++ or the git client to download the sources (use sudo apt-get install git for that). One possible set of packages might be: @@ -101,7 +101,7 @@ Install MacPorts, then open a fresh console and issue these commands: ``` sudo port install jpeg wxwidgets-3.0 pkgconfig libsigcxx2 freetype ftgl glew -sudo port install boost libxml2 freealut libvorbis libogg openal +sudo port install boost libxml2 freealut libvorbis libogg openal eigen3 ``` ## Build diff --git a/tools/xcode/DarkRadiant.xcodeproj/project.pbxproj b/tools/xcode/DarkRadiant.xcodeproj/project.pbxproj index 13ea7a0e87..8631fb0638 100644 --- a/tools/xcode/DarkRadiant.xcodeproj/project.pbxproj +++ b/tools/xcode/DarkRadiant.xcodeproj/project.pbxproj @@ -3183,6 +3183,7 @@ 3AE5C341263930D900643850 /* TextureMatrix.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = TextureMatrix.cpp; path = ../../radiantcore/shaders/TextureMatrix.cpp; sourceTree = SOURCE_ROOT; }; 3AE5C342263930D900643850 /* TextureMatrix.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TextureMatrix.h; path = ../../radiantcore/shaders/TextureMatrix.h; sourceTree = SOURCE_ROOT; }; 3AE5C343263930D900643850 /* VideoMapExpression.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VideoMapExpression.h; path = ../../radiantcore/shaders/VideoMapExpression.h; sourceTree = SOURCE_ROOT; }; + 3AE5C34C263967FF00643850 /* eigen3.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = eigen3.xcconfig; sourceTree = ""; }; 3AE6F12A1E8E9B72008A1B2D /* GridItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GridItem.h; path = ../../radiantcore/grid/GridItem.h; sourceTree = SOURCE_ROOT; }; 3AE6F12B1E8E9B72008A1B2D /* GridManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = GridManager.cpp; path = ../../radiantcore/grid/GridManager.cpp; sourceTree = SOURCE_ROOT; }; 3AE6F12C1E8E9B72008A1B2D /* GridManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GridManager.h; path = ../../radiantcore/grid/GridManager.h; sourceTree = SOURCE_ROOT; }; @@ -5253,6 +5254,7 @@ 3AFF06DA253BFF12002B1472 /* jpeg.xcconfig */, 3AFF06DB253BFF64002B1472 /* png.xcconfig */, 3AC88782253C1DB900E6CCCE /* picomodel.xcconfig */, + 3AE5C34C263967FF00643850 /* eigen3.xcconfig */, ); name = Configuration; sourceTree = ""; diff --git a/tools/xcode/base.xcconfig b/tools/xcode/base.xcconfig index b3e04c0dc2..7d8527f4ff 100644 --- a/tools/xcode/base.xcconfig +++ b/tools/xcode/base.xcconfig @@ -9,9 +9,10 @@ #include "libxml2.xcconfig" #include "boost.xcconfig" #include "wxwidgets.xcconfig" +#include "eigen3.xcconfig" DR_BASE_CPLUSPLUSFLAGS = $(BOOST_OTHER_CPLUSPLUSFLAGS) $(WXWIDGETS_OTHER_CPLUSPLUSFLAGS) "-DPOSIX" "-Wno-potentially-evaluated-expression" "-Wno-documentation" "-DFMT_HEADER_ONLY" "-DDR_MODULES_NEXT_TO_APP" -DR_BASE_HEADER_SEARCH_PATHS = $(LIBXML2_HEADER_SEARCH_PATHS) $(SIGCPP_HEADER_SEARCH_PATHS) $(BOOST_HEADER_SEARCH_PATHS) $(WXWIDGETS_HEADER_SEARCH_PATHS) "$(SRCROOT)/../../include" "$(SRCROOT)/../../libs" "$(SRCROOT)/../../libs/libfmt" +DR_BASE_HEADER_SEARCH_PATHS = $(LIBXML2_HEADER_SEARCH_PATHS) $(SIGCPP_HEADER_SEARCH_PATHS) $(BOOST_HEADER_SEARCH_PATHS) $(WXWIDGETS_HEADER_SEARCH_PATHS) $(EIGEN_HEADER_SEARCH_PATHS) "$(SRCROOT)/../../include" "$(SRCROOT)/../../libs" "$(SRCROOT)/../../libs/libfmt" DR_BASE_LIBRARY_SEARCH_PATHS = $(BOOST_LIBRARY_SEARCH_PATHS) $(LIBXML2_LIBRARY_SEARCH_PATHS) $(SIGCPP_LIBRARY_SEARCH_PATHS) $(WXWIDGETS_LIBRARY_SEARCH_PATHS) DR_BASE_LINKFLAGS = $(BOOST_LINKFLAGS) $(LIBXML2_LINKFLAGS) $(SIGCPP_LINKFLAGS) $(WXWIDGETS_LINKFLAGS) diff --git a/tools/xcode/eigen3.xcconfig b/tools/xcode/eigen3.xcconfig new file mode 100644 index 0000000000..c819916845 --- /dev/null +++ b/tools/xcode/eigen3.xcconfig @@ -0,0 +1,8 @@ +// +// eigen3.xcconfig +// DarkRadiant +// +// Created by greebo on 28/04/21. +// +// +EIGEN_HEADER_SEARCH_PATHS = "/opt/local/include/eigen3" \ No newline at end of file