GNOME.org
 

[sodipodi] build: switch msvc/win32 build to single configuration file

commit 56a0a361152b4f9af8a1853540dce3576df95f31
Author: Hans Breuer <hans breuer org>
Date:   Fri Oct 5 14:30:52 2012 +0200

    build: switch msvc/win32 build to single configuration file
    
    sp-make.msc is included by all the other makefile.msc and
    contains information typically changed globally, e.g. version
    and placement of the glib build directory

 makefile.msc                |   13 +++++++++++--
 sp-make.msc                 |    2 ++
 src/dialogs/makefile.msc    |    3 +--
 src/display/makefile.msc    |    5 ++---
 src/helper/makefile.msc     |    5 ++---
 src/libarikkei/makefile.msc |    3 +--
 src/libnr/makefile.msc      |    3 +--
 src/libnrtype/makefile.msc  |    3 +--
 src/makefile.msc            |    5 ++---
 src/modules/makefile.msc    |    3 +--
 src/svg/makefile.msc        |    3 +--
 src/widgets/makefile.msc    |    3 +--
 src/xml/makefile.msc        |    3 +--
 13 files changed, 27 insertions(+), 27 deletions(-)
---
diff --git a/makefile.msc b/makefile.msc
index e9e8e5f..0ca66be 100644
--- a/makefile.msc
+++ b/makefile.msc
@@ -1,8 +1,7 @@
 TOP = ..
 PRJ_TOP = .
 PACKAGE = sodipodi
-PKG_VER = 0.35
-!INCLUDE $(TOP)\glib\build\win32\make.msc
+!INCLUDE $(PRJ_TOP)\sp-make.msc
 
 SUBDIRS = src
 
@@ -14,6 +13,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 ..
+
 all : \
 	$(PRJ_TOP)\config.h \
 	sub-all
diff --git a/sp-make.msc b/sp-make.msc
new file mode 100644
index 0000000..261db2c
--- /dev/null
+++ b/sp-make.msc
@@ -0,0 +1,2 @@
+PKG_VER = 0.35
+!INCLUDE $(TOP)\glib-2\build\win32\make.msc
diff --git a/src/dialogs/makefile.msc b/src/dialogs/makefile.msc
index a577265..fd9364a 100644
--- a/src/dialogs/makefile.msc
+++ b/src/dialogs/makefile.msc
@@ -1,8 +1,7 @@
 TOP = ..\..\..
 PRJ_TOP = ..\..
 PACKAGE = sp-dialogs
-PKG_VER = 0.32
-!INCLUDE $(TOP)\glib\build\win32\make.msc
+!INCLUDE $(PRJ_TOP)\sp-make.msc
 
 PKG_CFLAGS = \
 	-FImsvc_recommended_pragmas.h \
diff --git a/src/display/makefile.msc b/src/display/makefile.msc
index de4a13a..ba2810a 100644
--- a/src/display/makefile.msc
+++ b/src/display/makefile.msc
@@ -1,8 +1,7 @@
 TOP = ..\..\..
 PRJ_TOP = ..\..
 PACKAGE = sp-display
-PKG_VER = 0.35
-!INCLUDE $(TOP)\glib\build\win32\make.msc
+!INCLUDE $(PRJ_TOP)\sp-make.msc
 
 PKG_CFLAGS = \
 	-DLIBNR_LIBART -DHAVE_CONFIG_H \
@@ -31,7 +30,7 @@ OBJECTS = \
 all : \
 	$(PRJ_TOP)\config.h \
 	$(PACKAGE).lib \
-	$(PACKAGE)-$(PKG_VER).dll
+#	$(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 31b0fb1..638fbd0 100644
--- a/src/helper/makefile.msc
+++ b/src/helper/makefile.msc
@@ -1,8 +1,7 @@
 TOP = ..\..\..
 PRJ_TOP = ..\..
 PACKAGE = sp-helper
-PKG_VER = 0.35
-!INCLUDE $(TOP)\glib\build\win32\make.msc
+!INCLUDE $(PRJ_TOP)\sp-make.msc
 
 PKG_CFLAGS = \
 	-DWIN32 -DLIBNR_LIBART \
@@ -48,7 +47,7 @@ sp-marshal.c : sp-marshal.list sp-marshal.h
 all : \
 	$(PRJ_TOP)\config.h \
 	$(PACKAGE).lib \
-	$(PACKAGE)-$(PKG_VER).dll
+#	$(PACKAGE)-$(PKG_VER).dll
 
 
 $(PRJ_TOP)\config.h: $(PRJ_TOP)\config.h.win32
diff --git a/src/libarikkei/makefile.msc b/src/libarikkei/makefile.msc
index f20c892..56a68ed 100644
--- a/src/libarikkei/makefile.msc
+++ b/src/libarikkei/makefile.msc
@@ -1,8 +1,7 @@
 TOP = ..\..\..
 PRJ_TOP = ..\..
 PACKAGE = libarikkei
-PKG_VER = 0.35
-!INCLUDE $(TOP)\glib\build\win32\make.msc
+!INCLUDE $(PRJ_TOP)\sp-make.msc
 
 OBJECTS = \
 	arikkei-dict.obj \
diff --git a/src/libnr/makefile.msc b/src/libnr/makefile.msc
index c0b567d..8fcb5f0 100644
--- a/src/libnr/makefile.msc
+++ b/src/libnr/makefile.msc
@@ -1,8 +1,7 @@
 TOP = ..\..\..
 PRJ_TOP = ..\..
 PACKAGE = libnr
-PKG_VER = 0.35
-!INCLUDE $(TOP)\glib\build\win32\make.msc
+!INCLUDE $(PRJ_TOP)\sp-make.msc
 
 PKG_CFLAGS = \
 	-DLIBNR_LIBART \
diff --git a/src/libnrtype/makefile.msc b/src/libnrtype/makefile.msc
index 920be6e..ff64895 100644
--- a/src/libnrtype/makefile.msc
+++ b/src/libnrtype/makefile.msc
@@ -1,8 +1,7 @@
 TOP = ..\..\..
 PRJ_TOP = ..\..
 PACKAGE = libnrtype
-PKG_VER = 0.35
-!INCLUDE $(TOP)\glib\build\win32\make.msc
+!INCLUDE $(PRJ_TOP)\sp-make.msc
 
 SUBDIRS = #?cp
 
diff --git a/src/makefile.msc b/src/makefile.msc
index 021aa11..3dafe36 100644
--- a/src/makefile.msc
+++ b/src/makefile.msc
@@ -1,8 +1,7 @@
 TOP = ..\..
 PRJ_TOP = ..
 PACKAGE = sodipodi
-PKG_VER = 0.35
-!INCLUDE $(TOP)\glib\build\win32\make.msc
+!INCLUDE $(PRJ_TOP)\sp-make.msc
 
 SUBDIRS = libarikkei libnr libnrtype xml svg helper widgets dialogs display modules $(module_subdirs)
 
@@ -47,7 +46,7 @@ SODIPODI_LIBS = \
 
 PKG_LINK = \
 	$(SODIPODI_LIBS) \
-	$(GLIB_LIBS) $(GTK2_LIBS) $(LIBART_LIBS) $(LIBXML2_LIBS) $(PNG_LIBS) \
+	$(GLIB_LIBS) $(GTK2_LIBS) $(GDK_PIXBUF_LIBS) $(LIBART_LIBS) $(LIBXML2_LIBS) $(PNG_LIBS) \
 	$(INTL_LIBS) \
 	$(POPT_LIBS) \
 	$(GNOME_PRINT_LIBS) \
diff --git a/src/modules/makefile.msc b/src/modules/makefile.msc
index 2dec39f..4f61110 100644
--- a/src/modules/makefile.msc
+++ b/src/modules/makefile.msc
@@ -1,8 +1,7 @@
 TOP = ..\..\..
 PRJ_TOP = ..\..
 PACKAGE = sp-modules
-PKG_VER = 0.35
-!INCLUDE $(TOP)\glib\build\win32\make.msc
+!INCLUDE $(PRJ_TOP)\sp-make.msc
 
 PKG_CFLAGS = \
 	-DWIN32 -DLIBNR_LIBART -I.. \
diff --git a/src/svg/makefile.msc b/src/svg/makefile.msc
index 936c3b6..b874506 100644
--- a/src/svg/makefile.msc
+++ b/src/svg/makefile.msc
@@ -1,8 +1,7 @@
 TOP = ..\..\..
 PRJ_TOP = ..\..
 PACKAGE = sp-svg
-PKG_VER = 0.35
-!INCLUDE $(TOP)\glib\build\win32\make.msc
+!INCLUDE $(PRJ_TOP)\sp-make.msc
 
 PKG_CFLAGS = \
 	-FImsvc_recommended_pragmas.h \
diff --git a/src/widgets/makefile.msc b/src/widgets/makefile.msc
index ac113d7..6ca7b07 100644
--- a/src/widgets/makefile.msc
+++ b/src/widgets/makefile.msc
@@ -1,8 +1,7 @@
 TOP = ..\..\..
 PRJ_TOP = ..\..
 PACKAGE = sp-widgets
-PKG_VER = 0.32
-!INCLUDE $(TOP)\glib\build\win32\make.msc
+!INCLUDE $(PRJ_TOP)\sp-make.msc
 
 PKG_CFLAGS = \
 	-FImsvc_recommended_pragmas.h \
diff --git a/src/xml/makefile.msc b/src/xml/makefile.msc
index 4cfffc9..95946bc 100644
--- a/src/xml/makefile.msc
+++ b/src/xml/makefile.msc
@@ -1,8 +1,7 @@
 TOP = ..\..\..
 PRJ_TOP = ..\..
 PACKAGE = sp-xml
-PKG_VER = 0.35
-!INCLUDE $(TOP)\glib\build\win32\make.msc
+!INCLUDE $(PRJ_TOP)\sp-make.msc
 
 OBJECTS = \
 	repr.obj \
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]