Connor Abbott : winegcc: Recognize .obj files as objects.

Alexandre Julliard julliard at winehq.org
Fri Jul 2 14:46:40 CDT 2021


Module: wine
Branch: master
Commit: f1ab3c8d763d47b84769af2872fb27e74922ef91
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=f1ab3c8d763d47b84769af2872fb27e74922ef91

Author: Connor Abbott <cwabbott0 at gmail.com>
Date:   Fri Jul  2 11:47:58 2021 +0200

winegcc: Recognize .obj files as objects.

For more compatibility with mingw-gcc. Since meson always names object
files with a .obj extension when using mingw, this improves
compatibility with meson.

Signed-off-by: Connor Abbott <cwabbott0 at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 tools/winegcc/utils.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/winegcc/utils.c b/tools/winegcc/utils.c
index 0b82af90683..63d675122c0 100644
--- a/tools/winegcc/utils.c
+++ b/tools/winegcc/utils.c
@@ -230,6 +230,7 @@ file_type get_file_type(const char* filename)
 
     if (cnt == sizeof(res_sig) && !memcmp(buf, res_sig, sizeof(res_sig))) return file_res;
     if (strendswith(filename, ".o")) return file_obj;
+    if (strendswith(filename, ".obj")) return file_obj;
     if (strendswith(filename, ".a")) return file_arh;
     if (strendswith(filename, ".res")) return file_res;
     if (strendswith(filename, ".so")) return file_so;




More information about the wine-cvs mailing list