ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Renamed --exe-mode option to --mode now that it can be used for dlls 

too.
This commit is contained in:
Alexandre Julliard 2004-02-16 22:24:24 +00:00
parent d04f253aa9
commit 095b498b17
5 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/Maketest.rules.in
View File

@ -36,7 +36,7 @@ all: $(TESTPROGRAM)
# Rule for main module spec file # Rule for main module spec file
$(MODULE).spec.c: $(RC_SRCS:.rc=.res) $(OBJS) $(IMPORTLIBS) $(WINEBUILD) $(MODULE).spec.c: $(RC_SRCS:.rc=.res) $(OBJS) $(IMPORTLIBS) $(WINEBUILD)
$(WINEBUILD) $(DEFS) $(DLLFLAGS) -o $@ --exe $(MODULE) --exe-mode cui $(RC_SRCS:.rc=.res) $(OBJS) -L$(DLLDIR) $(IMPORTS:%=-l%) $(WINEBUILD) $(DEFS) $(DLLFLAGS) -o $@ --exe $(MODULE) --mode cui $(RC_SRCS:.rc=.res) $(OBJS) -L$(DLLDIR) $(IMPORTS:%=-l%)
# Rules for .so main module # Rules for .so main module

2
programs/Makeprog.rules.in
View File

@ -24,7 +24,7 @@ all: $(MODULE)$(DLLEXT) $(BASEMODULE)$(EXEEXT)
# Rule for main module spec file # Rule for main module spec file
$(MODULE).spec.c: $(RC_SRCS:.rc=.res) $(ALL_OBJS) $(WINEBUILD) $(MODULE).spec.c: $(RC_SRCS:.rc=.res) $(ALL_OBJS) $(WINEBUILD)
$(WINEBUILD) $(DEFS) $(DLLFLAGS) -o $@ --exe $(MODULE) $(APPMODE:%=--exe-mode %) $(RC_SRCS:.rc=.res) $(ALL_OBJS) -L$(DLLDIR) $(DELAYIMPORTS:%=-d%) $(IMPORTS:%=-l%) $(WINEBUILD) $(DEFS) $(DLLFLAGS) -o $@ --exe $(MODULE) $(APPMODE:%=--mode %) $(RC_SRCS:.rc=.res) $(ALL_OBJS) -L$(DLLDIR) $(DELAYIMPORTS:%=-d%) $(IMPORTS:%=-l%)
# Rules for .so main module # Rules for .so main module

6
programs/avitools/Makefile.in
View File

@ -18,13 +18,13 @@ C_SRCS = \
all: $(PROGRAMS:%=%$(DLLEXT)) $(PROGRAMS:.exe=$(EXEEXT)) all: $(PROGRAMS:%=%$(DLLEXT)) $(PROGRAMS:.exe=$(EXEEXT))
aviinfo.exe.spec.c: aviinfo.o $(WINEBUILD) aviinfo.exe.spec.c: aviinfo.o $(WINEBUILD)
$(WINEBUILD) $(DEFS) $(DLLFLAGS) -o $@ --exe aviinfo.exe --exe-mode gui aviinfo.o -L$(DLLDIR) -lavifil32 -lkernel32 $(WINEBUILD) $(DEFS) $(DLLFLAGS) -o $@ --exe aviinfo.exe --mode gui aviinfo.o -L$(DLLDIR) -lavifil32 -lkernel32
aviplay.exe.spec.c: aviplay.o $(WINEBUILD) aviplay.exe.spec.c: aviplay.o $(WINEBUILD)
$(WINEBUILD) $(DEFS) $(DLLFLAGS) -o $@ --exe aviplay.exe --exe-mode gui aviplay.o -L$(DLLDIR) -lavifil32 -lddraw -lkernel32 $(WINEBUILD) $(DEFS) $(DLLFLAGS) -o $@ --exe aviplay.exe --mode gui aviplay.o -L$(DLLDIR) -lavifil32 -lddraw -lkernel32
icinfo.exe.spec.c: icinfo.o $(WINEBUILD) icinfo.exe.spec.c: icinfo.o $(WINEBUILD)
$(WINEBUILD) $(DEFS) $(DLLFLAGS) -o $@ --exe icinfo.exe --exe-mode gui icinfo.o -L$(DLLDIR) -lmsvfw32 -lkernel32 $(WINEBUILD) $(DEFS) $(DLLFLAGS) -o $@ --exe icinfo.exe --mode gui icinfo.o -L$(DLLDIR) -lmsvfw32 -lkernel32
aviinfo.exe.so: aviinfo.o aviinfo.exe.spec.o aviinfo.exe.so: aviinfo.o aviinfo.exe.spec.o
$(LDDLL) -o $@ aviinfo.o aviinfo.exe.spec.o $(ALL_LIBS) -lc $(LDDLL) -o $@ aviinfo.o aviinfo.exe.spec.o $(ALL_LIBS) -lc

