GNOME.org
 

[sodipodi] Update win32/msvc build

commit c827d3decec69895e0448b876ed17dbffcb5bb2e
Author: Hans Breuer <hans breuer org>
Date:   Sat Apr 18 13:08:17 2009 +0200

    Update win32/msvc build
---
 config.h.win32                |   15 +--
 makefile.msc                  |  225 +----------------------------------------
 src/config.h.win32            |   28 -----
 src/display/makefile.msc      |   13 ++-
 src/helper/makefile.msc       |    5 +-
 src/libarikkei/libarikkei.def |   19 ++++
 src/libarikkei/makefile.msc   |   44 ++++++++
 src/libnr/makefile.msc        |    3 +
 src/libnrtype/libnrtype.def   |    4 +-
 src/libnrtype/makefile.msc    |   14 ++-
 src/makefile.msc              |   10 ++
 src/xml/sp-xml.def            |   66 ++++++++++++
 12 files changed, 175 insertions(+), 271 deletions(-)

diff --git a/config.h.win32 b/config.h.win32
index f5e5bbc..6cf8fbd 100644
--- a/config.h.win32
+++ b/config.h.win32
@@ -8,19 +8,14 @@
  
 #undef GTK_ENABLE_BROKEN
 
-#define M_SQRT1_2 0.707
-#define M_PI_2 1.57
-#define M_PI_4 0.785
+#define M_PI_2 G_PI_2
+#define M_PI_4 G_PI_4
 
-#define VERSION "0.32pre"
+#define VERSION "0.35pre"
 #define SODIPODI_VERSION VERSION
 
-#define SODIPODI_GLADEDIR "./glade"
-#define SODIPODI_PIXMAPDIR SODIPODI_GLADEDIR
-
 #define GETTEXT_PACKAGE "sodipodi"
-#define PACKAGE_LOCALE_DIR "./locale"
-#define DATADIR "."
 #define ENABLE_NLS
 
-#define WITH_POPT 1
+#undef WITH_POPT
+#define _UNICODE 1
diff --git a/makefile.msc b/makefile.msc
index 5757043..e9e8e5f 100644
--- a/makefile.msc
+++ b/makefile.msc
@@ -1,10 +1,10 @@
-TOP = ..\..
-PRJ_TOP = ..
+TOP = ..
+PRJ_TOP = .
 PACKAGE = sodipodi
 PKG_VER = 0.35
 !INCLUDE $(TOP)\glib\build\win32\make.msc
 
-SUBDIRS = libnr libnrtype xml svg helper widgets dialogs display $(module_subdirs)
+SUBDIRS = src
 
 sub-all: 
 	for %d in ($(SUBDIRS)) do nmake -nologo -f makefile.msc sub-one THIS=%d
@@ -14,224 +14,9 @@ sub-one:
 	nmake -nologo -f makefile.msc
 	cd ..
 
