Commit cfcf5ca2 authored by Alexandre Julliard's avatar Alexandre Julliard

makedep: Make the spec file optional for testdll resources.

parent 9ac4f151
...@@ -12,11 +12,8 @@ SOURCES = \ ...@@ -12,11 +12,8 @@ SOURCES = \
device8.c \ device8.c \
dinput.c \ dinput.c \
driver_bus.c \ driver_bus.c \
driver_bus.spec \
driver_hid.c \ driver_hid.c \
driver_hid.spec \
driver_hid_poll.c \ driver_hid_poll.c \
driver_hid_poll.spec \
force_feedback.c \ force_feedback.c \
hid.c \ hid.c \
hotplug.c \ hotplug.c \
......
...@@ -14,13 +14,8 @@ driver_pnp_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native ...@@ -14,13 +14,8 @@ driver_pnp_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native
SOURCES = \ SOURCES = \
driver.c \ driver.c \
driver.spec \
driver2.c \ driver2.c \
driver2.spec \
driver3.c \ driver3.c \
driver3.spec \
driver_netio.c \ driver_netio.c \
driver_netio.spec \
driver_pnp.c \ driver_pnp.c \
driver_pnp.spec \
ntoskrnl.c ntoskrnl.c
...@@ -3077,7 +3077,7 @@ static void output_source_testdll( struct makefile *make, struct incl_file *sour ...@@ -3077,7 +3077,7 @@ static void output_source_testdll( struct makefile *make, struct incl_file *sour
struct strarray dll_flags = empty_strarray; struct strarray dll_flags = empty_strarray;
struct strarray default_imports = empty_strarray; struct strarray default_imports = empty_strarray;
struct strarray all_libs, dep_libs; struct strarray all_libs, dep_libs;
const char *dll_name, *obj_name, *res_name, *output_rsrc, *output_file, *debug_file, *ext; const char *dll_name, *obj_name, *res_name, *output_rsrc, *output_file, *debug_file, *ext = ".dll";
struct incl_file *spec_file = find_src_file( make, strmake( "%.spec", obj )); struct incl_file *spec_file = find_src_file( make, strmake( "%.spec", obj ));
unsigned int arch; unsigned int arch;
...@@ -3085,10 +3085,7 @@ static void output_source_testdll( struct makefile *make, struct incl_file *sour ...@@ -3085,10 +3085,7 @@ static void output_source_testdll( struct makefile *make, struct incl_file *sour
strarray_addall( &dll_flags, make->extradllflags ); strarray_addall( &dll_flags, make->extradllflags );
strarray_addall( &dll_flags, get_expanded_file_local_var( make, obj, "EXTRADLLFLAGS" )); strarray_addall( &dll_flags, get_expanded_file_local_var( make, obj, "EXTRADLLFLAGS" ));
if (!strarray_exists( &dll_flags, "-nodefaultlibs" )) default_imports = get_default_imports( make, imports ); if (!strarray_exists( &dll_flags, "-nodefaultlibs" )) default_imports = get_default_imports( make, imports );
if (strarray_exists( &dll_flags, "-mconsole" )) ext = ".exe"; if (strarray_exists( &dll_flags, "-mconsole" )) ext = ".exe";
else if (!spec_file) fatal_error( "testdll source %s needs a .spec file\n", source->name );
else ext = ".dll";
for (arch = 0; arch < archs.count; arch++) for (arch = 0; arch < archs.count; arch++)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment