Renamed glibmm target to glibmm-2.4d.dll (Debug) and glibmm-2.4.dll

2004-12-08 Cedric Gustin <cedric.gustin@swing.be> * MSVC_Net2003/*/*.vcproj: Renamed glibmm target to glibmm-2.4d.dll (Debug) and glibmm-2.4.dll (Release). * MSVC_Net2003/glibmm/Makefile.am: copy glibmmconfig.h from $(top_srcdir)/glibmm at build time. glibmmconfig.h removed from CVS.
author: Cedric Gustin <cedric.gustin@swing.be> 2004-12-08 07:31:38 +0000
committer: Cedric Gustin <gustin@src.gnome.org> 2004-12-08 07:31:38 +0000
commit: 32374c01dc44c6b2046083e2d2cfd8c6eb430571 (patch)
tree: bd63d807bf0c859c6e88d1346c1884d304260c21
parent: bf439faaaa469e94d8a9dae3b84d62de4ac7f334 (diff)
download: glibmm-32374c01dc44c6b2046083e2d2cfd8c6eb430571.tar.gz
8 files changed, 29 insertions, 89 deletions
diff --git a/ChangeLog b/ChangeLog
index 452fff9f..216cd719 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-12-08  Cedric Gustin <cedric.gustin@swing.be>
+
+	* MSVC_Net2003/*/*.vcproj: Renamed glibmm target to
+	glibmm-2.4d.dll (Debug) and glibmm-2.4.dll (Release). 
+	* MSVC_Net2003/glibmm/Makefile.am: copy glibmmconfig.h from
+	$(top_srcdir)/glibmm at build time. glibmmconfig.h removed from CVS.
+
 2004-11-23  Tim Shead  <tshead@k-3d.com>
 
 	* Disabled annoying 64-bit portability warnings for MSVC build
diff --git a/MSVC_Net2003/examples/dispatcher/dispatcher.vcproj b/MSVC_Net2003/examples/dispatcher/dispatcher.vcproj
index 15bb71c7..f346b711 100755
--- a/MSVC_Net2003/examples/dispatcher/dispatcher.vcproj
+++ b/MSVC_Net2003/examples/dispatcher/dispatcher.vcproj
@@ -34,7 +34,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="gthread-2.0.lib sigc.lib"
+				AdditionalDependencies="gthread-2.0.lib sigc-2.0d.lib"
 				OutputFile="$(OutDir)/dispatcher.exe"
 				LinkIncremental="2"
 				GenerateDebugInformation="TRUE"
@@ -82,7 +82,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="gthread-2.0.lib sigc.lib"
+				AdditionalDependencies="gthread-2.0.lib sigc-2.0.lib"
 				OutputFile="$(OutDir)/dispatcher.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="TRUE"
diff --git a/MSVC_Net2003/examples/dispatcher2/dispatcher2.vcproj b/MSVC_Net2003/examples/dispatcher2/dispatcher2.vcproj
index 156f6241..d67c3d9d 100755
--- a/MSVC_Net2003/examples/dispatcher2/dispatcher2.vcproj
+++ b/MSVC_Net2003/examples/dispatcher2/dispatcher2.vcproj
@@ -33,7 +33,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="gthread-2.0.lib sigc.lib"
+				AdditionalDependencies="gthread-2.0.lib sigc-2.0d.lib"
 				OutputFile="$(OutDir)/dispatcher2.exe"
 				LinkIncremental="2"
 				GenerateDebugInformation="TRUE"
@@ -81,7 +81,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="gthread-2.0.lib sigc.lib"
+				AdditionalDependencies="gthread-2.0.lib sigc-2.0.lib"
 				OutputFile="$(OutDir)/dispatcher2.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="TRUE"
diff --git a/MSVC_Net2003/examples/thread/thread.vcproj b/MSVC_Net2003/examples/thread/thread.vcproj
index 13364a43..e8f5540e 100755
--- a/MSVC_Net2003/examples/thread/thread.vcproj
+++ b/MSVC_Net2003/examples/thread/thread.vcproj
@@ -33,7 +33,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="gthread-2.0.lib sigc.lib"
+				AdditionalDependencies="gthread-2.0.lib sigc-2.0d.lib"
 				OutputFile="$(OutDir)/thread.exe"
 				LinkIncremental="2"
 				GenerateDebugInformation="TRUE"
@@ -81,7 +81,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="gthread-2.0.lib sigc.lib"
+				AdditionalDependencies="gthread-2.0.lib sigc-2.0.lib"
 				OutputFile="$(OutDir)/thread.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="TRUE"
diff --git a/MSVC_Net2003/examples/thread_pool/thread_pool.vcproj b/MSVC_Net2003/examples/thread_pool/thread_pool.vcproj
index 163a736f..c9236ce8 100755
--- a/MSVC_Net2003/examples/thread_pool/thread_pool.vcproj
+++ b/MSVC_Net2003/examples/thread_pool/thread_pool.vcproj
@@ -33,7 +33,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="gthread-2.0.lib sigc.lib"
+				AdditionalDependencies="gthread-2.0.lib sigc-2.0d.lib"
 				OutputFile="$(OutDir)/thread_pool.exe"
 				LinkIncremental="2"
 				GenerateDebugInformation="TRUE"
@@ -81,7 +81,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="gthread-2.0.lib sigc.lib"
+				AdditionalDependencies="gthread-2.0.lib sigc-2.0.lib"
 				OutputFile="$(OutDir)/thread_pool.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="TRUE"
diff --git a/MSVC_Net2003/glibmm/Makefile.am b/MSVC_Net2003/glibmm/Makefile.am
index 5a93e847..a3c47681 100644
--- a/MSVC_Net2003/glibmm/Makefile.am
+++ b/MSVC_Net2003/glibmm/Makefile.am
@@ -1 +1,8 @@
+BUILT_SOURCES = glibmmconfig.h
+
+MAINTAINERCLEANFILES = $(built_sources)
+
 EXTRA_DIST = glibmmconfig.h glibmm.vcproj
+
+glibmmconfig.h: $(top_srcdir)/glib/glibmmconfig.h
+	cp -f $< $@
diff --git a/MSVC_Net2003/glibmm/glibmm.vcproj b/MSVC_Net2003/glibmm/glibmm.vcproj
index 4cf7a85b..dc0d4e10 100755
--- a/MSVC_Net2003/glibmm/glibmm.vcproj
+++ b/MSVC_Net2003/glibmm/glibmm.vcproj
@@ -34,7 +34,8 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="glib-2.0.lib gobject-2.0.lib gmodule-2.0.lib sigc.lib"
+				AdditionalDependencies="glib-2.0.lib gobject-2.0.lib gmodule-2.0.lib sigc-2.0d.lib"
+				OutputFile="$(OutDir)/$(ProjectName)d.dll"
 				ModuleDefinitionFile="$(TargetName).def"
 				GenerateDebugInformation="TRUE"/>
 			<Tool
@@ -46,7 +47,8 @@
 			<Tool
 				Name="VCPreLinkEventTool"
 				Description="Generate glibmm def file"
-				CommandLine="$(SolutionDir)gendef\debug\gendef $(TargetName).def $(TargetFileName) $(IntDir)\*.obj"/>
+				CommandLine="$(SolutionDir)gendef\debug\gendef $(TargetName).def $(TargetFileName) $(IntDir)\*.obj"
+				ExcludedFromBuild="FALSE"/>
 			<Tool
 				Name="VCResourceCompilerTool"/>
 			<Tool
@@ -80,7 +82,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="glib-2.0.lib gobject-2.0.lib gmodule-2.0.lib sigc.lib"
+				AdditionalDependencies="glib-2.0.lib gobject-2.0.lib gmodule-2.0.lib sigc-2.0.lib"
 				ModuleDefinitionFile="$(TargetName).def"/>
 			<Tool
 				Name="VCMIDLTool"/>
@@ -91,7 +93,8 @@
 			<Tool
 				Name="VCPreLinkEventTool"
 				Description="Generate glibmm def file"
-				CommandLine="$(SolutionDir)gendef\release\gendef $(TargetName).def $(TargetFileName) $(IntDir)\*.obj"/>
+				CommandLine="$(SolutionDir)gendef\release\gendef $(TargetName).def $(TargetFileName) $(IntDir)\*.obj"
+				ExcludedFromBuild="FALSE"/>
 			<Tool
 				Name="VCResourceCompilerTool"/>
 			<Tool
diff --git a/MSVC_Net2003/glibmm/glibmmconfig.h b/MSVC_Net2003/glibmm/glibmmconfig.h
deleted file mode 100644
index 5016480a..00000000
--- a/MSVC_Net2003/glibmm/glibmmconfig.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/* glib/glibmmconfig.h.  Generated by configure.  */
-#ifndef _GLIBMM_CONFIG_H
-#define _GLIBMM_CONFIG_H 1
-
-/* version numbers */
-#define GLIBMM_MAJOR_VERSION 2
-#define GLIBMM_MINOR_VERSION 4
-#define GLIBMM_MICRO_VERSION 5
-
-// detect common platforms
-#if defined(_WIN32)
-// Win32 compilers have a lot of varation
-#if defined(_MSC_VER)
-#define GLIBMM_MSC
-#define GLIBMM_WIN32
-#define GLIBMM_DLL
-#elif defined(__CYGWIN__)
-#define GLIBMM_CONFIGURE
-#elif defined(__MINGW32__)
-#define GLIBMM_WIN32
-#define GLIBMM_CONFIGURE
-#else
-#warning "Unknown architecture (send me gcc --dumpspecs or equiv)"
-#endif
-#else
-#define GLIBMM_CONFIGURE
-#endif /* _WIN32 */
-
-#ifdef GLIBMM_CONFIGURE
-/* compiler feature tests that are used during compile time and run-time
-   by gtk-- only. tests used by gdk-- and gtk-- should go into
-   gdk--config.h.in */
-/* #undef GLIBMM_CXX_HAVE_MUTABLE */
-/* #undef GLIBMM_CXX_HAVE_NAMESPACES */
-//#undef GLIBMM_CXX_GAUB
-//#undef GLIBMM_CXX_AMBIGUOUS_TEMPLATES
-#define GLIBMM_HAVE_NAMESPACE_STD 1
-#define GLIBMM_HAVE_STD_ITERATOR_TRAITS 1
-/* #undef GLIBMM_HAVE_SUN_REVERSE_ITERATOR */
-#define GLIBMM_HAVE_TEMPLATE_SEQUENCE_CTORS 1, Defined if the STL containers have templated sequence ctors
-#define GLIBMM_HAVE_DISAMBIGUOUS_CONST_TEMPLATE_SPECIALIZATIONS 1
-/* #undef GLIBMM_COMPILER_SUN_FORTE */
-/* #undef GLIBMM_DEBUG_REFCOUNTING */
-#endif
-
-#ifdef GLIBMM_MSC
-  #define GLIBMM_CXX_HAVE_MUTABLE
-  #define GLIBMM_CXX_HAVE_NAMESPACES
-  #define GLIBMM_HAVE_NAMESPACE_STD 1
-  #define GLIBMM_HAVE_STD_ITERATOR_TRAITS 1
-  #define GLIBMM_HAVE_TEMPLATE_SEQUENCE_CTORS 1, Defined if the STL containers have templated sequence ctors
-  #define GLIBMM_HAVE_DISAMBIGUOUS_CONST_TEMPLATE_SPECIALIZATIONS 1
-  #pragma warning (disable: 4786 4355 4800 4181)
-#endif
-
-#ifndef GLIBMM_HAVE_NAMESPACE_STD
-#  define GLIBMM_USING_STD(Symbol) namespace std { using ::Symbol; }
-#else
-#  define GLIBMM_USING_STD(Symbol) /* empty */
-#endif
-
-#ifdef GLIBMM_DLL
-  #if defined(GLIBMM_BUILD) && defined(_WINDLL)
-    /* Do not dllexport as it is handled by gendef on MSVC */
-    #define GLIBMM_API
-  #elif !defined(GLIBMM_BUILD)
-    #define GLIBMM_API __declspec(dllimport)
-  #else
-    /* Build a static library */
-    #define GLIBMM_API
-  #endif /* GLIBMM_BUILD - _WINDLL */
-#else
-  #define GLIBMM_API
-#endif /* GLIBMM_DLL */
-
-#endif /* _GLIBMM_CONFIG_H */
-
author	Cedric Gustin <cedric.gustin@swing.be>	2004-12-08 07:31:38 +0000
committer	Cedric Gustin <gustin@src.gnome.org>	2004-12-08 07:31:38 +0000
commit	32374c01dc44c6b2046083e2d2cfd8c6eb430571 (patch)
tree	bd63d807bf0c859c6e88d1346c1884d304260c21
parent	bf439faaaa469e94d8a9dae3b84d62de4ac7f334 (diff)
download	glibmm-32374c01dc44c6b2046083e2d2cfd8c6eb430571.tar.gz