marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

winegcc: Make mingw a separated platform from msvc. 

Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
feature/deterministic
Jacek Caban 2020-05-04 15:20:26 +02:00 committed by Alexandre Julliard
parent 78ce43f017
commit 2dee9b9874
3 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/winegcc/utils.c
View File

@ -273,7 +273,7 @@ static char* try_lib_path(const char* dir, const char* pre,
static file_type guess_lib_type(enum target_platform platform, const char* dir, static file_type guess_lib_type(enum target_platform platform, const char* dir,
const char* library, const char *suffix, char** file) const char* library, const char *suffix, char** file)
{ {
if (platform != PLATFORM_WINDOWS && platform != PLATFORM_CYGWIN) if (platform != PLATFORM_WINDOWS && platform != PLATFORM_MINGW && platform != PLATFORM_CYGWIN)
{ {
/* Unix shared object */ /* Unix shared object */
if ((*file = try_lib_path(dir, "lib", library, ".so", file_so))) if ((*file = try_lib_path(dir, "lib", library, ".so", file_so)))

1
tools/winegcc/utils.h
View File

@ -49,6 +49,7 @@ enum target_platform
PLATFORM_ANDROID, PLATFORM_ANDROID,
PLATFORM_SOLARIS, PLATFORM_SOLARIS,
PLATFORM_WINDOWS, PLATFORM_WINDOWS,
PLATFORM_MINGW,
PLATFORM_CYGWIN PLATFORM_CYGWIN
}; };

24
tools/winegcc/winegcc.c
View File

@ -181,14 +181,15 @@ static const struct
enum target_platform platform; enum target_platform platform;
} platform_names[] = } platform_names[] =
{ {
{ "macos", PLATFORM_APPLE }, { "macos", PLATFORM_APPLE },
{ "darwin", PLATFORM_APPLE }, { "darwin", PLATFORM_APPLE },
{ "android", PLATFORM_ANDROID }, { "android", PLATFORM_ANDROID },
{ "solaris", PLATFORM_SOLARIS }, { "solaris", PLATFORM_SOLARIS },
{ "cygwin", PLATFORM_CYGWIN }, { "cygwin", PLATFORM_CYGWIN },
{ "mingw32", PLATFORM_WINDOWS }, { "mingw32", PLATFORM_MINGW },
{ "windows", PLATFORM_WINDOWS }, { "windows-gnu", PLATFORM_MINGW },
{ "winnt", PLATFORM_WINDOWS } { "windows", PLATFORM_WINDOWS },
{ "winnt", PLATFORM_MINGW }
}; };
struct options struct options
@ -258,7 +259,7 @@ static enum target_platform build_platform = PLATFORM_SOLARIS;
#elif defined(__CYGWIN__) #elif defined(__CYGWIN__)
static enum target_platform build_platform = PLATFORM_CYGWIN; static enum target_platform build_platform = PLATFORM_CYGWIN;
#elif defined(_WIN32) #elif defined(_WIN32)
static enum target_platform build_platform = PLATFORM_WINDOWS; static enum target_platform build_platform = PLATFORM_MINGW;
#else #else
static enum target_platform build_platform = PLATFORM_UNSPECIFIED; static enum target_platform build_platform = PLATFORM_UNSPECIFIED;
#endif #endif
@ -487,6 +488,7 @@ static strarray *get_link_args( struct options *opts, const char *output_name )
break; break;
case PLATFORM_WINDOWS: case PLATFORM_WINDOWS:
case PLATFORM_MINGW:
case PLATFORM_CYGWIN: case PLATFORM_CYGWIN:
if (opts->shared || opts->win16_app) if (opts->shared || opts->win16_app)
{ {
@ -729,7 +731,7 @@ static void compile(struct options* opts, const char* lang)
break; break;
} }
if (opts->target_platform == PLATFORM_WINDOWS || opts->target_platform == PLATFORM_CYGWIN) if (opts->target_platform == PLATFORM_WINDOWS || opts->target_platform == PLATFORM_CYGWIN || opts->target_platform == PLATFORM_MINGW)
goto no_compat_defines; goto no_compat_defines;
if (opts->processor != proc_cpp) if (opts->processor != proc_cpp)
@ -1043,7 +1045,7 @@ static void build(struct options* opts)
int generate_app_loader = 1; int generate_app_loader = 1;
const char *crt_lib = NULL, *entry_point = NULL; const char *crt_lib = NULL, *entry_point = NULL;
int fake_module = 0; int fake_module = 0;
int is_pe = (opts->target_platform == PLATFORM_WINDOWS || opts->target_platform == PLATFORM_CYGWIN); int is_pe = (opts->target_platform == PLATFORM_WINDOWS || opts->target_platform == PLATFORM_CYGWIN || opts->target_platform == PLATFORM_MINGW);
unsigned int j; unsigned int j;
/* NOTE: for the files array we'll use the following convention: /* NOTE: for the files array we'll use the following convention: