Commit 6f5bbfe0 authored by Hans Breuer's avatar Hans Breuer Committed by Hans Breuer

updated and removed -GD to let msvc9 complain less

2007-12-09  Hans Breuer  <hans@breuer.org>

	* **/makefile.msc : updated and removed -GD to let msvc9 complain less


svn path=/trunk/; revision=24305
parent 8372fd28
2007-12-09 Hans Breuer <hans@breuer.org>
* **/makefile.msc : updated and removed -GD to let msvc9 complain less
2007-12-09 Martin Nordholts <martinn@svn.gnome.org>
* app/tools/gimprectangletool.[ch]: Added
......
......@@ -119,5 +119,5 @@ gimpcore-$(PKG_VER).dll : $(DLLOBJS) gimpcore.def
$(CC) $(CFLAGS) -LD -Fegimpcore-$(PKG_VER).dll $(DLLOBJS) $(PKG_LINK) user32.lib advapi32.lib wsock32.lib $(LDFLAGS) /def:gimpcore.def
.c.obj :
$(CC) $(CFLAGS) -GD -c $(PKG_CFLAGS) $<
$(CC) $(CFLAGS) -c $(PKG_CFLAGS) $<
......@@ -19,6 +19,7 @@ PKG_LINK = \
OBJECTS = \
base.obj \
base-enums.obj \
base-utils.obj \
boundary.obj \
color-balance.obj \
colorize.obj \
......@@ -74,4 +75,4 @@ $(PACKAGE).exe : $(OBJECTS) $(PACKAGE).def $(PACKAGE).res
user32.lib advapi32.lib shell32.lib wsock32.lib winspool.lib $(LDFLAGS) /def:$(PACKAGE).def
.c.obj :
$(CC) $(CFLAGS) -GD -c $(PKG_CFLAGS) $<
$(CC) $(CFLAGS) -c $(PKG_CFLAGS) $<
......@@ -67,4 +67,4 @@ $(PACKAGE).exe : $(OBJECTS) $(PACKAGE).def $(PACKAGE).res
user32.lib advapi32.lib shell32.lib wsock32.lib winspool.lib $(LDFLAGS) /def:$(PACKAGE).def
.c.obj :
$(CC) $(CFLAGS) -GD -c $(PKG_CFLAGS) $<
$(CC) $(CFLAGS) -c $(PKG_CFLAGS) $<
......@@ -74,4 +74,4 @@ $(PACKAGE).exe : $(OBJECTS) $(PACKAGE).def $(PACKAGE).res
user32.lib advapi32.lib shell32.lib wsock32.lib winspool.lib $(LDFLAGS) /def:$(PACKAGE).def
.c.obj :
$(CC) $(CFLAGS) -GD -c $(PKG_CFLAGS) $<
$(CC) $(CFLAGS) -c $<
......@@ -67,6 +67,8 @@ OBJECTS = \
gimpcontainer.obj \
gimpcontext.obj \
gimpcoords.obj \
gimpcurve.obj \
gimpcurve-save.obj \
gimpdashpattern.obj \
gimpdata.obj \
gimpdatafactory.obj \
......@@ -237,7 +239,7 @@ gimpcore-$(PKG_VER).dll : $(DLLOBJS) gimpcore.def
$(CC) $(CFLAGS) -LD -Fegimpcore-$(PKG_VER).dll $(DLLOBJS) $(PKG_LINK) user32.lib advapi32.lib wsock32.lib $(LDFLAGS) /def:gimpcore.def
.c.obj :
$(CC) $(CFLAGS) -GD -c $(PKG_CFLAGS) $<
$(CC) $(CFLAGS) -c $(PKG_CFLAGS) $<
clean ::
del gimpmarshal.c
......
......@@ -87,4 +87,4 @@ $(PACKAGE).exe : $(OBJECTS) $(PACKAGE).def $(PACKAGE).res
user32.lib advapi32.lib shell32.lib wsock32.lib winspool.lib $(LDFLAGS) /def:$(PACKAGE).def
.c.obj :
$(CC) $(CFLAGS) -GD -c $(PKG_CFLAGS) $<
$(CC) $(CFLAGS) -c $(PKG_CFLAGS) $<
......@@ -79,4 +79,4 @@ $(PACKAGE).exe : $(OBJECTS) $(PACKAGE).def $(PACKAGE).res
user32.lib advapi32.lib shell32.lib wsock32.lib winspool.lib $(LDFLAGS) /def:$(PACKAGE).def
.c.obj :
$(CC) $(CFLAGS) -GD -c $(PKG_CFLAGS) $<
$(CC) $(CFLAGS) -c $(PKG_CFLAGS) $<
......@@ -53,4 +53,4 @@ $(PACKAGE).exe : $(OBJECTS) $(PACKAGE).def $(PACKAGE).res
user32.lib advapi32.lib shell32.lib wsock32.lib winspool.lib $(LDFLAGS) /def:$(PACKAGE).def
.c.obj :
$(CC) $(CFLAGS) -GD -c $(PKG_CFLAGS) $<
$(CC) $(CFLAGS) -c $(PKG_CFLAGS) $<
......@@ -74,4 +74,4 @@ $(PACKAGE).exe : $(OBJECTS) $(PACKAGE).def $(PACKAGE).res
user32.lib advapi32.lib shell32.lib wsock32.lib winspool.lib $(LDFLAGS) /def:$(PACKAGE).def
.c.obj :
$(CC) $(CFLAGS) -GD -c $(PKG_CFLAGS) $<
$(CC) $(CFLAGS) -c $(PKG_CFLAGS) $<
......@@ -39,6 +39,8 @@ GIMP_CORE_OBJECTS = \
display/display-enums.obj \
display/gimpdisplayoptions.obj \
\
gimp-log.obj \
\
base/appbase.lib \
composite/appcomposite.lib \
config/appconfig.lib \
......@@ -54,8 +56,6 @@ GIMP_CORE_OBJECTS = \
xcf/xcf.lib \
PKG_LINK = \
$(PRJ_TOP)/regexrepl/regexrepl.lib \
\
$(top_builddir)/libgimpbase/gimpbase-$(LT_RELEASE).lib \
$(top_builddir)/libgimpcolor/gimpcolor-$(LT_RELEASE).lib \
$(top_builddir)/libgimpconfig/gimpconfig-$(LT_RELEASE).lib \
......@@ -67,9 +67,11 @@ PKG_LINK = \
$(GTK2_LIBS) \
$(GIMP_THREAD_LIBS) \
$(GIMP_MP_LIBS) \
$(CAIRO_LIBS) \
$(INTL_LIBS) \
$(LIBART_LIBS) \
$(PANGOWIN32_LIBS) \
$(PANGOCAIRO_LIBS) \
!IFNDEF PANGO_WIN32_EXTENDED
$(PANGOFT2_LIBS) \
$(FREETYPE2_LIBS) \
......@@ -107,7 +109,7 @@ OBJECTS = \
display/appdisplay.lib \
app_console.obj : app.c
$(CC) $(CFLAGS) -DGIMP_CONSOLE_COMPILATION -GD -c $(PKG_CFLAGS) -Foapp_console.obj app.c
$(CC) $(CFLAGS) -DGIMP_CONSOLE_COMPILATION -c -Foapp_console.obj app.c
EXTRA_DIST = \
makefile.mingw \
......@@ -119,9 +121,7 @@ EXTRA_DIST = \
wilber.ico \
arch/i386/mmx/detect_mmx.S \
arch/i386/mmx/paint_funcs_mmx.S \
detect_mmx.S \
regexrepl.c \
regexrepl.h
detect_mmx.S
scriptdata = \
......@@ -146,17 +146,18 @@ gimp-core-$(PKG_VER).dll : $(GIMP_CORE_OBJECTS) gimpcore.def
$(CC) $(CFLAGS) -LD -Fegimp-core-$(PKG_VER).dll $(GIMP_CORE_OBJECTS) $(PKG_LINK) user32.lib advapi32.lib wsock32.lib $(LDFLAGS) /def:gimpcore.def
$(PACKAGE)-$(PKG_VER).dll : $(PKG_LINK) $(OBJECTS) $(PACKAGE).def
$(CC) $(CFLAGS) -LD -Fe$(PACKAGE)-$(PKG_VER).dll $(OBJECTS) $(PKG_LINK) user32.lib advapi32.lib wsock32.lib $(LDFLAGS) /def:$(PACKAGE).def
$(CC) $(CFLAGS) -LD -Fe$(PACKAGE)-$(PKG_VER).dll $(OBJECTS) $(PKG_LINK) \
user32.lib kernel32.lib advapi32.lib wsock32.lib $(LDFLAGS) /def:$(PACKAGE).def
gimp-console.exe : $(OBJECTS) app_console.obj $(PACKAGE).res $(PKG_LINK)
$(CC) $(CFLAGS) -Fegimp-console.exe $(PACKAGE).res app_console.obj $(OBJECTS) $(PKG_LINK) \
gimp-core-$(PKG_VER).lib \
user32.lib advapi32.lib shell32.lib wsock32.lib winspool.lib $(LDFLAGS)
user32.lib kernel32.lib advapi32.lib shell32.lib wsock32.lib winspool.lib $(LDFLAGS)
$(PACKAGE).exe : $(OBJECTS) app.obj $(PACKAGE).res $(PKG_LINK)
$(CC) $(CFLAGS) -Fe$(PACKAGE).exe $(PACKAGE).res app.obj $(OBJECTS) \
gimp-core-$(PKG_VER).lib \
$(PKG_LINK) user32.lib advapi32.lib shell32.lib wsock32.lib winspool.lib $(LDFLAGS)
$(PKG_LINK) user32.lib kernel32.lib advapi32.lib shell32.lib wsock32.lib winspool.lib $(LDFLAGS)
.c.obj :
$(CC) $(CFLAGS) -GD -c $(PKG_CFLAGS) $<
$(CC) $(CFLAGS) -c $<
......@@ -52,5 +52,5 @@ gimpcore-$(PKG_VER).dll : $(DLLOBJS) gimpcore.def
$(CC) $(CFLAGS) -LD -Fegimpcore-$(PKG_VER).dll $(DLLOBJS) $(PKG_LINK) user32.lib advapi32.lib wsock32.lib $(LDFLAGS) /def:gimpcore.def
.c.obj :
$(CC) $(CFLAGS) -GD -c $(PKG_CFLAGS) $<
$(CC) $(CFLAGS) -c $<
......@@ -57,4 +57,4 @@ $(PACKAGE).exe : $(OBJECTS) $(PACKAGE).def $(PACKAGE).res
user32.lib advapi32.lib shell32.lib wsock32.lib winspool.lib $(LDFLAGS) /def:$(PACKAGE).def
.c.obj :
$(CC) $(CFLAGS) -GD -c $(PKG_CFLAGS) $<
$(CC) $(CFLAGS) -c $(PKG_CFLAGS) $<
......@@ -92,4 +92,4 @@ $(PACKAGE).exe : $(OBJECTS) $(PACKAGE).def $(PACKAGE).res
user32.lib advapi32.lib shell32.lib wsock32.lib winspool.lib $(LDFLAGS) /def:$(PACKAGE).def
.c.obj :
$(CC) $(CFLAGS) -GD -c $(PKG_CFLAGS) $<
$(CC) $(CFLAGS) -c $(PKG_CFLAGS) $<
......@@ -80,6 +80,7 @@ OBJECTS = \
vectors_cmds.obj \
\
gimppdb.obj \
gimppdberror.obj \
\
gimp-pdb-compat.obj \
gimppdb-query.obj \
......@@ -115,4 +116,4 @@ $(PACKAGE).exe : $(OBJECTS) $(PACKAGE).def $(PACKAGE).res
user32.lib advapi32.lib shell32.lib wsock32.lib winspool.lib $(LDFLAGS) /def:$(PACKAGE).def
.c.obj :
$(CC) $(CFLAGS) -GD -c $(PKG_CFLAGS) $<
$(CC) $(CFLAGS) -c $<
......@@ -77,4 +77,4 @@ $(PACKAGE).exe : $(OBJECTS) $(PACKAGE).def $(PACKAGE).res
user32.lib advapi32.lib shell32.lib wsock32.lib winspool.lib $(LDFLAGS) /def:$(PACKAGE).def
.c.obj :
$(CC) $(CFLAGS) -GD -c $(PKG_CFLAGS) $<
$(CC) $(CFLAGS) -c $(PKG_CFLAGS) $<
......@@ -76,4 +76,4 @@ $(PACKAGE).exe : $(OBJECTS) $(PACKAGE).def $(PACKAGE).res
user32.lib advapi32.lib shell32.lib wsock32.lib winspool.lib $(LDFLAGS) /def:$(PACKAGE).def
.c.obj :
$(CC) $(CFLAGS) -GD -c $(PKG_CFLAGS) $<
$(CC) $(CFLAGS) -c $<
......@@ -139,4 +139,4 @@ $(PACKAGE).exe : $(OBJECTS) $(PACKAGE).def $(PACKAGE).res
user32.lib advapi32.lib shell32.lib wsock32.lib winspool.lib $(LDFLAGS) /def:$(PACKAGE).def
.c.obj :
$(CC) $(CFLAGS) -GD -c $(PKG_CFLAGS) $<
$(CC) $(CFLAGS) -c $(PKG_CFLAGS) $<
......@@ -63,4 +63,4 @@ $(PACKAGE).exe : $(OBJECTS) $(PACKAGE).def $(PACKAGE).res
user32.lib advapi32.lib shell32.lib wsock32.lib winspool.lib $(LDFLAGS) /def:$(PACKAGE).def
.c.obj :
$(CC) $(CFLAGS) -GD -c $(PKG_CFLAGS) $<
$(CC) $(CFLAGS) -c $(PKG_CFLAGS) $<
......@@ -35,6 +35,7 @@ OBJECTS = \
gimpbrushfactoryview.obj \
gimpbrushselect.obj \
gimpbufferview.obj \
gimpcairo-utils.obj \
gimpcellrendererdashes.obj \
gimpcellrendererviewable.obj \
gimpchanneltreeview.obj \
......@@ -66,6 +67,7 @@ OBJECTS = \
gimpcontrollerwheel.obj \
gimpcursor.obj \
gimpcursorview.obj \
gimpcurveview.obj \
gimpdasheditor.obj \
gimpdataeditor.obj \
gimpdatafactoryview.obj \
......@@ -95,6 +97,7 @@ OBJECTS = \
gimpgradienteditor.obj \
gimpgradientselect.obj \
gimpgrideditor.obj \
gimphandlebar.obj \
gimphelp.obj \
gimphistogrambox.obj \
gimphistogrameditor.obj \
......@@ -214,4 +217,4 @@ $(PACKAGE).exe : $(OBJECTS) $(PACKAGE).def $(PACKAGE).res
user32.lib advapi32.lib shell32.lib wsock32.lib winspool.lib $(LDFLAGS) /def:$(PACKAGE).def
.c.obj :
$(CC) $(CFLAGS) -GD -c $(PKG_CFLAGS) $<
$(CC) $(CFLAGS) -c $(PKG_CFLAGS) $<
......@@ -50,4 +50,4 @@ $(PACKAGE).exe : $(OBJECTS) $(PACKAGE).def $(PACKAGE).res
user32.lib advapi32.lib shell32.lib wsock32.lib winspool.lib $(LDFLAGS) /def:$(PACKAGE).def
.c.obj :
$(CC) $(CFLAGS) -GD -c $(PKG_CFLAGS) $<
$(CC) $(CFLAGS) -c $<
......@@ -69,3 +69,6 @@ CURSOR_LIST = \
gimp-tool-cursors.h : makefile.msc
gdk-pixbuf-csource --raw --build-list $(CURSOR_LIST) > gimp-tool-cursors.h
clean :
del gimp-tool-cursors.h
......@@ -7,7 +7,7 @@ GIMP_VER = 2.0
# and stuff is saved.
GIMPDIR = _gimp$(GIMP_VER)
# don't interfer with stable version
GIMPDIR = _gimp-2.4
GIMPDIR = _gimp-2.5
# Build app/* as DLLs; don't define this, it doesn't work yet.
#DLLGIMP = 1
......
......@@ -143,7 +143,7 @@ gimp-$(GIMP_VER).dll : $(gimp_OBJECTS) gimp.def
# Pass -DLIBGIMP_COMPILATION when compiling gimp.c
gimp.obj : gimp.c
$(CC) $(CFLAGS) -GD -c -DLIBGIMP_COMPILATION gimp.c
$(CC) $(CFLAGS) -c -DLIBGIMP_COMPILATION gimp.c
gimpui_OBJECTS = \
gimpaspectpreview.obj \
......@@ -190,16 +190,16 @@ gimpui-$(GIMP_VER).dll : $(gimpui_OBJECTS) gimpui.def
# gimpwidgets only for gimp_dialog_new
gimpmenu.obj : gimpmenu.c
$(CC) $(CFLAGS) -GD -c gimpmenu.c
$(CC) $(CFLAGS) -c gimpmenu.c
gimpbrushmenu.obj : gimpbrushmenu.c
$(CC) $(CFLAGS) -GD -c gimpbrushmenu.c
$(CC) $(CFLAGS) -c gimpbrushmenu.c
gimpgradientmenu.obj : gimpgradientmenu.c
$(CC) $(CFLAGS) -GD -c gimpgradientmenu.c
$(CC) $(CFLAGS) -c gimpgradientmenu.c
gimppatternmenu.obj : gimppatternmenu.c
$(CC) $(CFLAGS) -GD -c gimppatternmenu.c
$(CC) $(CFLAGS) -c gimppatternmenu.c
# General rule for compiling, used by the objects that don't go into
# gimp-$(GIMP_VER).dll.
......
......@@ -47,9 +47,7 @@ OBJECTS = \
gimpsignal.obj \
gimpunit.obj \
gimputils.obj \
gimpwire.obj \
\
xdg-user-dir.obj
gimpwire.obj
EXTRA_DIST = \
makefile.mingw \
......@@ -91,4 +89,4 @@ $(PACKAGE).exe : $(OBJECTS) $(PACKAGE).def $(PACKAGE).res
user32.lib advapi32.lib shell32.lib wsock32.lib winspool.lib $(LDFLAGS) /def:$(PACKAGE).def
.c.obj :
$(CC) $(CFLAGS) -GD -c $(PKG_CFLAGS) $<
$(CC) $(CFLAGS) -c $(PKG_CFLAGS) $<
......@@ -75,4 +75,4 @@ $(PACKAGE).exe : $(OBJECTS) $(PACKAGE).def $(PACKAGE).res
user32.lib advapi32.lib shell32.lib wsock32.lib winspool.lib $(LDFLAGS) /def:$(PACKAGE).def
.c.obj :
$(CC) $(CFLAGS) -GD -c $(PKG_CFLAGS) $<
$(CC) $(CFLAGS) -c $(PKG_CFLAGS) $<
......@@ -110,7 +110,7 @@ gimpwidgetsmarshal.c : gimpwidgetsmarshal.list gimpwidgetsmarshal.h
# questionable dependency between libgimpui/libgimpwidgets
gimpunit.obj : ..\app\gimpunit.c
$(CC) $(CFLAGS) -GD -c ..\app\gimpunit.c
$(CC) $(CFLAGS) -c ..\app\gimpunit.c
gimpwidgets-$(GIMP_VER).dll : $(OBJECTS) gimpwidgets.def
$(CC) $(CFLAGS) -LD -Fegimpwidgets-$(GIMP_VER).dll $(OBJECTS) \
......
......@@ -65,4 +65,4 @@ $(PACKAGE).exe : $(OBJECTS) $(PACKAGE).def $(PACKAGE).res
user32.lib advapi32.lib shell32.lib wsock32.lib winspool.lib $(LDFLAGS) /def:$(PACKAGE).def
.c.obj :
$(CC) $(CFLAGS) -GD -c $(PKG_CFLAGS) $<
$(CC) $(CFLAGS) -c $(PKG_CFLAGS) $<
......@@ -97,7 +97,7 @@ cdisplay_proof-$(GIMP_VER).dll : cdisplay_proof.obj
# General rule for building
.c.obj:
$(CC) $(CFLAGS) $(LCMS_CFLAGS) -GD -c $<
$(CC) $(CFLAGS) $(LCMS_CFLAGS) -c $<
clean::
del *.dll
......
......@@ -37,9 +37,9 @@ COMMON1 = antialias AlienMap2 ccanalyze CEL channel_mixer CML_explorer align_lay
COMMON2 = decompose deinterlace depthmerge despeckle destripe dicom diffraction displace dog edge emboss engrave exchange film flarefx fp fractaltrace
COMMON3 = gauss gbr gee gee_zoom gif_load gif_save gih glasstile glob gqbist gradmap grid gtm guillotine header hot illusion iwarp jigsaw laplace lcms lens lic
COMMON4 = mapcolor max_rgb mblur mosaic neon newsprint nlfilt noisify normalize nova oilify papertile pat pcx photocopy pix pixelize plasma png pnm polar postscript psd_load psd_save psp randomize raw redeye retinex ripple rotate
COMMON5 = sample_colorize scatter_hsv screenshot sel_gauss semiflatten sharpen shift sinus smooth_palette snoise sobel softglow sparkle spheredesigner spread struc sunras svg tga threshold_alpha tiff_load tiff_save
COMMON6 = tile tileit tiler uniteditor unsharp video vinvert vpropagate warp waves webbrowser whirlpinch wind xbm xwd zealouscrop
COMMON7 = winprint winclipboard wiredebug
COMMON5 = sample_colorize scatter_hsv screenshot sel_gauss semiflatten sharpen shift sinus smooth_palette snoise sobel softglow sparkle spheredesigner spread struc sunras svg tga threshold_alpha
COMMON6 = tiff_load tiff_save tile tileit tiler uniteditor unsharp video vinvert vpropagate warp waves webbrowser whirlpinch wind xbm xwd zealouscrop
COMMON7 = winprint winclipboard wiredebug
NOTNOW = wmf
......@@ -820,7 +820,7 @@ LINKDEBUG = /debug
RTL = -MDd
!ENDIF
CC = cl -nologo -G5 -GF $(OPTIMIZE) $(RTL) -W2 -Zm400
CC = cl -nologo -GF $(OPTIMIZE) $(RTL) -W2 -Zm400
CFLAGS = -FImsvc_recommended_pragmas.h \
-DHAVE_CONFIG_H \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment