darlinghq/darling
1
0
Fork 0
mirror of https://github.com/darlinghq/darling.git synced 2024-11-27 06:10:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add libiconv submodule. Fix Paths.

Browse Source
This commit is contained in:
Thomas A 2023-02-02 20:58:05 -08:00
parent 24243d1c82
commit b67319901c
7 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@ -420,3 +420,6 @@
[submodule "src/external/libedit"]
path = src/external/libedit
url = ../darling-libedit.git
[submodule "src/external/libiconv"]
path = src/external/libiconv
url = ../darling-libiconv.git

2
Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/iconv.h
View File

@ -1 +1 @@
../../../../../../../../src/libiconv/libiconv/include/iconv.h
../../../../../../../../src/external/libiconv/darling/include/iconv.h

2
Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/libcharset.h
View File

@ -1 +1 @@
../../../../../../../../src/libiconv/libiconv/libcharset/include/libcharset.h
../../../../../../../../src/external/libiconv/darling/include/libcharset.h

2
Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/localcharset.h
View File

@ -1 +1 @@
../../../../../../../../src/libiconv/libiconv/libcharset/include/localcharset.h
../../../../../../../../src/external/libiconv/darling/include/localcharset.h

2
cmake/use_ld64.cmake
View File

@ -50,7 +50,7 @@ FUNCTION(use_ld64 target)
-Wl,-dylib_file,/System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation:${CMAKE_BINARY_DIR}/src/external/corefoundation/CoreFoundation \
-Wl,-dylib_file,/System/Library/Frameworks/Ruby.framework/Versions/2.0/Ruby:${CMAKE_BINARY_DIR}/src/external/ruby/Ruby \
-Wl,-dylib_file,/usr/lib/libiconv.2.dylib:${CMAKE_BINARY_DIR}/src/libiconv/libiconv.2.dylib \
-Wl,-dylib_file,/usr/lib/libcharset.1.dylib:${CMAKE_BINARY_DIR}/src/libiconv/libcharset.1.dylib \
-Wl,-dylib_file,/usr/lib/libcharset.1.dylib:${CMAKE_BINARY_DIR}/src/external/libiconv/libcharset.1.dylib \
-Wl,-dylib_file,/System/Library/Frameworks/CFNetwork.framework/Versions/A/CFNetwork:${CMAKE_BINARY_DIR}/src/external/cfnetwork/src/CFNetwork \
-Wl,-dylib_file,/usr/lib/libxml2.2.dylib:${CMAKE_BINARY_DIR}/src/external/libxml2/libxml2.2.dylib \
-Wl,-dylib_file,/usr/lib/libpam.2.dylib:${CMAKE_BINARY_DIR}/src/external/openpam/libpam.2.dylib \

2
src/CMakeLists.txt
View File

@ -153,7 +153,7 @@ add_subdirectory(launchd)
add_subdirectory(external/keymgr)
add_subdirectory(libcache)
add_subdirectory(ncurses)
add_subdirectory(libiconv)
add_subdirectory(external/libiconv)
add_subdirectory(duct/src)
add_subdirectory(libresolv)
add_subdirectory(external/corecrypto)

1
src/external/libiconv vendored Submodule

@ -0,0 +1 @@
Subproject commit 89418e5e593899b7680796f46fcb04ed67c23921