Commit 9768e4be authored by Hans Breuer's avatar Hans Breuer Committed by Hans Breuer
Browse files

replace the win9x specific cd .... with the portable cd ..\..\..

2003-06-19  Hans Breuer  <hans@breuer.org>

	* makefile.msc : replace the win9x specific cd ....
	with the portable cd ..\..\..

	* **/makefile.msc : updated

	* plug-ins/xjt/xjt.c plug-ins/common/psd_save.c :
	there is still no unistd.h with msvc build
parent 2fcb933c
2003-06-19 Hans Breuer <hans@breuer.org>
* makefile.msc : replace the win9x specific cd ....
with the portable cd ..\..\..
* **/makefile.msc : updated
* plug-ins/xjt/xjt.c plug-ins/common/psd_save.c :
there is still no unistd.h with msvc build
2003-06-17 Sven Neumann <sven@gimp.org>
 
* plug-ins/gfig/gfig.c: raise the brush selection dialog if there
......@@ -48,7 +48,8 @@ OBJECTS = \
documents-menu.obj \
drawable-commands.obj \
edit-commands.obj \
error-console-dialog.obj \
error-console-commands.obj \
error-console-menu.obj \
file-commands.obj \
file-dialog-utils.obj \
file-new-dialog.obj \
......
......@@ -53,14 +53,15 @@ PKG_LINK = \
$(GIMP_THREAD_LIBS) \
$(GIMP_MP_LIBS) \
$(INTL_LIBS) \
$(PANGO)\pango\pangoft2-$(PANGO_VER).lib \
$(LIBART_LIBS) \
\
$(PANGO)\fontconfig\fcwin32.lib
$(PANGOWIN32_LIBS)
gimp_LDFLAGS = \
-export-dynamic -export-symbols $(srcdir)/gimp.sym
INCLUDES = \
-DG_LOG_DOMAIN=\"Gimp\" \
-DGIMP_APP_GLUE_COMPILATION \
-I$(top_srcdir) \
-I$(top_srcdir)/intl \
$(GTK2_CFLAGS) \
......
......@@ -24,9 +24,14 @@ OBJECTS = \
INCLUDES = \
-FImsvc_recommended_pragmas.h \
-DUSE_PANGO_WIN32 \
-I$(PRJ_TOP) \
-I$(PRJ_TOP)/app \
$(GLIB_CFLAGS) $(PANGO_CFLAGS) $(GTK2_CFLAGS) $(FREETYPE2_CFLAGS) \
$(GLIB_CFLAGS) \
$(FONTCONFIG_CFLAGS) \
$(PANGO_CFLAGS) $(GTK2_CFLAGS) \
# $(FREETYPE2_CFLAGS)
all : \
$(PRJ_TOP)\config.h \
......
......@@ -36,8 +36,10 @@ OBJECTS = \
gimpclonetool.obj \
gimpcolorbalancetool.obj \
gimpcolorizetool.obj \
gimpcoloroptions.obj \
gimpcolorpickeroptions.obj \
gimpcolorpickertool.obj \
gimpcolortool.obj \
gimpconvolvetool.obj \
gimpcropoptions.obj \
gimpcroptool.obj \
......
......@@ -56,6 +56,7 @@ OBJECTS = \
gimpdrawabletreeview.obj \
gimpeditor.obj \
gimpenummenu.obj \
gimperrorconsole.obj \
gimpfontselection.obj \
gimpfontselection-dialog.obj \
gimpgradienteditor.obj \
......@@ -87,6 +88,7 @@ OBJECTS = \
gimptemplateview.obj \
gimptexteditor.obj \
gimptoolbox.obj \
gimptoolbox-dnd.obj \
gimptoolbox-color-area.obj \
gimptoolbox-indicator-area.obj \
gimpundoeditor.obj \
......@@ -104,11 +106,13 @@ INCLUDES = \
-FImsvc_recommended_pragmas.h \
-I$(top_srcdir) \
-I$(top_srcdir)/app \
$(GTK2_CFLAGS) $(FREETYPE2_CFLAGS) \
$(GTK2_CFLAGS) \
-I$(includedir)
#$(FREETYPE2_CFLAGS)
DEFINES = \
-DG_LOG_DOMAIN=\"Gimp-Widgets\"
-DG_LOG_DOMAIN=\"Gimp-Widgets\" -DUSE_PANGO_WIN32
all : \
$(PRJ_TOP)\config.h \
......
......@@ -56,7 +56,9 @@
#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
#include <string.h>
#include <glib.h>
......
......@@ -33,8 +33,8 @@ FROMPLUGINSDIR=YES # Used to bypass other parts below
# The COMMON* ones are in the common subdirectory
COMMON1 = AlienMap AlienMap2 CEL CML_explorer align_layers animationplay animoptimize apply_lens autocrop autostretch_hsv blinds blur borderaverage bumpmap c_astretch checkerboard color_enhance colorify colortoalpha compose convmatrix csource cubism curve_bend
COMMON2 = decompose deinterlace depthmerge despeckle destripe diffraction displace edge emboss engrave exchange film flarefx fractaltrace
COMMON3 = gauss_iir gauss_rle gbr gee gicon gif gifload glasstile gqbist gradmap grid gtm guillotine gz header hot hrz illusion iwarp jigsaw jpeg laplace lic
COMMON4 = mapcolor max_rgb mblur newsprint nlfilt noisify normalize nova oilify papertile pat pcx pix pixelize plasma plugindetails png pnm polar ps psd psp randomize ripple rotate
COMMON3 = gauss_iir gauss_rle gbr gee gee_zoom gicon gif gifload gih glasstile gqbist gradmap grid gtm guillotine gz header hot hrz illusion iwarp jigsaw jpeg laplace lic
COMMON4 = mapcolor max_rgb mblur newsprint nlfilt noisify normalize nova oilify papertile pat pcx pix pixelize plasma plugindetails png pnm polar ps psd psd_save psp randomize ripple rotate
COMMON5 = sample_colorize scatter_hsv semiflatten sharpen shift sinus smooth_palette snoise sobel sparkle spheredesigner spread struc sunras tga threshold_alpha tiff tile tileit tiler uniteditor unsharp video vinvert vpropagate
COMMON6 = warp waves whirlpinch winclipboard wind winprint wiredebug wmf xbm xwd zealouscrop
......@@ -42,7 +42,7 @@ COMMON6 = warp waves whirlpinch winclipboard wind winprint wiredebug wmf xbm xwd
DROPPED = gpb gdyntext
# These have own subdirectories each
SEPARATE = FractalExplorer Lighting MapObject bmp dbbrowser faxg3 fits flame fp gfig gflare gfli gimpressionist ifscompose imagemap maze mosaic pagecurl rcm sel2path sgi twain webbrowser winsnap
SEPARATE = FractalExplorer Lighting MapObject bmp dbbrowser faxg3 fits flame fp gfig gflare gfli gimpressionist helpbrowser ifscompose imagemap maze mosaic pagecurl rcm sel2path sgi twain webbrowser winsnap xjt
# These are unofficial, ie not in the CVS. To build these, you should
# get tml's source snapshot and copy this makefile to the
......@@ -543,6 +543,10 @@ OBJECTS = \
!ENDIF
!IFDEF EXTRA_helpbrowser
OBJECTS = helpwin.obj
!ENDIF
!IFDEF EXTRA_guash
HAVE_RESOURCE = YES
!ENDIF
......@@ -595,16 +599,25 @@ EXTRALIBS = shell32.lib
!IFDEF EXTRA_winprint
EXTRALIBS = user32.lib gdi32.lib comdlg32.lib
!endif
!ENDIF
!IFDEF EXTRA_winclipboard
EXTRALIBS = user32.lib
!endif
!ENDIF
!IFDEF EXTRA_winsnap
HAVE_RESOURCE = YES
EXTRALIBS = user32.lib gdi32.lib
!endif
!ENDIF
!IFDEF EXTRA_xjt
OBJECTS = \
xjt.obj \
xjpeg.obj \
xpdb_calls.obj
EXTRACFLAGS = $(JPEG_CFLAGS)
EXTRALIBS = $(JPEG_LIBS)
!ENDIF
GIMP_VER = 1.3
......
......@@ -61,7 +61,9 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
#include <gtk/gtk.h>
#include <libgimp/gimp.h>
......@@ -70,7 +72,10 @@
#include "libgimp/stdplugins-intl.h"
#ifdef G_OS_WIN32
#include <process.h> /* getpid() */
#include <direct.h> /* _mkdir */
#define mkdir(path,mode) _mkdir(path)
#define mode_t int
#endif
/* XJT includes */
......
......@@ -150,6 +150,8 @@ STOCK_VARIABLES = \
stock_paste_16 stock-paste-16.png \
stock_paste_as_new_16 stock-paste-as-new-16.png \
stock_paste_into_16 stock-paste-into-16.png \
stock_path_16 stock-path-16.png \
stock_path_22 stock-path-22.png \
stock_path_stroke_16 stock-path-stroke-16.png \
stock_paths_16 stock-paths-16.png \
stock_paths_22 stock-paths-22.png \
......@@ -167,6 +169,7 @@ STOCK_VARIABLES = \
stock_rotate_270_16 stock-rotate-270-16.png \
stock_rotate_90_16 stock-rotate-90-16.png \
stock_scale_16 stock-scale-16.png \
stock_selection_16 stock-selection-16.png \
stock_selection_add_16 stock-selection-add-16.png \
stock_selection_all_16 stock-selection-all-16.png \
stock_selection_grow_16 stock-selection-grow-16.png \
......
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