dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Define WIN32_LARGE_ADDRESS_AWARE as -Wl,--large-address-aware on 32-bit 

2008-08-07  Tor Lillqvist  <tml@novell.com>

	* configure.in: Define WIN32_LARGE_ADDRESS_AWARE as
	-Wl,--large-address-aware on 32-bit Windows, empty
	otherwise. AC_SUBST() it.

	* app/Makefile.am (win32_ldflags): Use WIN32_LARGE_ADDRESS_AWARE
	instead of hardcoding the switch, as it isn't valid, and would be
	pointless, when building a 64-bit GIMP.


svn path=/trunk/; revision=26411
This commit is contained in:
Tor Lillqvist 2008-08-07 00:36:47 +00:00 committed by Tor Lillqvist
parent 6d9a5394cc
commit 8af046ad76
3 changed files with 19 additions and 1 deletions

10
ChangeLog
View File

@ -1,3 +1,13 @@
2008-08-07 Tor Lillqvist <tml@novell.com>
* configure.in: Define WIN32_LARGE_ADDRESS_AWARE as
-Wl,--large-address-aware on 32-bit Windows, empty
otherwise. AC_SUBST() it.
* app/Makefile.am (win32_ldflags): Use WIN32_LARGE_ADDRESS_AWARE
instead of hardcoding the switch, as it isn't valid, and would be
pointless, when building a 64-bit GIMP.
2008-08-06 Sven Neumann <sven@gimp.org>
* app/core/gimpdrawable-shadow.c: removed unused include.

2
app/Makefile.am
View File

@ -69,7 +69,7 @@ EXTRA_DIST = \
wilber.ico
if OS_WIN32
win32_ldflags = -mwindows -Wl,--large-address-aware
win32_ldflags = -mwindows $(WIN32_LARGE_ADDRESS_AWARE)
endif
if USE_BINRELOC

8
configure.in
View File

@ -220,6 +220,13 @@ AC_MSG_CHECKING([for native Win32])
case "$target_or_host" in
*-*-mingw*)
os_win32=yes
case "$host" in
x86_64-*-*)
;;
*)
WIN32_LARGE_ADDRESS_AWARE='-Wl,--large-address-aware'
;;
esac
PATHSEP=';'
;;
*)
@ -228,6 +235,7 @@ case "$target_or_host" in
;;
esac
AC_MSG_RESULT([$os_win32])
AC_SUBST(WIN32_LARGE_ADDRESS_AWARE)
AC_SUBST(PATHSEP)
AM_CONDITIONAL(OS_WIN32, test "$os_win32" = "yes")
AM_CONDITIONAL(OS_UNIX, test "$os_win32" != "yes")