5
tools/winebuild/main.c
View File

@ -118,7 +118,7 @@ static const char usage_str[] =
" -K FLAGS Compiler flags (only -KPIC is supported)\n" " -K FLAGS Compiler flags (only -KPIC is supported)\n"
" -l --library=LIB Import the specified library\n" " -l --library=LIB Import the specified library\n"
" -L --library-path=DIR Look for imports libraries in DIR\n" " -L --library-path=DIR Look for imports libraries in DIR\n"
" -m --exe-mode=MODE Set the executable mode (cui|gui|cuiw|guiw)\n" " -m --mode=MODE Set the binary mode (cui|gui|cuiw|guiw|native)\n"
" -M --main-module=MODULE Set the name of the main module for a Win16 dll\n" " -M --main-module=MODULE Set the name of the main module for a Win16 dll\n"
" -N --dll-name=DLLNAME Set the DLL name (default: from input file name)\n" " -N --dll-name=DLLNAME Set the DLL name (default: from input file name)\n"
" -o --output=NAME Set the output file name (default: stdout)\n" " -o --output=NAME Set the output file name (default: stdout)\n"
@ -167,7 +167,8 @@ static const struct option long_options[] =
{ "kill-at", 0, 0, 'k' }, { "kill-at", 0, 0, 'k' },
{ "library", 1, 0, 'l' }, { "library", 1, 0, 'l' },
{ "library-path", 1, 0, 'L' }, { "library-path", 1, 0, 'L' },
{ "exe-mode", 1, 0, 'm' }, { "mode", 1, 0, 'm' },
{ "exe-mode", 1, 0, 'm' }, /* for backwards compatibility */
{ "main-module", 1, 0, 'M' }, { "main-module", 1, 0, 'M' },
{ "dll-name", 1, 0, 'N' }, { "dll-name", 1, 0, 'N' },
{ "output", 1, 0, 'o' }, { "output", 1, 0, 'o' },

6
tools/winebuild/winebuild.man.in
View File

@ -132,8 +132,8 @@ Specify that we are building a 16-bit dll, that will ultimately be
linked together with the 32-bit dll specified in \fImodule\fR. Only linked together with the 32-bit dll specified in \fImodule\fR. Only
meaningful in \fB--spec\fR mode. meaningful in \fB--spec\fR mode.
.TP .TP
.BI \-m,\ --exe-mode= mode .BI \-m,\ --mode= mode
Set the executable mode, which can be one of the following: Set the executable or dll mode, which can be one of the following:
.br .br
.B cui .B cui
for a command line ASCII executable, for a command line ASCII executable,
@ -154,8 +154,6 @@ A command line executable entry point is a normal C \fBmain\fR
function. A graphical executable has a \fBWinMain\fR entry point function. A graphical executable has a \fBWinMain\fR entry point
instead. The ASCII/Unicode distinction applies to the strings that are instead. The ASCII/Unicode distinction applies to the strings that are
passed to the entry point. passed to the entry point.
.br
This option is only meaningful in \fB--exe\fR mode.
.TP .TP
.BI \-N,\ --dll-name= dllname .BI \-N,\ --dll-name= dllname
Set the internal name of the module. It is only used in Win16 Set the internal name of the module. It is only used in Win16