callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added checks and rules to build and link the win32 icon resource if the

Browse Source 
2004-08-01  Michael Schumacher <schumaml@cvs.gnome.org>

	* app/Makefile.am: added checks and rules to build and link the
	win32 icon resource if the resource compiler windres is found by
	configure. First part of a fix for bug #148443.
This commit is contained in:
Michael Schumacher
2004-08-01 15:28:32 +00:00
committed by Michael Schumacher
parent f460fda503
commit 3c1c0465ac
2 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2004-08-01 Michael Schumacher <schumaml@cvs.gnome.org>
* app/Makefile.am: added checks and rules to build and link the
win32 icon resource if the resource compiler windres is found by
configure. First part of a fix for bug #148443.
2004-08-01 Michael Schumacher <schumaml@cvs.gnome.org> 2004-08-01 Michael Schumacher <schumaml@cvs.gnome.org>
* libgimpwidgets/gimpwidgets.def: added gimp_preview_area_fill * libgimpwidgets/gimpwidgets.def: added gimp_preview_area_fill

13
app/Makefile.am
View File

@ -68,6 +68,10 @@ if OS_WIN32
mwindows = -mwindows mwindows = -mwindows
endif endif
if HAVE_WINDRES
GIMPICONRC = gimprc.o
endif
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"Gimp\" \ -DG_LOG_DOMAIN=\"Gimp\" \
-DGIMP_APP_GLUE_COMPILATION \ -DGIMP_APP_GLUE_COMPILATION \
@ -134,7 +138,8 @@ gimp_2_1_LDADD = \
$(GIMP_THREAD_LIBS) \ $(GIMP_THREAD_LIBS) \
$(GIMP_MP_LIBS) \ $(GIMP_MP_LIBS) \
$(RT_LIBS) \ $(RT_LIBS) \
$(INTLLIBS) $(INTLLIBS) \
$(GIMPICONRC)
if ENABLE_GIMP_CONSOLE if ENABLE_GIMP_CONSOLE
@ -177,7 +182,8 @@ gimp_console_2_1_LDADD = \
$(GIMP_THREAD_LIBS) \ $(GIMP_THREAD_LIBS) \
$(GIMP_MP_LIBS) \ $(GIMP_MP_LIBS) \
$(RT_LIBS) \ $(RT_LIBS) \
$(INTLLIBS) $(INTLLIBS) \
$(GIMPICONRC)
endif endif
@ -223,3 +229,6 @@ dist-dump-gimprc: gimp-console-$(GIMP_APP_VERSION)$(EXEEXT)
dist-hook: dist-check-gimp-console dist-dump-gimprc dist-hook: dist-check-gimp-console dist-dump-gimprc
gimprc.o:
$(WINDRES) gimp.rc gimprc.o