-PKG_CFLAGS = \
-	-FImsvc_recommended_pragmas.h \
-	-I$(PRJ_TOP) -I. \
-	$(GLIB_CFLAGS) $(LIBART_CFLAGS) $(LIBXML2_CFLAGS) $(GTK2_CFLAGS) \
-	$(POPT_CFLAGS)
-
-SODIPODI_LIBS = \
-	libarikkei/libarikkei-$(PKG_VER).lib \
-	libnr/libnr-$(PKG_VER).lib \
-	libnrtype/libnrtype-$(PKG_VER).lib \
-	xml/sp-xml-$(PKG_VER).lib \
-	svg/sp-svg-$(PKG_VER).lib \
-#	helper/sp-helper-$(PKG_VER).lib \
-	helper/sp-helper.lib \
-	widgets/sp-widgets.lib \
-	dialogs/sp-dialogs.lib \
-	display/sp-display.lib \
-	modules/sp-modules.lib \
-
-
-PKG_LINK = \
-	$(SODIPODI_LIBS) \
-	$(GLIB_LIBS) $(GTK2_LIBS) $(LIBART_LIBS) $(LIBXML2_LIBS) $(PNG_LIBS) \
-	$(INTL_LIBS) \
-	$(POPT_LIBS) \
-	$(GNOME_PRINT_LIBS) \
-
-
-sodipodilib_src = \
-	macros.h \
-	forward.h \
-	enums.h \
-	attributes.c \
-	attributes.h \
-	sp-object.c \
-	sp-object.h \
-	sp-object-repr.c \
-	sp-object-repr.h \
-	sp-object-group.c \
-	sp-object-group.h \
-	sp-defs.c \
-	sp-defs.h \
-	sp-item.c \
-	sp-item.h \
-	sp-item-group.c \
-	sp-item-group.h \
-	sp-symbol.c \
-	sp-symbol.h \
-	sp-marker.c \
-	sp-marker.h \
-	sp-use.c \
-	sp-use.h \
-	sp-anchor.c \
-	sp-anchor.h \
-	sp-root.c \
-	sp-root.h \
-	sp-namedview.c \
-	sp-namedview.h \
-	sp-guide.c \
-	sp-guide.h \
-	sp-image.c \
-	sp-image.h \
-	sp-path.c \
-	sp-path.h \
-	sp-shape.c \
-	sp-shape.h \
-	sp-rect.c \
-	sp-rect.h \
-	sp-ellipse.c \
-	sp-ellipse.h \
-	sp-star.c \
-	sp-star.h \
-	sp-spiral.c \
-	sp-spiral.h \
-	sp-line.c \
-	sp-line.h \
-	sp-polyline.c \
-	sp-polyline.h \
-	sp-polygon.c \
-	sp-polygon.h \
-	sp-chars.c \
-	sp-chars.h \
-	sp-text.c \
-	sp-text.h \
-	sp-paint-server.c \
-	sp-paint-server.h \
-	sp-gradient.c \
-	sp-gradient.h \
-	sp-pattern.c \
-	sp-pattern.h \
-	sp-clippath.c \
-	sp-clippath.h \
-	sp-mask.c \
-	sp-mask.h \
-	sp-animation.c \
-	sp-animation.h \
-	color.c \
-	color.h \
-	style.c \
-	style.h \
-	document.c \
-	document.h \
-	document-private.h \
-	document-undo.c \
-	uri-references.c \
-	uri-references.h \
-	extension.h
-
-sodipodi_private_libs = \
-	$(spproglibs) \
-	dialogs/libspdialogs.a \
-	xml/libspxml.a \
-	svg/libspsvg.a \
-	widgets/libspwidgets.a \
-	display/libspdisplay.a \
-	helper/libspchelp.a \
-	libnrtype/libnrtype.a \
-	libnr/libnr.a \
-	libnrtype/libnrtype.a \
-	$(module_libs)
-
-EXTRA_DIST = \
-	brokenimage.xpm
-
-module_src = \
-	module.c module.h
-
-OBJECTS = \
-	sodipodi.obj \
-	view.obj \
-	svg-view.obj \
-	selection.obj \
-	desktop.obj \
-	desktop-events.obj \
-	desktop-handles.obj \
-	desktop-affine.obj \
-	desktop-snap.obj \
-	sp-metrics.obj \
-	toolbox.obj \
-	verbs.obj \
-	shortcuts.obj \
-	event-context.obj \
-	seltrans-handles.obj \
-	seltrans.obj \
-	select-context.obj \
-	node-context.obj \
-	nodepath.obj \
-	knotholder.obj \
-	rect-context.obj \
-	arc-context.obj \
-	star-context.obj \
-	spiral-context.obj \
-	draw-context.obj \
-	dyna-draw-context.obj \
-	text-context.obj \
-	zoom-context.obj \
-	dropper-context.obj \
-	knot.obj \
-	main.obj \
-	help.obj \
-	sp-cursor.obj \
-	dir-util.obj \
-	rubberband.obj \
-	event-broker.obj \
-	path-chemistry.obj \
-	selection-chemistry.obj \
-	gradient-chemistry.obj \
-	sp-item-transform.obj \
-	file.obj \
-	print.obj \
-	interface.obj \
-	slideshow.obj \
-	\
-	document.obj \
-	document-undo.obj \
-	sp-gradient.obj \
-	sp-text.obj \
-	sp-item.obj \
-	sp-item-group.obj \
-	sp-object.obj \
-	style.obj \
-	color.obj \
-	sp-ellipse.obj \
-	sp-chars.obj \
-	sp-mask.obj \
-	sp-clippath.obj \
-	uri-references.obj \
-	sp-anchor.obj \
-	sp-object-repr.obj \
-	module.obj \
-	sp-paint-server.obj \
-	attributes.obj \
-	sp-pattern.obj \
-	sp-polygon.obj \
-	sp-polyline.obj \
-	sp-line.obj \
-	sp-image.obj \
-	sp-defs.obj \
-	sp-animation.obj \
-	sp-marker.obj \
-	sp-symbol.obj \
-	sp-use.obj \
-	sp-namedview.obj \
-	sp-shape.obj \
-	sp-spiral.obj \
-	sp-object-group.obj \
-	sp-rect.obj \
-	sp-path.obj \
-	sp-star.obj \
-	sp-guide.obj \
-	sp-root.obj \
-	\
-	winmain.obj
-
 all : \
 	$(PRJ_TOP)\config.h \
-	sub-all \
-	$(PACKAGE).exe
+	sub-all
 
 #LDFLAGS = /link $(LINKDEBUG) /subsystem:windows /machine:ix86
 LINKDEBUG = $(LINKDEBUG) /nodefaultlib:msvcrt
@@ -253,4 +38,4 @@ $(PACKAGE).exe : $(OBJECTS) $(SODIPODI_LIBS) $(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) $<
diff --git a/src/config.h.win32 b/src/config.h.win32
deleted file mode 100644
index 90acbe1..0000000
--- a/src/config.h.win32
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Empty config.h
- */
-
-#ifndef WIN32
-#define WIN32
-#endif
- 
-#undef GTK_ENABLE_BROKEN
-
-#define M_SQRT1_2 0.707
-#ifndef M_PI
-#define M_PI 3.1415927
-#endif
-#define M_PI_2 1.57
-#define M_PI_4 0.785
-
-#define VERSION "0.32win"
-#define SODIPODI_VERSION VERSION
-
-#define SODIPODI_GLADEDIR "./glade"
-#define SODIPODI_PIXMAPDIR SODIPODI_GLADEDIR
-#define SODIPODI_EXTENSIONDIR "./extensions"
-#define SODIPODI_EXTENSIONDATADIR SODIPODI_EXTENSIONDIR
-
-
-
-
diff --git a/src/display/makefile.msc b/src/display/makefile.msc
index 12618fa..de4a13a 100644
--- a/src/display/makefile.msc
+++ b/src/display/makefile.msc
@@ -1,7 +1,7 @@
 TOP = ..\..\..
 PRJ_TOP = ..\..
 PACKAGE = sp-display
-PKG_VER = 0.32
+PKG_VER = 0.35
 !INCLUDE $(TOP)\glib\build\win32\make.msc
 
 PKG_CFLAGS = \
@@ -11,6 +11,14 @@ PKG_CFLAGS = \
 	-I..\
 	$(GLIB_CFLAGS) $(LIBART_CFLAGS) $(GTK2_CFLAGS)
 
+PKG_LINK = \
+	../libarikkei/libarikkei-$(PKG_VER).lib \
+	../libnr/libnr-$(PKG_VER).lib \
+	../libnrtype/libnrtype-$(PKG_VER).lib \
+	\
+	$(GLIB_LIBS) \
+	$(LIBART_LIBS) 
+
 OBJECTS = \
 	nr-arena.obj \
 	nr-arena-item.obj \
@@ -22,7 +30,8 @@ OBJECTS = \
 
 all : \
 	$(PRJ_TOP)\config.h \
-	$(PACKAGE).lib
+	$(PACKAGE).lib \
+	$(PACKAGE)-$(PKG_VER).dll
 
 
 $(PRJ_TOP)\config.h: $(PRJ_TOP)\config.h.win32
diff --git a/src/helper/makefile.msc b/src/helper/makefile.msc
index 35a6357..31b0fb1 100644
--- a/src/helper/makefile.msc
+++ b/src/helper/makefile.msc
@@ -1,7 +1,7 @@
 TOP = ..\..\..
 PRJ_TOP = ..\..
 PACKAGE = sp-helper
-PKG_VER = 0.32
+PKG_VER = 0.35
 !INCLUDE $(TOP)\glib\build\win32\make.msc
 
 PKG_CFLAGS = \
@@ -48,8 +48,7 @@ sp-marshal.c : sp-marshal.list sp-marshal.h
 all : \
 	$(PRJ_TOP)\config.h \
 	$(PACKAGE).lib \
-# sp_shortcut_run missing
-#	$(PACKAGE)-$(PKG_VER).dll
+	$(PACKAGE)-$(PKG_VER).dll
 
 
 $(PRJ_TOP)\config.h: $(PRJ_TOP)\config.h.win32
diff --git a/src/libarikkei/libarikkei.def b/src/libarikkei/libarikkei.def
new file mode 100644
index 0000000..f9fc4ae
--- /dev/null
+++ b/src/libarikkei/libarikkei.def
@@ -0,0 +1,19 @@
+EXPORTS
+	arikkei_dict_insert
+	arikkei_dict_lookup
+	arikkei_dict_setup_string
+	arikkei_dtoa_exp
+	arikkei_dtoa_simple
+	arikkei_itoa
+	arikkei_mmap
+	arikkei_munmap
+	arikkei_strtod_exp
+	arikkei_strtod_simple
+	arikkei_token_set_from_string
+	arikkei_token_strcmp
+	arikkei_token_strncpy
+	arikkei_token_tokenize_ws
+	arikkei_ucs2_strlen
+	arikkei_ucs2_strncpy
+	arikkei_ucs2_utf8_strdup
+	arikkei_utf8_ucs2_strdup
diff --git a/src/libarikkei/makefile.msc b/src/libarikkei/makefile.msc
new file mode 100644
index 0000000..f20c892
--- /dev/null
+++ b/src/libarikkei/makefile.msc
@@ -0,0 +1,44 @@
+TOP = ..\..\..
+PRJ_TOP = ..\..
+PACKAGE = libarikkei
+PKG_VER = 0.35
+!INCLUDE $(TOP)\glib\build\win32\make.msc
+
+OBJECTS = \
+	arikkei-dict.obj \
+	arikkei-iolib.obj \
+	arikkei-strlib.obj \
+	arikkei-token.obj \
+
+PKG_CFLAGS = \
+	-DWIN32 \
+	-FImsvc_recommended_pragmas.h \
+	-I.. \
+	$(GLIB_CFLAGS) $(LIBXML2_CFLAGS)
+
+PKG_LINK = \
+	$(GLIB_LIBS) $(LIBXML2_LIBS)
+
+all : \
+	$(PRJ_TOP)\config.h \
+	$(PACKAGE).lib \
+	$(PACKAGE)-$(PKG_VER).dll
+
+
+$(PRJ_TOP)\config.h: $(PRJ_TOP)\config.h.win32
+	copy $(PRJ_TOP)\config.h.win32 $(PRJ_TOP)\config.h
+
+RESOURCE = $(PACKAGE).res
+
+$(PACKAGE).lib : $(OBJECTS)
+	lib /out:$(PACKAGE).lib $(OBJECTS)
+
+$(PACKAGE)-$(PKG_VER).dll : $(OBJECTS) $(PACKAGE).def
+	$(CC) $(CFLAGS) -LD -Fe$(PACKAGE)-$(PKG_VER).dll $(OBJECTS) $(PKG_LINK) user32.lib advapi32.lib wsock32.lib $(LDFLAGS) /def:$(PACKAGE).def
+
+$(PACKAGE).exe : $(OBJECTS) $(PACKAGE).def $(PACKAGE).res
+	$(CC) $(CFLAGS) -Fe$(PACKAGE).exe $(PACKAGE).res $(OBJECTS) $(PKG_LINK) \
+	user32.lib advapi32.lib shell32.lib wsock32.lib winspool.lib $(LDFLAGS) /def:$(PACKAGE).def
+
+.c.obj :
+	$(CC) $(CFLAGS) -GD -c $(PKG_CFLAGS) $<
diff --git a/src/libnr/makefile.msc b/src/libnr/makefile.msc
index f182e8f..c0b567d 100644
--- a/src/libnr/makefile.msc
+++ b/src/libnr/makefile.msc
@@ -10,6 +10,9 @@ PKG_CFLAGS = \
 	-FImsvc_recommended_pragmas.h \
 	$(GLIB_CFLAGS) $(LIBART_CFLAGS)
 
+PKG_LINK = \
+	$(LIBART_LIBS)
+
 OBJECTS = \
 	nr-values.obj \
 	nr-matrix.obj \
diff --git a/src/libnrtype/libnrtype.def b/src/libnrtype/libnrtype.def
index 82d5261..095e99a 100644
--- a/src/libnrtype/libnrtype.def
+++ b/src/libnrtype/libnrtype.def
@@ -35,7 +35,7 @@ EXPORTS
 	nr_type_directory_lookup_fuzzy
 	nr_type_directory_style_list_get
 	nr_type_empty_build_def
-	nr_type_ft2_build_def
+;	nr_type_ft2_build_def
 ;	nr_type_gnome_build_def
 ;	nr_type_gnome_families_get
 ;	nr_type_gnome_typefaces_get
@@ -46,7 +46,7 @@ EXPORTS
 ;	nr_type_xft_typefaces_get
 	nr_typeface_attribute_get
 	nr_typeface_family_name_get
-	nr_typeface_ft2_get_type
+;	nr_typeface_ft2_get_type
 	nr_typeface_get_type
 	nr_typeface_glyph_advance_get
 	nr_typeface_glyph_outline_get
diff --git a/src/libnrtype/makefile.msc b/src/libnrtype/makefile.msc
index 97ecee6..920be6e 100644
--- a/src/libnrtype/makefile.msc
+++ b/src/libnrtype/makefile.msc
@@ -4,7 +4,7 @@ PACKAGE = libnrtype
 PKG_VER = 0.35
 !INCLUDE $(TOP)\glib\build\win32\make.msc
 
-SUBDIRS = cp
+SUBDIRS = #?cp
 
 sub-all:
 	for %d in ($(SUBDIRS)) do nmake -nologo -f makefile.msc sub-one THIS=%d
@@ -19,13 +19,15 @@ PKG_CFLAGS = \
 	-FImsvc_recommended_pragmas.h \
 	-I$(PRJ_TOP) -I.. \
 	-I..\
-	$(GLIB_CFLAGS) $(LIBART_CFLAGS) $(FREETYPE2_CFLAGS)
+	$(GLIB_CFLAGS) $(LIBART_CFLAGS) \
+#	$(FREETYPE2_CFLAGS)
 
 PKG_LINK = \
-	cp/sp-cp.lib \
+#	cp/sp-cp.lib \
 	../libnr/libnr-$(PKG_VER).lib \
 	..\libarikkei\libarikkei-$(PKG_VER).lib \
-	$(GLIB_LIBS) $(LIBART_LIBS) $(FREETYPE2_LIBS) \
+	$(GLIB_LIBS) $(LIBART_LIBS) \
+#	$(FREETYPE2_LIBS) \
 	gdi32.lib
 
 # LDFLAGS = $(LDFLAGS)  /nodefaultlib:libcmt
@@ -57,13 +59,13 @@ OBJECTS = \
 	nr-font.obj \
 	nr-rasterfont.obj \
 	nr-type-directory.obj \
-	nr-type-ft2.obj \
+#	nr-type-ft2.obj \
 	nr-type-w32.obj \
 	nr-glyphs.obj \
 
 all : \
 	$(PRJ_TOP)\config.h \
-	sub-all \
+#	sub-all \
 	$(PACKAGE).lib \
 	$(PACKAGE)-$(PKG_VER).dll
 
diff --git a/src/makefile.msc b/src/makefile.msc
index c1e1026..021aa11 100644
--- a/src/makefile.msc
+++ b/src/makefile.msc
@@ -14,6 +14,16 @@ sub-one:
 	nmake -nologo -f makefile.msc
 	cd ..
 
+clean :: sub-all-clean
+
+sub-all-clean:
+	for %d in ($(SUBDIRS)) do @nmake -nologo -f makefile.msc sub-one-clean THIS=%d
+
+sub-one-clean:
+	@cd $(THIS)
+	@nmake -nologo -f makefile.msc clean
+	@cd ..
+
 PKG_CFLAGS = \
 	-DLIBNR_LIBART -DHAVE_CONFIG_H \
 	-DWIN32 \
diff --git a/src/xml/sp-xml.def b/src/xml/sp-xml.def
new file mode 100644
index 0000000..0ca8dd1
--- /dev/null
+++ b/src/xml/sp-xml.def
@@ -0,0 +1,66 @@
+EXPORTS 
+	sp_repr_add_child
+	sp_repr_add_listener
+	sp_repr_append_child
+	sp_repr_attr_get_first
+	sp_repr_attr_get_key
+	sp_repr_attr_get_next
+	sp_repr_attr_get_value
+	sp_repr_begin_transaction
+	sp_repr_change_order
+	sp_repr_coalesce_log
+	sp_repr_commit_undoable
+	sp_repr_compare_position
+	sp_repr_css_attr
+	sp_repr_css_attr_inherited
+	sp_repr_css_attr_new
+	sp_repr_css_attr_unref
+	sp_repr_css_change
+	sp_repr_css_change_recursive
+	sp_repr_css_property
+	sp_repr_css_set
+	sp_repr_css_set_property
+	sp_repr_doc_get_root
+	sp_repr_doc_merge
+	sp_repr_doc_new
+	sp_repr_doc_new_from_file
+	sp_repr_doc_new_from_mem
+	sp_repr_doc_unref
+	sp_repr_doc_write_file
+	sp_repr_duplicate
+	sp_repr_free_log
+	sp_repr_get_attr
+	sp_repr_get_boolean
+	sp_repr_get_children
+	sp_repr_get_content
+	sp_repr_get_doc
+	sp_repr_get_double
+	sp_repr_get_int
+	sp_repr_get_name
+	sp_repr_get_next
+	sp_repr_get_parent
+	sp_repr_is_cdata
+	sp_repr_is_element
+	sp_repr_is_text
+	sp_repr_lookup_child
+	sp_repr_lookup_child_by_name
+	sp_repr_merge
+	sp_repr_n_children
+	sp_repr_new
+	sp_repr_new_text
+	sp_repr_ref
+	sp_repr_remove_child
+	sp_repr_remove_listener_by_data
+	sp_repr_replay_log
+	sp_repr_rollback
+	sp_repr_set_attr
+	sp_repr_set_attr_recursive
+	sp_repr_set_boolean
+	sp_repr_set_content
+	sp_repr_set_double
+	sp_repr_set_int
+	sp_repr_set_position_absolute
+	sp_repr_undo_log
+	sp_repr_unparent
+	sp_repr_unref
+	sp_xml_document_createTextNode
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]