mirrors/Odin
1
0
Fork 0
mirror of https://github.com/odin-lang/Odin.git synced 2026-06-09 11:58:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change how foreign imports work for mac

Browse Source
This commit is contained in:
gingerBill
2019-09-29 09:25:33 +01:00
parent f4f6e9ad49
commit 218d1131e8
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main.cpp
View File

@@ -1242,12 +1242,18 @@ int main(int arg_count, char **arg_ptr) {
if (lib.len > 2 && lib[0] == '-' && lib[1] == 'f') {
// framework thingie
lib_str = gb_string_append_fmt(lib_str, " -framework %.*s ", (int)(lib.len) - 2, lib.text + 2);
} else if (string_ends_with(lib, str_lit(".framework"))) {
// framework thingie
String lib_name = lib;
lib_name = remove_extension_from_path(lib_name);
lib_str = gb_string_append_fmt(lib_str, " -framework %.*s ", LIT(lib_name));
} else if (string_ends_with(lib, str_lit(".a"))) {
// static libs, absolute full path relative to the file in which the lib was imported from
lib_str = gb_string_append_fmt(lib_str, " %.*s ", LIT(lib));
} else if (string_ends_with(lib, str_lit(".dylib"))) {
// dynamic lib, relative path to executable
lib_str = gb_string_append_fmt(lib_str, " -l:%s/%.*s ", cwd, LIT(lib));
// lib_str = gb_string_append_fmt(lib_str, " -l:%s/%.*s ", cwd, LIT(lib));
lib_str = gb_string_append_fmt(lib_str, " -l%.*s ", LIT(lib));
} else {
// dynamic or static system lib, just link regularly searching system library paths
lib_str = gb_string_append_fmt(lib_str, " -l%.*s ", LIT(lib));

1
src/unicode.cpp
View File

@@ -2,7 +2,6 @@
#pragma warning(disable: 4245)
extern "C" {
#include "utf8proc/utf8proc.h"
#include "utf8proc/utf8proc.c"
}
#pragma warning(pop)

1
src/utf8proc/utf8proc.c
View File

@@ -40,7 +40,6 @@
* Implementation of libutf8proc.
*/
#include "utf8proc.h"
#include "utf8proc_data.c"