From 040908c3a169c39fb171b9daba36d136a6f5044e Mon Sep 17 00:00:00 2001 From: Ivan Gagis Date: Tue, 26 Nov 2024 13:45:16 +0200 Subject: [PATCH] fix include path --- android/agg/CMakeLists.txt | 2 +- android/agg/build.gradle | 4 +-- conan/conanfile.py | 2 +- msvs_solution/libagg/libagg.vcxproj | 48 ++++++++++++------------- xcode/agg/agg.xcodeproj/project.pbxproj | 4 +-- 5 files changed, 29 insertions(+), 31 deletions(-) diff --git a/android/agg/CMakeLists.txt b/android/agg/CMakeLists.txt index 8c4c150..bd06edb 100644 --- a/android/agg/CMakeLists.txt +++ b/android/agg/CMakeLists.txt @@ -3,7 +3,7 @@ set(name agg) file(GLOB srcs "../../src/agg/src/*.cpp") include (${ANDROID_GRADLE_NATIVE_BUNDLE_PLUGIN_MK}) -include_directories(../../src/agg/include) +include_directories(../../src/agg/include/agg) add_library( ${name} diff --git a/android/agg/build.gradle b/android/agg/build.gradle index 670a66e..00f12eb 100644 --- a/android/agg/build.gradle +++ b/android/agg/build.gradle @@ -22,9 +22,7 @@ android { } nativeBundleExport { - // TODO: change headerDir to ../../code/include and add dest subdir 'agg' when this functionality is added to native android plugin. - // Delete the ../../inlcude directory from the repo. - headerDir = "${project.projectDir}/../../include/" + headerDir = "${project.projectDir}/../../src/agg/include/" bundleStatic = true includeHeaderFilter.add("**/*.h") excludeHeaderFilter.add("agg/ctrl/**/*.h") diff --git a/conan/conanfile.py b/conan/conanfile.py index 4ec83f3..168c170 100644 --- a/conan/conanfile.py +++ b/conan/conanfile.py @@ -51,7 +51,7 @@ def build(self): self.run("make lint=off test") def package(self): - src_dir = os.path.join(self.build_folder, "src/agg/include") + src_dir = os.path.join(self.build_folder, "src/agg/include/agg") src_rel_dir = os.path.join(self.build_folder, "src/build") dst_include_dir = os.path.join(self.package_folder, "include/agg") dst_lib_dir = os.path.join(self.package_folder, "lib") diff --git a/msvs_solution/libagg/libagg.vcxproj b/msvs_solution/libagg/libagg.vcxproj index f696e4f..7c84c15 100644 --- a/msvs_solution/libagg/libagg.vcxproj +++ b/msvs_solution/libagg/libagg.vcxproj @@ -447,7 +447,7 @@ WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true OldStyle - ..\..\src\agg\include;%(AdditionalIncludeDirectories) + ..\..\src\agg\include\agg;%(AdditionalIncludeDirectories) 4996;%(DisableSpecificWarnings) @@ -465,7 +465,7 @@ WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true OldStyle - ..\..\src\agg\include;%(AdditionalIncludeDirectories) + ..\..\src\agg\include\agg;%(AdditionalIncludeDirectories) 4996;%(DisableSpecificWarnings) @@ -483,7 +483,7 @@ WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true OldStyle - ..\..\src\agg\include;%(AdditionalIncludeDirectories) + ..\..\src\agg\include\agg;%(AdditionalIncludeDirectories) 4996;%(DisableSpecificWarnings) @@ -501,7 +501,7 @@ WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true OldStyle - ..\..\src\agg\include;%(AdditionalIncludeDirectories) + ..\..\src\agg\include\agg;%(AdditionalIncludeDirectories) 4996;%(DisableSpecificWarnings) false @@ -521,7 +521,7 @@ true OldStyle MultiThreadedDebug - ..\..\src\agg\include;%(AdditionalIncludeDirectories) + ..\..\src\agg\include\agg;%(AdditionalIncludeDirectories) 4996;%(DisableSpecificWarnings) @@ -540,7 +540,7 @@ true OldStyle MultiThreadedDebug - ..\..\src\agg\include;%(AdditionalIncludeDirectories) + ..\..\src\agg\include\agg;%(AdditionalIncludeDirectories) 4996;%(DisableSpecificWarnings) @@ -560,7 +560,7 @@ WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true OldStyle - ..\..\src\agg\include;%(AdditionalIncludeDirectories) + ..\..\src\agg\include\agg;%(AdditionalIncludeDirectories) 4996;%(DisableSpecificWarnings) false @@ -583,7 +583,7 @@ WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true OldStyle - ..\..\src\agg\include;%(AdditionalIncludeDirectories) + ..\..\src\agg\include\agg;%(AdditionalIncludeDirectories) 4996;%(DisableSpecificWarnings) false @@ -606,7 +606,7 @@ WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true OldStyle - ..\..\src\agg\include;%(AdditionalIncludeDirectories) + ..\..\src\agg\include\agg;%(AdditionalIncludeDirectories) 4996;%(DisableSpecificWarnings) false @@ -629,7 +629,7 @@ WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true OldStyle - ..\..\src\agg\include;%(AdditionalIncludeDirectories) + ..\..\src\agg\include\agg;%(AdditionalIncludeDirectories) 4996;%(DisableSpecificWarnings) false @@ -653,7 +653,7 @@ true OldStyle MultiThreaded - ..\..\src\agg\include;%(AdditionalIncludeDirectories) + ..\..\src\agg\include\agg;%(AdditionalIncludeDirectories) 4996;%(DisableSpecificWarnings) false @@ -677,7 +677,7 @@ true OldStyle MultiThreaded - ..\..\src\agg\include;%(AdditionalIncludeDirectories) + ..\..\src\agg\include\agg;%(AdditionalIncludeDirectories) 4996;%(DisableSpecificWarnings) false @@ -698,7 +698,7 @@ _DEBUG;_CONSOLE;%(PreprocessorDefinitions) true OldStyle - ..\..\src\agg\include;%(AdditionalIncludeDirectories) + ..\..\src\agg\include\agg;%(AdditionalIncludeDirectories) 4996;%(DisableSpecificWarnings) @@ -716,7 +716,7 @@ _DEBUG;_CONSOLE;%(PreprocessorDefinitions) true OldStyle - ..\..\src\agg\include;%(AdditionalIncludeDirectories) + ..\..\src\agg\include\agg;%(AdditionalIncludeDirectories) 4996;%(DisableSpecificWarnings) @@ -734,7 +734,7 @@ _DEBUG;_CONSOLE;%(PreprocessorDefinitions) true OldStyle - ..\..\src\agg\include;%(AdditionalIncludeDirectories) + ..\..\src\agg\include\agg;%(AdditionalIncludeDirectories) 4996;%(DisableSpecificWarnings) @@ -752,7 +752,7 @@ _DEBUG;_CONSOLE;%(PreprocessorDefinitions) true OldStyle - ..\..\src\agg\include;%(AdditionalIncludeDirectories) + ..\..\src\agg\include\agg;%(AdditionalIncludeDirectories) 4996;%(DisableSpecificWarnings) false @@ -772,7 +772,7 @@ true OldStyle MultiThreadedDebug - ..\..\src\agg\include;%(AdditionalIncludeDirectories) + ..\..\src\agg\include\agg;%(AdditionalIncludeDirectories) 4996;%(DisableSpecificWarnings) @@ -791,7 +791,7 @@ true OldStyle MultiThreadedDebug - ..\..\src\agg\include;%(AdditionalIncludeDirectories) + ..\..\src\agg\include\agg;%(AdditionalIncludeDirectories) 4996;%(DisableSpecificWarnings) @@ -811,7 +811,7 @@ NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true OldStyle - ..\..\src\agg\include;%(AdditionalIncludeDirectories) + ..\..\src\agg\include\agg;%(AdditionalIncludeDirectories) 4996;%(DisableSpecificWarnings) false @@ -834,7 +834,7 @@ NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true OldStyle - ..\..\src\agg\include;%(AdditionalIncludeDirectories) + ..\..\src\agg\include\agg;%(AdditionalIncludeDirectories) 4996;%(DisableSpecificWarnings) false @@ -857,7 +857,7 @@ NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true OldStyle - ..\..\src\agg\include;%(AdditionalIncludeDirectories) + ..\..\src\agg\include\agg;%(AdditionalIncludeDirectories) 4996;%(DisableSpecificWarnings) false @@ -880,7 +880,7 @@ NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true OldStyle - ..\..\src\agg\include;%(AdditionalIncludeDirectories) + ..\..\src\agg\include\agg;%(AdditionalIncludeDirectories) 4996;%(DisableSpecificWarnings) false @@ -904,7 +904,7 @@ true OldStyle MultiThreaded - ..\..\src\agg\include;%(AdditionalIncludeDirectories) + ..\..\src\agg\include\agg;%(AdditionalIncludeDirectories) 4996;%(DisableSpecificWarnings) false @@ -928,7 +928,7 @@ true OldStyle MultiThreaded - ..\..\src\agg\include;%(AdditionalIncludeDirectories) + ..\..\src\agg\include\agg;%(AdditionalIncludeDirectories) 4996;%(DisableSpecificWarnings) false diff --git a/xcode/agg/agg.xcodeproj/project.pbxproj b/xcode/agg/agg.xcodeproj/project.pbxproj index 95c2963..83ddd90 100644 --- a/xcode/agg/agg.xcodeproj/project.pbxproj +++ b/xcode/agg/agg.xcodeproj/project.pbxproj @@ -255,7 +255,7 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - HEADER_SEARCH_PATHS = ../../src/agg/include; + HEADER_SEARCH_PATHS = ../../src/agg/include/agg; INFOPLIST_FILE = agg/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 9.0; @@ -282,7 +282,7 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - HEADER_SEARCH_PATHS = ../../src/agg/include; + HEADER_SEARCH_PATHS = ../../src/agg/include/agg; INFOPLIST_FILE = agg/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 9.0;