Index: configure.in
===================================================================
RCS file: /cvs/gnome/criawips/configure.in,v
retrieving revision 1.94
diff -u -r1.94 configure.in
--- configure.in	26 Nov 2006 15:00:19 -0000	1.94
+++ configure.in	28 Nov 2006 22:57:38 -0000
@@ -259,6 +259,7 @@
   src/rendering/Makefile
   src/utils/Makefile
   src/widgets/Makefile
+  src/win32/Makefile
   test/Makefile
 ])
 
Index: copy-src/ccc/Makefile.am
===================================================================
RCS file: /cvs/gnome/criawips/copy-src/ccc/Makefile.am,v
retrieving revision 1.11
diff -u -r1.11 Makefile.am
--- copy-src/ccc/Makefile.am	26 Nov 2006 15:00:25 -0000	1.11
+++ copy-src/ccc/Makefile.am	28 Nov 2006 22:57:38 -0000
@@ -53,12 +53,12 @@
 	-I$(srcdir)/..		\
 	$(NULL)
 
-cc-marshallers.h: $(srcdir)/marshallers.list $(srcdir)/Makefile
+cc-marshallers.h: $(srcdir)/marshallers.list Makefile
 	@( $(GLIB_GENMARSHAL) --header --prefix=cc_marshal $< ) > xgen-mh \
 	&& (cmp -s xgen-mh $@ || (echo "Creating $@..."; cp xgen-mh $@) ) \
 	&& rm -f xgen-mh
 
-cc-marshallers.c: $(srcdir)/marshallers.list $(srcdir)/Makefile
+cc-marshallers.c: $(srcdir)/marshallers.list Makefile
 	@( echo "#include \"cc-marshallers.h\""; \
 	   $(GLIB_GENMARSHAL) --body --prefix=cc_marshal $< ) > xgen-mc \
 	&& (cmp -s xgen-mc $@ || (echo "Creating $@..."; cp xgen-mc $@) ) \
Index: doc/reference/Makefile.am
===================================================================
RCS file: /cvs/gnome/criawips/doc/reference/Makefile.am,v
retrieving revision 1.4
diff -u -r1.4 Makefile.am
--- doc/reference/Makefile.am	24 Nov 2006 14:39:18 -0000	1.4
+++ doc/reference/Makefile.am	28 Nov 2006 22:57:38 -0000
@@ -68,7 +68,7 @@
 	$(top_builddir)/src/utils/libcriawips-utils.la		\
 	$(top_builddir)/src/widgets/libcriawips-widgets.la	\
 	$(top_builddir)/src/libcria-gui.la			\
-	$(top_builddir)/src/libcria-app.la			\
+	$(top_builddir)/src/libcriawips-app.la			\
 	$(NULL)
 
 publish: all
Index: src/Makefile.am
===================================================================
RCS file: /cvs/gnome/criawips/src/Makefile.am,v
retrieving revision 1.91
diff -u -r1.91 Makefile.am
--- src/Makefile.am	26 Nov 2006 15:00:27 -0000	1.91
+++ src/Makefile.am	28 Nov 2006 22:57:39 -0000
@@ -4,12 +4,17 @@
 ## toplevel source directory) to create a Makefile.in which will be used to
 ## create a Makefile by executing the configure script
 
+if PLATFORM_WIN32
+no_undefined = -no-undefined
+endif
+
 NULL	=
 
 SUBDIRS = \
 	code-templates					\
 	cut-n-paste					\
 	utils						\
+	win32						\
 	dom						\
 	helpers						\
 	io						\
@@ -17,8 +22,10 @@
 	widgets						\
 	$(NULL)
 
+lib_LTLIBRARIES=\
+	libcriawips-app.la				\
+	$(NULL)
 noinst_LTLIBRARIES=\
-	libcria-app.la					\
 	libcria-gui.la					\
 	$(NULL)
 
@@ -52,17 +59,16 @@
 	$(CANVAS_LIBS)					\
 	$(NULL)
 libcria_gui_la_LDFLAGS=\
-	-Wl,--no-undefined				\
 	$(NULL)
 
-libcria_app_la_SOURCES=\
+libcriawips_app_la_SOURCES=\
 	application.c		application.h		\
 	$(NULL)
-libcria_app_la_LIBADD=\
-	libcria-gui.la		$(libcria_gui_la_LIBADD)\
+libcriawips_app_la_LDFLAGS=\
+	$(no_undefined)					\
 	$(NULL)
-libcria_app_la_LDFLAGS=\
-	-Wl,--no-undefined				\
+libcriawips_app_la_LIBADD=\
+	libcria-gui.la	                                \
 	$(NULL)
 
 criawips_SOURCES = \
@@ -76,7 +82,7 @@
 	rendering/libcriawips-rendering.la		\
 	utils/libcriawips-utils.la			\
 	libcria-gui.la		$(libcria_gui_la_LIBADD)\
-	libcria-app.la		$(libcria_app_la_LIBADD)\
+	libcriawips-app.la  $(libcriawips_app_la_LIBADD)\
 	io/libcriawips-io.la				\
 	$(NULL)
 
Index: src/dom/Makefile.am
===================================================================
RCS file: /cvs/gnome/criawips/src/dom/Makefile.am,v
retrieving revision 1.17
diff -u -r1.17 Makefile.am
--- src/dom/Makefile.am	26 Nov 2006 15:00:29 -0000	1.17
+++ src/dom/Makefile.am	28 Nov 2006 22:57:39 -0000
@@ -6,6 +6,9 @@
 
 if PLATFORM_WIN32
 no_undefined = -no-undefined
+WIN32_BOOTSTRAP_LIBS=\
+	../win32/libcriawips-io.la \
+	$(NULL)
 endif
 
 NULL=
@@ -68,16 +71,18 @@
 	cria-theme-view.h	\
 	$(NULL)
 libcriawips_dom_la_LDFLAGS=\
-	$(no_undefined)         \
+	$(no_undefined)		\
 	$(NULL)
 libcriawips_dom_la_LIBADD=\
-	$(CORE_LIBS)		\
-	../utils/libcriawips-utils.la \
-	../../copy-src/cdebug/libcdebug.la \
+	$(OBJECT_LIBS)					\
+	$(WIN32_BOOTSTRAP_LIBS)				\
+	../utils/libcriawips-utils.la			\
+	$(top_builddir)/copy-src/cdebug/libcdebug.la	\
 	$(NULL)
 INCLUDES=\
 	-I$(top_srcdir)/copy-src\
 	-I$(srcdir)/..		\
+	-I..			\
 	$(GUI_CFLAGS)		\
 	$(CORE_CFLAGS)		\
 	$(NULL)
@@ -94,12 +99,12 @@
 	&& (cmp -s xgen-gtbc $@ || (echo "Creating $@..."; cp xgen-gtbc $@) ) \
 	&& rm -f xgen-gtbc
 
-cria-marshallers.h: $(srcdir)/marshallers.list $(srcdir)/Makefile
+cria-marshallers.h: $(srcdir)/marshallers.list Makefile
 	@( $(GLIB_GENMARSHAL) --header --prefix=cria_marshal $< ) > xgen-cmh \
 	&& (cmp -s xgen-cmh $@ || (echo "Creating $@..."; cp xgen-cmh $@) ) \
 	&& rm -f xgen-cmh
 
-cria-marshallers.c: $(srcdir)/marshallers.list $(srcdir)/Makefile
+cria-marshallers.c: $(srcdir)/marshallers.list Makefile
 	@( echo "#include <dom/cria-marshallers.h>"; \
 	   $(GLIB_GENMARSHAL) --body --prefix=cria_marshal $< ) > xgen-cmc \
 	&& (cmp -s xgen-cmc $@ || (echo "Creating $@..."; cp xgen-cmc $@) ) \
Index: src/io/Makefile.am
===================================================================
RCS file: /cvs/gnome/criawips/src/io/Makefile.am,v
retrieving revision 1.3
diff -u -r1.3 Makefile.am
--- src/io/Makefile.am	26 Nov 2006 15:00:30 -0000	1.3
+++ src/io/Makefile.am	28 Nov 2006 22:57:39 -0000
@@ -21,11 +21,14 @@
 	cria-presentation-writer.h \
 	$(NULL)
 libcriawips_io_la_LDFLAGS=\
-	$(no_undefined)         \
+	$(no_undefined)		\
 	$(NULL)
 libcriawips_io_la_LIBADD=\
-	$(IO_LIBS)		\
-	../../copy-src/cdebug/libcdebug.la \
+	$(IO_LIBS)					\
+	$(OBJECT_LIBS)					\
+	../dom/libcriawips-dom.la			\
+	../utils/libcriawips-utils.la			\
+	$(top_builddir)/copy-src/cdebug/libcdebug.la	\
 	$(NULL)
 INCLUDES=\
 	-I$(top_srcdir)/copy-src\
Index: src/rendering/Makefile.am
===================================================================
RCS file: /cvs/gnome/criawips/src/rendering/Makefile.am,v
retrieving revision 1.17
diff -u -r1.17 Makefile.am
--- src/rendering/Makefile.am	24 Nov 2006 14:57:46 -0000	1.17
+++ src/rendering/Makefile.am	28 Nov 2006 22:57:39 -0000
@@ -4,6 +4,13 @@
 ## toplevel source directory) to create a Makefile.in which will be used to
 ## create a Makefile by executing the configure script
 
+if PLATFORM_WIN32
+no_undefined = -no-undefined
+WIN32_BOOTSTRAP_LIBS=\
+	../win32/libcriawips-app.la \
+	$(NULL)
+endif
+
 NULL=
 
 lib_LTLIBRARIES=\
@@ -33,15 +40,24 @@
 	cria-slide-renderer.h	\
 	cria-slide-renderer-priv.h \
 	$(NULL)
+libcriawips_rendering_la_LDFLAGS=\
+	$(no_undefined)		\
+	$(NULL)
 libcriawips_rendering_la_LIBADD=\
-	../dom/libcriawips-dom.la \
-	$(RENDER_LIBS)		\
+	$(RENDER_LIBS)					\
+	$(WIN32_BOOTSTRAP_LIBS)				\
+	../dom/libcriawips-dom.la			\
+	../helpers/libcria-helpers.la			\
+	../utils/libcriawips-utils.la			\
+	$(top_builddir)/copy-src/ccc/libccc.la		\
+	$(top_builddir)/copy-src/cdebug/libcdebug.la	\
 	$(NULL)
 
 INCLUDES=\
 	-I$(srcdir)/..		\
 	-I$(srcdir)/../cut-n-paste\
 	-I$(top_srcdir)/copy-src\
+	-I..			\
 	$(RENDER_CFLAGS)	\
 	$(NULL)
 
Index: src/utils/Makefile.am
===================================================================
RCS file: /cvs/gnome/criawips/src/utils/Makefile.am,v
retrieving revision 1.7
diff -u -r1.7 Makefile.am
--- src/utils/Makefile.am	26 Nov 2006 15:00:30 -0000	1.7
+++ src/utils/Makefile.am	28 Nov 2006 22:57:39 -0000
@@ -21,11 +21,11 @@
 	cria-units.c		\
 	$(NULL)
 libcriawips_utils_la_LDFLAGS=\
-	$(no_undefined)         \
+	$(no_undefined)		\
 	$(NULL)
 libcriawips_utils_la_LIBADD=\
 	$(CORE_LIBS)		\
-	../../copy-src/cdebug/libcdebug.la \
+	$(top_builddir)/copy-src/cdebug/libcdebug.la \
 	$(NULL)
 INCLUDES=\
 	-I$(srcdir)/..		\
Index: src/widgets/Makefile.am
===================================================================
RCS file: /cvs/gnome/criawips/src/widgets/Makefile.am,v
retrieving revision 1.12
diff -u -r1.12 Makefile.am
--- src/widgets/Makefile.am	5 Nov 2005 20:00:32 -0000	1.12
+++ src/widgets/Makefile.am	28 Nov 2006 22:57:40 -0000
@@ -10,6 +10,13 @@
 DOC_H_FILE=credit-docs.h
 DOC_H_DOCS=$(top_srcdir)/help/user-guide/C/criawips-manual.xml
 
+if PLATFORM_WIN32
+no_undefined = -no-undefined
+WIN32_BOOTSTRAP_LIBS=\
+	../win32/libcriawips-app.la \
+	$(NULL)
+endif
+
 NULL=
 
 lib_LTLIBRARIES=\
@@ -61,9 +68,18 @@
 	cria-title-bar.c	\
 	cria-title-bar.h	\
 	$(NULL)
-
+libcriawips_widgets_la_LDFLAGS=\
+	$(no_undefined)		\
+	$(NULL)
 libcriawips_widgets_la_LIBADD=\
-	$(GUI_LIBS)			\
+	$(GUI_LIBS)					\
+	$(WIN32_BOOTSTRAP_LIBS)				\
+	../rendering/libcriawips-rendering.la		\
+	../io/libcriawips-io.la				\
+	../dom/libcriawips-dom.la			\
+	../cut-n-paste/libcria-cutnpaste.la		\
+	$(top_builddir)/copy-src/ccc/libccc.la		\
+	$(top_builddir)/copy-src/cdebug/libcdebug.la	\
 	$(NULL)
 
 credit-authors.h: $(top_srcdir)/AUTHORS Makefile
Index: src/widgets/cria-main-window.c
===================================================================
RCS file: /cvs/gnome/criawips/src/widgets/cria-main-window.c,v
retrieving revision 1.37
diff -u -r1.37 cria-main-window.c
--- src/widgets/cria-main-window.c	24 Nov 2006 14:39:21 -0000	1.37
+++ src/widgets/cria-main-window.c	28 Nov 2006 22:57:43 -0000
@@ -36,7 +36,6 @@
 #include <stdint.h>
 
 #include <glib/gi18n.h>
-#include <gdk/gdkx.h>
 #include <gtk/gtk.h>
 #include <libgnomeui/libgnomeui.h>
 #include <libgnomevfs/gnome-vfs-ops.h>
@@ -1266,11 +1265,9 @@
 	geometry = cria_application_get_default_geometry();
 
 	if(geometry && geometry[0] != '\0') {
-		XParseGeometry(geometry, &x, &y, &w, &h);
-		gtk_window_set_default_size(GTK_WINDOW(self), w, h);
-		gtk_widget_show(GTK_WIDGET(self));
-		gtk_window_move(GTK_WINDOW(self), x, y);
+		gtk_window_parse_geometry(GTK_WINDOW(self), geometry);
 		g_free(geometry);
+		gtk_widget_show(GTK_WIDGET(self));
 	} else {
 		w = 400;
 		h = 300;
