1
0
mirror of https://github.com/wine-mirror/wine synced 2024-07-08 20:06:18 +00:00

makefiles: Always use the global SOURCES variable for .m files.

This commit is contained in:
Alexandre Julliard 2023-10-12 10:55:01 +02:00
parent bf8cb196b5
commit 92fe7c9c9f
2 changed files with 13 additions and 17 deletions

View File

@ -14,8 +14,17 @@ UNIX_LIBS = \
-framework Security \ -framework Security \
$(METAL_LIBS) $(METAL_LIBS)
C_SRCS = \ SOURCES = \
clipboard.c \ clipboard.c \
cocoa_app.m \
cocoa_clipboard.m \
cocoa_cursorclipping.m \
cocoa_display.m \
cocoa_event.m \
cocoa_main.m \
cocoa_opengl.m \
cocoa_status_item.m \
cocoa_window.m \
display.c \ display.c \
dllmain.c \ dllmain.c \
dragdrop.c \ dragdrop.c \
@ -29,17 +38,5 @@ C_SRCS = \
surface.c \ surface.c \
systray.c \ systray.c \
vulkan.c \ vulkan.c \
window.c window.c \
winemac.rc
OBJC_SRCS = \
cocoa_app.m \
cocoa_clipboard.m \
cocoa_cursorclipping.m \
cocoa_display.m \
cocoa_event.m \
cocoa_main.m \
cocoa_opengl.m \
cocoa_status_item.m \
cocoa_window.m
RC_SRCS = winemac.rc

View File

@ -338,12 +338,11 @@ sub assign_sources_to_makefiles(@)
my $make = $makefiles{"$dir/Makefile.in"}; my $make = $makefiles{"$dir/Makefile.in"};
my $name = substr( $file, length($dir) + 1 ); my $name = substr( $file, length($dir) + 1 );
if ($name =~ /\.(mc|po)$/) if ($name =~ /\.(m|mc|po)$/)
{ {
push @{${$make}{"=SOURCES"}}, $name; push @{${$make}{"=SOURCES"}}, $name;
next; next;
} }
elsif ($name =~ /\.m$/) { push @{${$make}{"=OBJC_SRCS"}}, $name; }
elsif ($name =~ /\.l$/) { push @{${$make}{"=LEX_SRCS"}}, $name; } elsif ($name =~ /\.l$/) { push @{${$make}{"=LEX_SRCS"}}, $name; }
elsif ($name =~ /\.y$/) { push @{${$make}{"=BISON_SRCS"}}, $name; } elsif ($name =~ /\.y$/) { push @{${$make}{"=BISON_SRCS"}}, $name; }
elsif ($name =~ /\.svg$/) { push @{${$make}{"=SVG_SRCS"}}, $name; } elsif ($name =~ /\.svg$/) { push @{${$make}{"=SVG_SRCS"}}, $name; }