mirror of
https://github.com/reactos/reactos.git
synced 2025-08-06 02:43:09 +00:00
Sync to Wine-0_9:
Robert Lunnon <bobl@optushome.com.au> - Remove SVR4 specific pseudo-ops. Alexandre Julliard <julliard@winehq.org> - Put Wine version information in all the man pages. - Fixed some nroff warnings. - Added global rules for man pages. Simon Richter <Simon.Richter@hogyros.de> - Fix winebuild's ppc assembly generation. svn path=/trunk/; revision=18791
This commit is contained in:
parent
b1f528f00f
commit
aca445f161
4 changed files with 9 additions and 19 deletions
|
@ -5,6 +5,7 @@ VPATH = @srcdir@
|
||||||
EXEEXT = @EXEEXT@
|
EXEEXT = @EXEEXT@
|
||||||
|
|
||||||
PROGRAMS = winebuild$(EXEEXT)
|
PROGRAMS = winebuild$(EXEEXT)
|
||||||
|
MANPAGES = winebuild.man
|
||||||
MODULE = none
|
MODULE = none
|
||||||
|
|
||||||
C_SRCS = \
|
C_SRCS = \
|
||||||
|
@ -18,17 +19,14 @@ C_SRCS = \
|
||||||
spec32.c \
|
spec32.c \
|
||||||
utils.c
|
utils.c
|
||||||
|
|
||||||
all: $(PROGRAMS) winebuild.man
|
all: $(PROGRAMS) $(MANPAGES)
|
||||||
|
|
||||||
@MAKE_RULES@
|
@MAKE_RULES@
|
||||||
|
|
||||||
winebuild$(EXEEXT): $(OBJS)
|
winebuild$(EXEEXT): $(OBJS)
|
||||||
$(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBPORT) $(LDFLAGS)
|
$(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBPORT) $(LDFLAGS)
|
||||||
|
|
||||||
winebuild.man: winebuild.man.in
|
install:: $(PROGRAMS) $(MANPAGES)
|
||||||
sed -e 's,@PACKAGE_STRING\@,@PACKAGE_STRING@,g' $(SRCDIR)/winebuild.man.in >$@ || ($(RM) $@ && false)
|
|
||||||
|
|
||||||
install:: $(PROGRAMS) winebuild.man
|
|
||||||
$(MKINSTALLDIRS) $(bindir) $(mandir)/man$(prog_manext)
|
$(MKINSTALLDIRS) $(bindir) $(mandir)/man$(prog_manext)
|
||||||
$(INSTALL_PROGRAM) winebuild$(EXEEXT) $(bindir)/winebuild$(EXEEXT)
|
$(INSTALL_PROGRAM) winebuild$(EXEEXT) $(bindir)/winebuild$(EXEEXT)
|
||||||
$(INSTALL_DATA) winebuild.man $(mandir)/man$(prog_manext)/winebuild.$(prog_manext)
|
$(INSTALL_DATA) winebuild.man $(mandir)/man$(prog_manext)/winebuild.$(prog_manext)
|
||||||
|
@ -36,7 +34,4 @@ install:: $(PROGRAMS) winebuild.man
|
||||||
uninstall::
|
uninstall::
|
||||||
$(RM) $(bindir)/winebuild$(EXEEXT) $(mandir)/man$(prog_manext)/winebuild.$(prog_manext)
|
$(RM) $(bindir)/winebuild$(EXEEXT) $(mandir)/man$(prog_manext)/winebuild.$(prog_manext)
|
||||||
|
|
||||||
clean::
|
|
||||||
$(RM) winebuild.man
|
|
||||||
|
|
||||||
### Dependencies:
|
### Dependencies:
|
||||||
|
|
|
@ -720,7 +720,7 @@ static void output_import_thunk( FILE *outfile, const char *name, const char *ta
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
fprintf( outfile, "\tlis %s, (%s+%d)@hi\n", ppc_reg(9), table, pos );
|
fprintf( outfile, "\tlis %s, (%s+%d)@h\n", ppc_reg(9), table, pos );
|
||||||
fprintf( outfile, "\tla %s, (%s+%d)@l(%s)\n", ppc_reg(8), table, pos, ppc_reg(9) );
|
fprintf( outfile, "\tla %s, (%s+%d)@l(%s)\n", ppc_reg(8), table, pos, ppc_reg(9) );
|
||||||
}
|
}
|
||||||
fprintf( outfile, "\tlwz %s, 0(%s)\n", ppc_reg(7), ppc_reg(8) );
|
fprintf( outfile, "\tlwz %s, 0(%s)\n", ppc_reg(7), ppc_reg(8) );
|
||||||
|
|
|
@ -515,9 +515,6 @@ const char *func_declaration( const char *func )
|
||||||
case PLATFORM_WINDOWS:
|
case PLATFORM_WINDOWS:
|
||||||
sprintf( buffer, ".def _%s; .scl 2; .type 32; .endef", func );
|
sprintf( buffer, ".def _%s; .scl 2; .type 32; .endef", func );
|
||||||
break;
|
break;
|
||||||
case PLATFORM_SVR4:
|
|
||||||
sprintf( buffer, ".type %s,2", func );
|
|
||||||
break;
|
|
||||||
default:
|
default:
|
||||||
sprintf( buffer, ".type %s,@function", func );
|
sprintf( buffer, ".type %s,@function", func );
|
||||||
break;
|
break;
|
||||||
|
@ -574,7 +571,6 @@ const char *get_asm_string_keyword(void)
|
||||||
switch (target_platform)
|
switch (target_platform)
|
||||||
{
|
{
|
||||||
case PLATFORM_APPLE:
|
case PLATFORM_APPLE:
|
||||||
case PLATFORM_SVR4:
|
|
||||||
return ".asciz";
|
return ".asciz";
|
||||||
default:
|
default:
|
||||||
return ".string";
|
return ".string";
|
||||||
|
@ -585,7 +581,6 @@ const char *get_asm_short_keyword(void)
|
||||||
{
|
{
|
||||||
switch (target_platform)
|
switch (target_platform)
|
||||||
{
|
{
|
||||||
case PLATFORM_SVR4: return ".half";
|
|
||||||
default: return ".short";
|
default: return ".short";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
.\" -*- nroff -*-
|
.\" -*- nroff -*-
|
||||||
.TH WINEBUILD 1 "September 2005" "@PACKAGE_STRING@" "Wine dll builder"
|
.TH WINEBUILD 1 "October 2005" "@PACKAGE_STRING@" "Wine Developers Manual"
|
||||||
.SH NAME
|
.SH NAME
|
||||||
winebuild \- Wine dll builder
|
winebuild \- Wine dll builder
|
||||||
.SH SYNOPSIS
|
.SH SYNOPSIS
|
||||||
|
@ -20,10 +20,10 @@ what you want winebuild to generate.
|
||||||
.TP
|
.TP
|
||||||
.BI \--dll
|
.BI \--dll
|
||||||
Build an assembly file from a .spec file (see \fBSPEC FILE SYNTAX\fR
|
Build an assembly file from a .spec file (see \fBSPEC FILE SYNTAX\fR
|
||||||
for details), or from a standard Windows .def file. The
|
for details), or from a standard Windows .def file. The .spec/.def
|
||||||
.spec/.def file is specified via the -E option. The resulting file
|
file is specified via the -E option. The resulting file must be
|
||||||
must be assembled and linked to the other object files to build a
|
assembled and linked to the other object files to build a working Wine
|
||||||
working Wine dll. In this mode, the
|
dll. In this mode, the
|
||||||
.I input files
|
.I input files
|
||||||
should be the list of all object files that will be linked into the
|
should be the list of all object files that will be linked into the
|
||||||
final dll, to allow
|
final dll, to allow
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue