Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-cw
Commits
ac171915
Commit
ac171915
authored
Nov 11, 2022
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
winebuild: Remove support for "hybrid" Unix libraries.
parent
f57c8d68
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
1 addition
and
18 deletions
+1
-18
build.h
tools/winebuild/build.h
+0
-1
import.c
tools/winebuild/import.c
+0
-10
main.c
tools/winebuild/main.c
+1
-3
spec32.c
tools/winebuild/spec32.c
+0
-1
winebuild.man.in
tools/winebuild/winebuild.man.in
+0
-3
No files found.
tools/winebuild/build.h
View file @
ac171915
...
@@ -360,7 +360,6 @@ extern int force_pointer_size;
...
@@ -360,7 +360,6 @@ extern int force_pointer_size;
extern
int
unwind_tables
;
extern
int
unwind_tables
;
extern
int
use_dlltool
;
extern
int
use_dlltool
;
extern
int
use_msvcrt
;
extern
int
use_msvcrt
;
extern
int
unix_lib
;
extern
int
safe_seh
;
extern
int
safe_seh
;
extern
int
prefer_native
;
extern
int
prefer_native
;
extern
int
data_only
;
extern
int
data_only
;
...
...
tools/winebuild/import.c
View file @
ac171915
...
@@ -497,8 +497,6 @@ static int has_stubs( const DLLSPEC *spec )
...
@@ -497,8 +497,6 @@ static int has_stubs( const DLLSPEC *spec )
{
{
int
i
;
int
i
;
if
(
unix_lib
)
return
0
;
for
(
i
=
0
;
i
<
spec
->
nb_entry_points
;
i
++
)
for
(
i
=
0
;
i
<
spec
->
nb_entry_points
;
i
++
)
{
{
ORDDEF
*
odp
=
&
spec
->
entry_points
[
i
];
ORDDEF
*
odp
=
&
spec
->
entry_points
[
i
];
...
@@ -543,8 +541,6 @@ static void check_undefined_forwards( DLLSPEC *spec )
...
@@ -543,8 +541,6 @@ static void check_undefined_forwards( DLLSPEC *spec )
char
*
link_name
,
*
api_name
,
*
dll_name
,
*
p
;
char
*
link_name
,
*
api_name
,
*
dll_name
,
*
p
;
int
i
;
int
i
;
if
(
unix_lib
)
return
;
for
(
i
=
0
;
i
<
spec
->
nb_entry_points
;
i
++
)
for
(
i
=
0
;
i
<
spec
->
nb_entry_points
;
i
++
)
{
{
ORDDEF
*
odp
=
&
spec
->
entry_points
[
i
];
ORDDEF
*
odp
=
&
spec
->
entry_points
[
i
];
...
@@ -575,8 +571,6 @@ static void check_undefined_exports( DLLSPEC *spec )
...
@@ -575,8 +571,6 @@ static void check_undefined_exports( DLLSPEC *spec )
{
{
int
i
;
int
i
;
if
(
unix_lib
)
return
;
for
(
i
=
0
;
i
<
spec
->
nb_entry_points
;
i
++
)
for
(
i
=
0
;
i
<
spec
->
nb_entry_points
;
i
++
)
{
{
ORDDEF
*
odp
=
&
spec
->
entry_points
[
i
];
ORDDEF
*
odp
=
&
spec
->
entry_points
[
i
];
...
@@ -616,8 +610,6 @@ static char *create_undef_symbols_file( DLLSPEC *spec )
...
@@ -616,8 +610,6 @@ static char *create_undef_symbols_file( DLLSPEC *spec )
int
i
;
int
i
;
unsigned
int
j
;
unsigned
int
j
;
if
(
unix_lib
)
return
NULL
;
as_file
=
open_temp_output_file
(
".s"
);
as_file
=
open_temp_output_file
(
".s"
);
output
(
"
\t
.data
\n
"
);
output
(
"
\t
.data
\n
"
);
...
@@ -1375,8 +1367,6 @@ void output_syscalls( DLLSPEC *spec )
...
@@ -1375,8 +1367,6 @@ void output_syscalls( DLLSPEC *spec )
int
i
,
count
;
int
i
,
count
;
ORDDEF
**
syscalls
=
NULL
;
ORDDEF
**
syscalls
=
NULL
;
if
(
unix_lib
)
return
;
for
(
i
=
count
=
0
;
i
<
spec
->
nb_entry_points
;
i
++
)
for
(
i
=
count
=
0
;
i
<
spec
->
nb_entry_points
;
i
++
)
{
{
ORDDEF
*
odp
=
&
spec
->
entry_points
[
i
];
ORDDEF
*
odp
=
&
spec
->
entry_points
[
i
];
...
...
tools/winebuild/main.c
View file @
ac171915
...
@@ -44,7 +44,6 @@ int force_pointer_size = 0;
...
@@ -44,7 +44,6 @@ int force_pointer_size = 0;
int
unwind_tables
=
0
;
int
unwind_tables
=
0
;
int
use_dlltool
=
1
;
int
use_dlltool
=
1
;
int
use_msvcrt
=
0
;
int
use_msvcrt
=
0
;
int
unix_lib
=
0
;
int
safe_seh
=
0
;
int
safe_seh
=
0
;
int
prefer_native
=
0
;
int
prefer_native
=
0
;
int
data_only
=
0
;
int
data_only
=
0
;
...
@@ -408,7 +407,6 @@ static void option_callback( int optc, char *optarg )
...
@@ -408,7 +407,6 @@ static void option_callback( int optc, char *optarg )
else
if
(
!
strcmp
(
optarg
,
"arm"
))
thumb_mode
=
0
;
else
if
(
!
strcmp
(
optarg
,
"arm"
))
thumb_mode
=
0
;
else
if
(
!
strcmp
(
optarg
,
"thumb"
))
thumb_mode
=
1
;
else
if
(
!
strcmp
(
optarg
,
"thumb"
))
thumb_mode
=
1
;
else
if
(
!
strcmp
(
optarg
,
"no-cygwin"
))
use_msvcrt
=
1
;
else
if
(
!
strcmp
(
optarg
,
"no-cygwin"
))
use_msvcrt
=
1
;
else
if
(
!
strcmp
(
optarg
,
"unix"
))
unix_lib
=
1
;
else
if
(
!
strcmp
(
optarg
,
"unicode"
))
main_spec
->
unicode_app
=
1
;
else
if
(
!
strcmp
(
optarg
,
"unicode"
))
main_spec
->
unicode_app
=
1
;
else
if
(
!
strncmp
(
optarg
,
"cpu="
,
4
))
cpu_option
=
xstrdup
(
optarg
+
4
);
else
if
(
!
strncmp
(
optarg
,
"cpu="
,
4
))
cpu_option
=
xstrdup
(
optarg
+
4
);
else
if
(
!
strncmp
(
optarg
,
"fpu="
,
4
))
fpu_option
=
xstrdup
(
optarg
+
4
);
else
if
(
!
strncmp
(
optarg
,
"fpu="
,
4
))
fpu_option
=
xstrdup
(
optarg
+
4
);
...
@@ -646,7 +644,7 @@ int main(int argc, char **argv)
...
@@ -646,7 +644,7 @@ int main(int argc, char **argv)
case
MODE_EXE
:
case
MODE_EXE
:
files
=
load_resources
(
files
,
spec
);
files
=
load_resources
(
files
,
spec
);
if
(
spec_file_name
&&
!
parse_input_file
(
spec
))
break
;
if
(
spec_file_name
&&
!
parse_input_file
(
spec
))
break
;
if
(
!
spec
->
init_func
&&
!
unix_lib
)
spec
->
init_func
=
xstrdup
(
get_default_entry_point
(
spec
));
if
(
!
spec
->
init_func
)
spec
->
init_func
=
xstrdup
(
get_default_entry_point
(
spec
));
if
(
fake_module
)
if
(
fake_module
)
{
{
...
...
tools/winebuild/spec32.c
View file @
ac171915
...
@@ -108,7 +108,6 @@ static int has_relays( DLLSPEC *spec )
...
@@ -108,7 +108,6 @@ static int has_relays( DLLSPEC *spec )
static
int
get_exports_count
(
DLLSPEC
*
spec
)
static
int
get_exports_count
(
DLLSPEC
*
spec
)
{
{
if
(
unix_lib
)
return
0
;
if
(
spec
->
base
>
spec
->
limit
)
return
0
;
if
(
spec
->
base
>
spec
->
limit
)
return
0
;
return
spec
->
limit
-
spec
->
base
+
1
;
return
spec
->
limit
-
spec
->
base
+
1
;
}
}
...
...
tools/winebuild/winebuild.man.in
View file @
ac171915
...
@@ -186,9 +186,6 @@ Set code generation options for the assembler.
...
@@ -186,9 +186,6 @@ Set code generation options for the assembler.
Build a library that uses the Windows runtime instead of the Unix C
Build a library that uses the Windows runtime instead of the Unix C
library.
library.
.TP
.TP
.B \-munix
Build the Unix counterpart of a builtin module.
.TP
.BI \-M,\ --main-module= module
.BI \-M,\ --main-module= module
When building a 16-bit dll, set the name of its 32-bit counterpart to
When building a 16-bit dll, set the name of its 32-bit counterpart to
\fImodule\fR. This is used to enforce that the load order for the
\fImodule\fR. This is used to enforce that the load order for the
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment