actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Move our winres.h out of the way so VS does not get confused

Browse Source
This commit is contained in:
Ben "root" Anderson
2013-10-31 20:43:51 -05:00
parent 095c6877c2
commit 48ca0a5908
2 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure.ac
+1 -1
View File
@@ -30,7 +30,7 @@ if test "$host_os" = "mingw32"; then
# HACK: The prebuilts are 32bit only. Force the issue. # HACK: The prebuilts are 32bit only. Force the issue.
CFLAGS="$CFLAGS -m32" CFLAGS="$CFLAGS -m32"
CXXFLAGS="$CXXFLAGS -m32" CXXFLAGS="$CXXFLAGS -m32"
RESFLAGS="$RESFLAGS --target=pe-i386" RESFLAGS="$RESFLAGS --target=pe-i386 -I$PWD/src/archutils/Win32/mingw"
fi fi
AM_CONDITIONAL(WITH_TTY, test "$with_tty" = "yes") AM_CONDITIONAL(WITH_TTY, test "$with_tty" = "yes")
src/archutils/Win32/winres.h → src/archutils/Win32/mingw/winres.h
-4
View File
@@ -1,6 +1,2 @@
/* Since VS generates WindowsResources.rc we can't edit it directly. */ /* Since VS generates WindowsResources.rc we can't edit it directly. */
#if defined(HAVE_WINRES_H)
#include <winres.h> // Just in case
#else
#include <afxres.h> #include <afxres.h>
#endif