[PATCH vkd3d 2/2] demos: Support building on Windows without -DUNICODE.

Henri Verbeet hverbeet at gmail.com
Wed Feb 23 08:37:36 CST 2022


On Tue, 22 Feb 2022 at 20:00, Alexandre Julliard <julliard at winehq.org> wrote:
> diff --git a/demos/gears.c b/demos/gears.c
> index 2045b3cdd842..9ed87b1084cf 100644
> --- a/demos/gears.c
> +++ b/demos/gears.c
> @@ -877,7 +877,7 @@ static int cxg_main(void)
>      return EXIT_SUCCESS;
>  }
>
> -#ifdef _WIN32
> +#if defined(_WIN32) && defined(_UNICODE)
>  int wmain(void)
>  #else
>  int main(void)

Shouldn't that check for "defined(UNICODE)" instead? As-is, this
breaks "make crosstest":

    i686-w64-mingw32-gcc -g -O2 -Wall -municode -I<vkd3d>/include
-I<vkd3d>/include/private -I./include -D__USE_MINGW_ANSI_STDIO=0 -MT
demos/gears.cross32.exe -MD -MP -MF $depbase.Tpo -o
demos/gears.cross32.exe <vkd3d>/demos/gears.c
crosslibs/d3d12.cross32.a -ldxgi -lgdi32 -ld3dcompiler_47 && \
    mv -f $depbase.Tpo $depbase.Po
    /usr/bin/i686-w64-mingw32-ld:
/usr/lib/gcc/i686-w64-mingw32/8.3-win32/../../../../i686-w64-mingw32/lib/../lib/libmingw32.a(lib32_libmingw32_a-crt0_w.o):
in function `wmain':
    ./build/i686-w64-mingw32-i686-w64-mingw32-crt/./mingw-w64-crt/crt/crt0_w.c:23:
undefined reference to `wWinMain at 16'



More information about the wine-devel mailing list