From 48ca0a59088dcd2d55b1240da5e274d4ec7ba85d Mon Sep 17 00:00:00 2001 From: "Ben \"root\" Anderson" Date: Thu, 31 Oct 2013 20:43:51 -0500 Subject: [PATCH] Move our winres.h out of the way so VS does not get confused --- configure.ac | 2 +- src/archutils/Win32/{ => mingw}/winres.h | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) rename src/archutils/Win32/{ => mingw}/winres.h (54%) diff --git a/configure.ac b/configure.ac index b0a1700963..964f825f66 100644 --- a/configure.ac +++ b/configure.ac @@ -30,7 +30,7 @@ if test "$host_os" = "mingw32"; then # HACK: The prebuilts are 32bit only. Force the issue. CFLAGS="$CFLAGS -m32" CXXFLAGS="$CXXFLAGS -m32" - RESFLAGS="$RESFLAGS --target=pe-i386" + RESFLAGS="$RESFLAGS --target=pe-i386 -I$PWD/src/archutils/Win32/mingw" fi AM_CONDITIONAL(WITH_TTY, test "$with_tty" = "yes") diff --git a/src/archutils/Win32/winres.h b/src/archutils/Win32/mingw/winres.h similarity index 54% rename from src/archutils/Win32/winres.h rename to src/archutils/Win32/mingw/winres.h index 053c524c80..438775a3ea 100644 --- a/src/archutils/Win32/winres.h +++ b/src/archutils/Win32/mingw/winres.h @@ -1,6 +1,2 @@ /* Since VS generates WindowsResources.rc we can't edit it directly. */ -#if defined(HAVE_WINRES_H) -#include // Just in case -#else #include -#endif