Skip to content
Snippets Groups Projects
Commit 55776370 authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files

Added support for specifying an stdcall dll entry point.

parent b88d3407
No related merge requests found
......@@ -42,7 +42,7 @@ $(MODULE).glue.c: $(C_SRCS) $(C_SRCS16) $(WINEBUILD)
# Rules for .dll files
$(MODULE): $(RCOBJS) $(OBJS) $(MODULE).dbg.o $(SPEC_DEF) $(IMPORTLIBS) Makefile.in
$(DLLWRAP) -k --def $(SPEC_DEF) -o $@ $(RCOBJS) $(OBJS) $(MODULE).dbg.o $(DLLMAIN:%=--entry %) -L$(DLLDIR) $(DELAYIMPORTS:%=-l%) $(IMPORTS:%=-l%) $(ALL_LIBS)
$(DLLWRAP) -k --def $(SPEC_DEF) -o $@ $(RCOBJS) $(OBJS) $(MODULE).dbg.o $(DLLMAIN:%=--entry _%) -L$(DLLDIR) $(DELAYIMPORTS:%=-l%) $(IMPORTS:%=-l%) $(ALL_LIBS)
$(SPEC_DEF): $(WINEBUILD)
......
......@@ -4,10 +4,10 @@ TOPOBJDIR = ../..
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = user32.dll
IMPORTS = gdi32 advapi32 kernel32
IMPORTS = gdi32 advapi32 kernel32 ntdll
ALTNAMES = user.exe keyboard.dll ddeml.dll display.dll mouse.dll
EXTRALIBS = $(LIBUNICODE)
DLLMAIN = UserClientDllInitialize
DLLMAIN = UserClientDllInitialize@12
LDDLLFLAGS = @LDDLLFLAGS@
SYMBOLFILE = $(MODULE).tmp.o
......
......@@ -212,7 +212,7 @@ static void set_exec_mode( enum exec_mode_values mode )
/* parse options from the argv array and remove all the recognized ones */
static char **parse_options( int argc, char **argv )
{
const char *p;
char *p;
int optc;
while ((optc = getopt_long( argc, argv, short_options, long_options, NULL )) != -1)
......@@ -257,6 +257,7 @@ static char **parse_options( int argc, char **argv )
break;
case 'e':
init_func = xstrdup( optarg );
if ((p = strchr( init_func, '@' ))) *p = 0; /* kill stdcall decoration */
break;
case 'f':
if (!strcmp( optarg, "PIC") || !strcmp( optarg, "pic")) UsePIC = 1;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment