diff options
| author | Colin Davidson <colrdavidson@gmail.com> | 2025-07-07 14:34:05 -0700 |
|---|---|---|
| committer | Colin Davidson <colrdavidson@gmail.com> | 2025-07-07 14:34:05 -0700 |
| commit | 389439ccb9e60014fa9d7dd26220da8b7b68f763 (patch) | |
| tree | 5f2afed73a1baa177a3edd4de23aaedaa7efaff5 /src/linker.cpp | |
| parent | 04481e0fd289f854e35a84da909184140940bbf7 (diff) | |
| parent | 86d576f7cc1ceeb7472c18e08e3c74214f26ddc6 (diff) | |
Merge branch 'master' into macharena
Diffstat (limited to 'src/linker.cpp')
| -rw-r--r-- | src/linker.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/linker.cpp b/src/linker.cpp index 2210c1306..bf2ba6fe0 100644 --- a/src/linker.cpp +++ b/src/linker.cpp @@ -277,6 +277,9 @@ try_cross_linking:; if (build_context.build_mode == BuildMode_DynamicLibrary) { link_settings = gb_string_append_fmt(link_settings, " /DLL"); + if (build_context.no_entry_point) { + link_settings = gb_string_append_fmt(link_settings, " /NOENTRY"); + } } else { link_settings = gb_string_append_fmt(link_settings, " /ENTRY:mainCRTStartup"); } @@ -701,12 +704,12 @@ try_cross_linking:; return result; } - object_files = gb_string_append_fmt(object_files, "\"%.*s\" ", LIT(android_glue_static_lib)); + object_files = gb_string_append_fmt(object_files, "\'%.*s\' ", LIT(android_glue_static_lib)); } for (String object_path : gen->output_object_paths) { - object_files = gb_string_append_fmt(object_files, "\"%.*s\" ", LIT(object_path)); + object_files = gb_string_append_fmt(object_files, "\'%.*s\' ", LIT(object_path)); } gbString link_settings = gb_string_make_reserve(heap_allocator(), 32); |