From 6b354052e433ccfbb69534b801cb0ac1462ad9d5 Mon Sep 17 00:00:00 2001 From: Armin Burgmeier Date: Wed, 8 Oct 2008 16:10:20 +0000 Subject: Adapt to the new MSVC++ DLL naming convention. 2008-10-08 Armin Burgmeier * MSVC_Net2005/examples/dispatcher2/dispatcher2.vcproj: * MSVC_Net2005/examples/dispatcher/dispatcher.vcproj: * MSVC_Net2005/examples/options/options.vcproj: * MSVC_Net2005/examples/thread/thread.vcproj: * MSVC_Net2005/examples/thread_pool/thread_pool.vcproj: * MSVC_Net2005/giomm/giomm.vcproj: * MSVC_Net2005/glibmm/glibmm.vcproj: Adapt to the new MSVC++ DLL naming convention. * MSVC_Net2008/: Added MSVC 2008 project files. * configure.in: * Makefile.am: Add the new files to the build. svn path=/trunk/; revision=736 --- ChangeLog | 16 + MSVC_Net2005/examples/dispatcher/dispatcher.vcproj | 4 +- .../examples/dispatcher2/dispatcher2.vcproj | 4 +- MSVC_Net2005/examples/options/options.vcproj | 4 +- MSVC_Net2005/examples/thread/thread.vcproj | 4 +- .../examples/thread_pool/thread_pool.vcproj | 4 +- MSVC_Net2005/giomm/giomm.vcproj | 7 +- MSVC_Net2005/glibmm/glibmm.vcproj | 7 +- MSVC_Net2008/Makefile.am | 3 + MSVC_Net2008/blank.cpp | 11 + MSVC_Net2008/examples/Makefile.am | 3 + MSVC_Net2008/examples/dispatcher/Makefile.am | 1 + MSVC_Net2008/examples/dispatcher/dispatcher.vcproj | 212 +++++++ MSVC_Net2008/examples/dispatcher2/Makefile.am | 1 + .../examples/dispatcher2/dispatcher2.vcproj | 211 +++++++ MSVC_Net2008/examples/markup/Makefile.am | 1 + MSVC_Net2008/examples/markup/markup.vcproj | 211 +++++++ MSVC_Net2008/examples/options/Makefile.am | 1 + MSVC_Net2008/examples/options/options.vcproj | 212 +++++++ MSVC_Net2008/examples/thread/Makefile.am | 1 + MSVC_Net2008/examples/thread/thread.vcproj | 211 +++++++ MSVC_Net2008/examples/thread_pool/Makefile.am | 1 + .../examples/thread_pool/thread_pool.vcproj | 211 +++++++ MSVC_Net2008/gendef/Makefile.am | 2 + MSVC_Net2008/gendef/gendef.cc | 94 +++ MSVC_Net2008/gendef/gendef.vcproj | 205 +++++++ MSVC_Net2008/giomm/Makefile.am | 12 + MSVC_Net2008/giomm/giomm.rc.in | 71 +++ MSVC_Net2008/giomm/giomm.vcproj | 496 ++++++++++++++++ MSVC_Net2008/glibmm.sln | 110 ++++ MSVC_Net2008/glibmm/Makefile.am | 12 + MSVC_Net2008/glibmm/glibmm.rc.in | 71 +++ MSVC_Net2008/glibmm/glibmm.vcproj | 652 +++++++++++++++++++++ MSVC_Net2008/tests/Makefile.am | 4 + MSVC_Net2008/tests/giomm_simple/Makefile.am | 1 + .../tests/giomm_simple/giomm_simple.vcproj | 210 +++++++ MSVC_Net2008/tests/glibmm_value/Makefile.am | 1 + .../tests/glibmm_value/glibmm_value.vcproj | 214 +++++++ Makefile.am | 2 +- configure.in | 17 + 40 files changed, 3498 insertions(+), 17 deletions(-) create mode 100644 MSVC_Net2008/Makefile.am create mode 100644 MSVC_Net2008/blank.cpp create mode 100644 MSVC_Net2008/examples/Makefile.am create mode 100644 MSVC_Net2008/examples/dispatcher/Makefile.am create mode 100644 MSVC_Net2008/examples/dispatcher/dispatcher.vcproj create mode 100644 MSVC_Net2008/examples/dispatcher2/Makefile.am create mode 100644 MSVC_Net2008/examples/dispatcher2/dispatcher2.vcproj create mode 100644 MSVC_Net2008/examples/markup/Makefile.am create mode 100644 MSVC_Net2008/examples/markup/markup.vcproj create mode 100644 MSVC_Net2008/examples/options/Makefile.am create mode 100644 MSVC_Net2008/examples/options/options.vcproj create mode 100644 MSVC_Net2008/examples/thread/Makefile.am create mode 100644 MSVC_Net2008/examples/thread/thread.vcproj create mode 100644 MSVC_Net2008/examples/thread_pool/Makefile.am create mode 100644 MSVC_Net2008/examples/thread_pool/thread_pool.vcproj create mode 100644 MSVC_Net2008/gendef/Makefile.am create mode 100644 MSVC_Net2008/gendef/gendef.cc create mode 100644 MSVC_Net2008/gendef/gendef.vcproj create mode 100644 MSVC_Net2008/giomm/Makefile.am create mode 100644 MSVC_Net2008/giomm/giomm.rc.in create mode 100644 MSVC_Net2008/giomm/giomm.vcproj create mode 100644 MSVC_Net2008/glibmm.sln create mode 100644 MSVC_Net2008/glibmm/Makefile.am create mode 100644 MSVC_Net2008/glibmm/glibmm.rc.in create mode 100644 MSVC_Net2008/glibmm/glibmm.vcproj create mode 100644 MSVC_Net2008/tests/Makefile.am create mode 100644 MSVC_Net2008/tests/giomm_simple/Makefile.am create mode 100644 MSVC_Net2008/tests/giomm_simple/giomm_simple.vcproj create mode 100644 MSVC_Net2008/tests/glibmm_value/Makefile.am create mode 100644 MSVC_Net2008/tests/glibmm_value/glibmm_value.vcproj diff --git a/ChangeLog b/ChangeLog index 6bc67078..cc863a13 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,19 @@ +2008-10-08 Armin Burgmeier + + * MSVC_Net2005/examples/dispatcher2/dispatcher2.vcproj: + * MSVC_Net2005/examples/dispatcher/dispatcher.vcproj: + * MSVC_Net2005/examples/options/options.vcproj: + * MSVC_Net2005/examples/thread/thread.vcproj: + * MSVC_Net2005/examples/thread_pool/thread_pool.vcproj: + * MSVC_Net2005/giomm/giomm.vcproj: + * MSVC_Net2005/glibmm/glibmm.vcproj: Adapt to the new MSVC++ DLL + naming convention. + + * MSVC_Net2008/: Added MSVC 2008 project files. + + * configure.in: + * Makefile.am: Add the new files to the build. + 2008-10-04 Jonathon Jongsma * gio/src/error.hg: add a workaround for the HOST_NOT_FOUND symbol diff --git a/MSVC_Net2005/examples/dispatcher/dispatcher.vcproj b/MSVC_Net2005/examples/dispatcher/dispatcher.vcproj index e98dcf33..ee18b05b 100755 --- a/MSVC_Net2005/examples/dispatcher/dispatcher.vcproj +++ b/MSVC_Net2005/examples/dispatcher/dispatcher.vcproj @@ -63,7 +63,7 @@ /> @@ -136,7 +136,8 @@ /> diff --git a/MSVC_Net2008/Makefile.am b/MSVC_Net2008/Makefile.am new file mode 100644 index 00000000..4a9d1852 --- /dev/null +++ b/MSVC_Net2008/Makefile.am @@ -0,0 +1,3 @@ +SUBDIRS = gendef glibmm giomm examples tests + +EXTRA_DIST = blank.cpp glibmm.sln README diff --git a/MSVC_Net2008/blank.cpp b/MSVC_Net2008/blank.cpp new file mode 100644 index 00000000..98feb663 --- /dev/null +++ b/MSVC_Net2008/blank.cpp @@ -0,0 +1,11 @@ +// This file may very well be the most annoying workaround of all time. +// It is included here to simplify working with glibmm using the +// MSVC IDE. +// +// This file is included in all of the MSVC projects to force the +// IDE to display the C/C++ property pages for editing. Apparently, +// the MSVC IDE does not recognize .cc files as C++ source code, even +// though the compiler does! +// +// Tim Shead, tshead@k-3d.com +// 10/12/2004 diff --git a/MSVC_Net2008/examples/Makefile.am b/MSVC_Net2008/examples/Makefile.am new file mode 100644 index 00000000..7e882e1d --- /dev/null +++ b/MSVC_Net2008/examples/Makefile.am @@ -0,0 +1,3 @@ +SUBDIRS = dispatcher dispatcher2 markup options thread thread_pool + + diff --git a/MSVC_Net2008/examples/dispatcher/Makefile.am b/MSVC_Net2008/examples/dispatcher/Makefile.am new file mode 100644 index 00000000..b73bc99c --- /dev/null +++ b/MSVC_Net2008/examples/dispatcher/Makefile.am @@ -0,0 +1 @@ +EXTRA_DIST = dispatcher.vcproj diff --git a/MSVC_Net2008/examples/dispatcher/dispatcher.vcproj b/MSVC_Net2008/examples/dispatcher/dispatcher.vcproj new file mode 100644 index 00000000..df72ac56 --- /dev/null +++ b/MSVC_Net2008/examples/dispatcher/dispatcher.vcproj @@ -0,0 +1,212 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/MSVC_Net2008/examples/dispatcher2/Makefile.am b/MSVC_Net2008/examples/dispatcher2/Makefile.am new file mode 100644 index 00000000..8aafacb7 --- /dev/null +++ b/MSVC_Net2008/examples/dispatcher2/Makefile.am @@ -0,0 +1 @@ +EXTRA_DIST = dispatcher2.vcproj diff --git a/MSVC_Net2008/examples/dispatcher2/dispatcher2.vcproj b/MSVC_Net2008/examples/dispatcher2/dispatcher2.vcproj new file mode 100644 index 00000000..020e320a --- /dev/null +++ b/MSVC_Net2008/examples/dispatcher2/dispatcher2.vcproj @@ -0,0 +1,211 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/MSVC_Net2008/examples/markup/Makefile.am b/MSVC_Net2008/examples/markup/Makefile.am new file mode 100644 index 00000000..de7bc5f7 --- /dev/null +++ b/MSVC_Net2008/examples/markup/Makefile.am @@ -0,0 +1 @@ +EXTRA_DIST = markup.vcproj diff --git a/MSVC_Net2008/examples/markup/markup.vcproj b/MSVC_Net2008/examples/markup/markup.vcproj new file mode 100644 index 00000000..f3e5f1a1 --- /dev/null +++ b/MSVC_Net2008/examples/markup/markup.vcproj @@ -0,0 +1,211 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/MSVC_Net2008/examples/options/Makefile.am b/MSVC_Net2008/examples/options/Makefile.am new file mode 100644 index 00000000..91d27e51 --- /dev/null +++ b/MSVC_Net2008/examples/options/Makefile.am @@ -0,0 +1 @@ +EXTRA_DIST = options.vcproj diff --git a/MSVC_Net2008/examples/options/options.vcproj b/MSVC_Net2008/examples/options/options.vcproj new file mode 100644 index 00000000..ee303e04 --- /dev/null +++ b/MSVC_Net2008/examples/options/options.vcproj @@ -0,0 +1,212 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/MSVC_Net2008/examples/thread/Makefile.am b/MSVC_Net2008/examples/thread/Makefile.am new file mode 100644 index 00000000..93a41289 --- /dev/null +++ b/MSVC_Net2008/examples/thread/Makefile.am @@ -0,0 +1 @@ +EXTRA_DIST = thread.vcproj diff --git a/MSVC_Net2008/examples/thread/thread.vcproj b/MSVC_Net2008/examples/thread/thread.vcproj new file mode 100644 index 00000000..4d2deba7 --- /dev/null +++ b/MSVC_Net2008/examples/thread/thread.vcproj @@ -0,0 +1,211 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/MSVC_Net2008/examples/thread_pool/Makefile.am b/MSVC_Net2008/examples/thread_pool/Makefile.am new file mode 100644 index 00000000..b0759e7c --- /dev/null +++ b/MSVC_Net2008/examples/thread_pool/Makefile.am @@ -0,0 +1 @@ +EXTRA_DIST = thread_pool.vcproj diff --git a/MSVC_Net2008/examples/thread_pool/thread_pool.vcproj b/MSVC_Net2008/examples/thread_pool/thread_pool.vcproj new file mode 100644 index 00000000..e10e0228 --- /dev/null +++ b/MSVC_Net2008/examples/thread_pool/thread_pool.vcproj @@ -0,0 +1,211 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/MSVC_Net2008/gendef/Makefile.am b/MSVC_Net2008/gendef/Makefile.am new file mode 100644 index 00000000..3a435c34 --- /dev/null +++ b/MSVC_Net2008/gendef/Makefile.am @@ -0,0 +1,2 @@ +EXTRA_DIST = gendef.vcproj gendef.cc + diff --git a/MSVC_Net2008/gendef/gendef.cc b/MSVC_Net2008/gendef/gendef.cc new file mode 100644 index 00000000..cf665604 --- /dev/null +++ b/MSVC_Net2008/gendef/gendef.cc @@ -0,0 +1,94 @@ +/* + * MICO --- an Open Source CORBA implementation + * Copyright (c) 2003 Harald Böhme + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * + * For more information, visit the MICO Home Page at + * http://www.mico.org/ + */ + +/* Modified by Cedric Gustin on 2006/01/13 : + * Redirect the output of dumpbin to dumpbin.out instead of reading the + * output stream of popen, as it fails with Visual Studio 2005 in + * pre-link build events. + */ + +#include +#include +#include + +using namespace std; + +int main(int argc,char** argv) +{ + if (argc < 4) { + cerr << "Usage: " << argv[0] << " ...." << endl; + return 2; + } + + // CG : Explicitly redirect stdout to dumpbin.out. + string dumpbin = "dumpbin /SYMBOLS /OUT:dumpbin.out"; + int i = 3; + + for(;i fct + def_file << " " << (s+1) << endl; + else + if(strchr(s,'?')!=0 && strncmp(s,"??_G",4)!=0 && strncmp(s,"??_E",4)!=0) { + def_file << " " << s << endl; + } + } + } + } + + // CG : Close dumpbin.out and delete it. + fclose(dump); + remove("dumpbin.out"); + + cout << dumpbin.c_str() << endl; +} diff --git a/MSVC_Net2008/gendef/gendef.vcproj b/MSVC_Net2008/gendef/gendef.vcproj new file mode 100644 index 00000000..6eb5578d --- /dev/null +++ b/MSVC_Net2008/gendef/gendef.vcproj @@ -0,0 +1,205 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/MSVC_Net2008/giomm/Makefile.am b/MSVC_Net2008/giomm/Makefile.am new file mode 100644 index 00000000..f7d10f9a --- /dev/null +++ b/MSVC_Net2008/giomm/Makefile.am @@ -0,0 +1,12 @@ +BUILT_SOURCES = giommconfig.h giomm.rc + +MAINTAINERCLEANFILES = $(built_sources) + +EXTRA_DIST = giommconfig.h giomm.vcproj giomm.rc + +# Copy config file generated by the configure script. Dependency is +# wht respect to the .h.in file, to prevent an error with 'make distcheck'. +# See http://sources.redhat.com/automake/automake.html#distcleancheck + +giommconfig.h: $(top_srcdir)/gio/giommconfig.h.in $(top_srcdir)/configure.in + cp -f $(top_builddir)/gio/giommconfig.h $@ diff --git a/MSVC_Net2008/giomm/giomm.rc.in b/MSVC_Net2008/giomm/giomm.rc.in new file mode 100644 index 00000000..0b979e68 --- /dev/null +++ b/MSVC_Net2008/giomm/giomm.rc.in @@ -0,0 +1,71 @@ + +#define APSTUDIO_READONLY_SYMBOLS + +#include + +#undef APSTUDIO_READONLY_SYMBOLS + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +#ifdef _WIN32 +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +#pragma code_page(1252) +#endif //_WIN32 + +#ifdef APSTUDIO_INVOKED + +1 TEXTINCLUDE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE +BEGIN + "#include ""afxres.h""\r\n" + "\0" +END + +3 TEXTINCLUDE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + +VS_VERSION_INFO VERSIONINFO + FILEVERSION @GLIBMM_MAJOR_VERSION@,@GLIBMM_MINOR_VERSION@,@GLIBMM_MICRO_VERSION@,1 + PRODUCTVERSION @GLIBMM_MAJOR_VERSION@,@GLIBMM_MINOR_VERSION@,@GLIBMM_MICRO_VERSION@,1 + FILEFLAGSMASK 0x17L +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x4L + FILETYPE 0x2L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "CompanyName", "The glibmm development team (see AUTHORS)" + VALUE "FileDescription", "The official C++ wrapper for gio" + VALUE "FileVersion", "@VERSION@" + VALUE "LegalCopyright", "Distribution is under the LGPL (see COPYING)" + VALUE "OriginalFilename", "giomm-2.4" + VALUE "ProductName", "giomm" + VALUE "ProductVersion", "@VERSION@" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END + +#endif // English (U.S.) resources + +#ifndef APSTUDIO_INVOKED + +#endif // not APSTUDIO_INVOKED diff --git a/MSVC_Net2008/giomm/giomm.vcproj b/MSVC_Net2008/giomm/giomm.vcproj new file mode 100644 index 00000000..53a8038e --- /dev/null +++ b/MSVC_Net2008/giomm/giomm.vcproj @@ -0,0 +1,496 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/MSVC_Net2008/glibmm.sln b/MSVC_Net2008/glibmm.sln new file mode 100644 index 00000000..4cecba69 --- /dev/null +++ b/MSVC_Net2008/glibmm.sln @@ -0,0 +1,110 @@ +Microsoft Visual Studio Solution File, Format Version 10.00 +# Visual Studio 2008 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glibmm-2.4", "glibmm\glibmm.vcproj", "{58B2B53C-C4FF-47FD-817B-095E45B7F7D4}" + ProjectSection(ProjectDependencies) = postProject + {07324745-C9BE-4D65-B08A-9C88188C0C28} = {07324745-C9BE-4D65-B08A-9C88188C0C28} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gendef", "gendef\gendef.vcproj", "{07324745-C9BE-4D65-B08A-9C88188C0C28}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "examples_markup", "examples\markup\markup.vcproj", "{6300FCFA-97F1-4967-802E-E354D95DB0EB}" + ProjectSection(ProjectDependencies) = postProject + {58B2B53C-C4FF-47FD-817B-095E45B7F7D4} = {58B2B53C-C4FF-47FD-817B-095E45B7F7D4} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tests_glibmm_value", "tests\glibmm_value\glibmm_value.vcproj", "{22277003-3228-486E-A6A8-994B8B13AF30}" + ProjectSection(ProjectDependencies) = postProject + {58B2B53C-C4FF-47FD-817B-095E45B7F7D4} = {58B2B53C-C4FF-47FD-817B-095E45B7F7D4} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "examples_thread", "examples\thread\thread.vcproj", "{5357AB2B-A5F9-463C-92D8-00357CCC3ECE}" + ProjectSection(ProjectDependencies) = postProject + {58B2B53C-C4FF-47FD-817B-095E45B7F7D4} = {58B2B53C-C4FF-47FD-817B-095E45B7F7D4} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "examples_thread_pool", "examples\thread_pool\thread_pool.vcproj", "{962484DB-2111-48A4-BEF0-194433719D0D}" + ProjectSection(ProjectDependencies) = postProject + {58B2B53C-C4FF-47FD-817B-095E45B7F7D4} = {58B2B53C-C4FF-47FD-817B-095E45B7F7D4} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "examples_dispatcher", "examples\dispatcher\dispatcher.vcproj", "{129ECC08-6D30-4884-B824-4AF96EF0A45C}" + ProjectSection(ProjectDependencies) = postProject + {58B2B53C-C4FF-47FD-817B-095E45B7F7D4} = {58B2B53C-C4FF-47FD-817B-095E45B7F7D4} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "examples_dispatcher2", "examples\dispatcher2\dispatcher2.vcproj", "{18A82706-B645-4DF5-AB09-06B90128BAC5}" + ProjectSection(ProjectDependencies) = postProject + {58B2B53C-C4FF-47FD-817B-095E45B7F7D4} = {58B2B53C-C4FF-47FD-817B-095E45B7F7D4} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "examples_options", "examples\options\options.vcproj", "{46962B9A-C5E9-4863-9408-97514D63F420}" + ProjectSection(ProjectDependencies) = postProject + {58B2B53C-C4FF-47FD-817B-095E45B7F7D4} = {58B2B53C-C4FF-47FD-817B-095E45B7F7D4} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "giomm-2.4", "giomm\giomm.vcproj", "{EE6C0430-C2C9-425C-8EBA-963FAC3E9832}" + ProjectSection(ProjectDependencies) = postProject + {58B2B53C-C4FF-47FD-817B-095E45B7F7D4} = {58B2B53C-C4FF-47FD-817B-095E45B7F7D4} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tests_giomm_simple", "tests\giomm_simple\giomm_simple.vcproj", "{F4F66980-51D4-4CC2-A529-9AD2C9F7D143}" + ProjectSection(ProjectDependencies) = postProject + {EE6C0430-C2C9-425C-8EBA-963FAC3E9832} = {EE6C0430-C2C9-425C-8EBA-963FAC3E9832} + {58B2B53C-C4FF-47FD-817B-095E45B7F7D4} = {58B2B53C-C4FF-47FD-817B-095E45B7F7D4} + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Release|Win32 = Release|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {58B2B53C-C4FF-47FD-817B-095E45B7F7D4}.Debug|Win32.ActiveCfg = Debug|Win32 + {58B2B53C-C4FF-47FD-817B-095E45B7F7D4}.Debug|Win32.Build.0 = Debug|Win32 + {58B2B53C-C4FF-47FD-817B-095E45B7F7D4}.Release|Win32.ActiveCfg = Release|Win32 + {58B2B53C-C4FF-47FD-817B-095E45B7F7D4}.Release|Win32.Build.0 = Release|Win32 + {07324745-C9BE-4D65-B08A-9C88188C0C28}.Debug|Win32.ActiveCfg = Debug|Win32 + {07324745-C9BE-4D65-B08A-9C88188C0C28}.Debug|Win32.Build.0 = Debug|Win32 + {07324745-C9BE-4D65-B08A-9C88188C0C28}.Release|Win32.ActiveCfg = Release|Win32 + {07324745-C9BE-4D65-B08A-9C88188C0C28}.Release|Win32.Build.0 = Release|Win32 + {6300FCFA-97F1-4967-802E-E354D95DB0EB}.Debug|Win32.ActiveCfg = Debug|Win32 + {6300FCFA-97F1-4967-802E-E354D95DB0EB}.Debug|Win32.Build.0 = Debug|Win32 + {6300FCFA-97F1-4967-802E-E354D95DB0EB}.Release|Win32.ActiveCfg = Release|Win32 + {6300FCFA-97F1-4967-802E-E354D95DB0EB}.Release|Win32.Build.0 = Release|Win32 + {22277003-3228-486E-A6A8-994B8B13AF30}.Debug|Win32.ActiveCfg = Debug|Win32 + {22277003-3228-486E-A6A8-994B8B13AF30}.Debug|Win32.Build.0 = Debug|Win32 + {22277003-3228-486E-A6A8-994B8B13AF30}.Release|Win32.ActiveCfg = Release|Win32 + {22277003-3228-486E-A6A8-994B8B13AF30}.Release|Win32.Build.0 = Release|Win32 + {5357AB2B-A5F9-463C-92D8-00357CCC3ECE}.Debug|Win32.ActiveCfg = Debug|Win32 + {5357AB2B-A5F9-463C-92D8-00357CCC3ECE}.Debug|Win32.Build.0 = Debug|Win32 + {5357AB2B-A5F9-463C-92D8-00357CCC3ECE}.Release|Win32.ActiveCfg = Release|Win32 + {5357AB2B-A5F9-463C-92D8-00357CCC3ECE}.Release|Win32.Build.0 = Release|Win32 + {962484DB-2111-48A4-BEF0-194433719D0D}.Debug|Win32.ActiveCfg = Debug|Win32 + {962484DB-2111-48A4-BEF0-194433719D0D}.Debug|Win32.Build.0 = Debug|Win32 + {962484DB-2111-48A4-BEF0-194433719D0D}.Release|Win32.ActiveCfg = Release|Win32 + {962484DB-2111-48A4-BEF0-194433719D0D}.Release|Win32.Build.0 = Release|Win32 + {129ECC08-6D30-4884-B824-4AF96EF0A45C}.Debug|Win32.ActiveCfg = Debug|Win32 + {129ECC08-6D30-4884-B824-4AF96EF0A45C}.Debug|Win32.Build.0 = Debug|Win32 + {129ECC08-6D30-4884-B824-4AF96EF0A45C}.Release|Win32.ActiveCfg = Release|Win32 + {129ECC08-6D30-4884-B824-4AF96EF0A45C}.Release|Win32.Build.0 = Release|Win32 + {18A82706-B645-4DF5-AB09-06B90128BAC5}.Debug|Win32.ActiveCfg = Debug|Win32 + {18A82706-B645-4DF5-AB09-06B90128BAC5}.Debug|Win32.Build.0 = Debug|Win32 + {18A82706-B645-4DF5-AB09-06B90128BAC5}.Release|Win32.ActiveCfg = Release|Win32 + {18A82706-B645-4DF5-AB09-06B90128BAC5}.Release|Win32.Build.0 = Release|Win32 + {46962B9A-C5E9-4863-9408-97514D63F420}.Debug|Win32.ActiveCfg = Debug|Win32 + {46962B9A-C5E9-4863-9408-97514D63F420}.Debug|Win32.Build.0 = Debug|Win32 + {46962B9A-C5E9-4863-9408-97514D63F420}.Release|Win32.ActiveCfg = Release|Win32 + {46962B9A-C5E9-4863-9408-97514D63F420}.Release|Win32.Build.0 = Release|Win32 + {EE6C0430-C2C9-425C-8EBA-963FAC3E9832}.Debug|Win32.ActiveCfg = Debug|Win32 + {EE6C0430-C2C9-425C-8EBA-963FAC3E9832}.Debug|Win32.Build.0 = Debug|Win32 + {EE6C0430-C2C9-425C-8EBA-963FAC3E9832}.Release|Win32.ActiveCfg = Release|Win32 + {EE6C0430-C2C9-425C-8EBA-963FAC3E9832}.Release|Win32.Build.0 = Release|Win32 + {F4F66980-51D4-4CC2-A529-9AD2C9F7D143}.Debug|Win32.ActiveCfg = Debug|Win32 + {F4F66980-51D4-4CC2-A529-9AD2C9F7D143}.Debug|Win32.Build.0 = Debug|Win32 + {F4F66980-51D4-4CC2-A529-9AD2C9F7D143}.Release|Win32.ActiveCfg = Release|Win32 + {F4F66980-51D4-4CC2-A529-9AD2C9F7D143}.Release|Win32.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/MSVC_Net2008/glibmm/Makefile.am b/MSVC_Net2008/glibmm/Makefile.am new file mode 100644 index 00000000..a0f8c416 --- /dev/null +++ b/MSVC_Net2008/glibmm/Makefile.am @@ -0,0 +1,12 @@ +BUILT_SOURCES = glibmmconfig.h glibmm.rc + +MAINTAINERCLEANFILES = $(built_sources) + +EXTRA_DIST = glibmmconfig.h glibmm.vcproj glibmm.rc + +# Copy config file generated by the configure script. Dependency is +# wht respect to the .h.in file, to prevent an error with 'make distcheck'. +# See http://sources.redhat.com/automake/automake.html#distcleancheck + +glibmmconfig.h: $(top_srcdir)/glib/glibmmconfig.h.in $(top_srcdir)/configure.in + cp -f $(top_builddir)/glib/glibmmconfig.h $@ diff --git a/MSVC_Net2008/glibmm/glibmm.rc.in b/MSVC_Net2008/glibmm/glibmm.rc.in new file mode 100644 index 00000000..a8487c94 --- /dev/null +++ b/MSVC_Net2008/glibmm/glibmm.rc.in @@ -0,0 +1,71 @@ + +#define APSTUDIO_READONLY_SYMBOLS + +#include + +#undef APSTUDIO_READONLY_SYMBOLS + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +#ifdef _WIN32 +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +#pragma code_page(1252) +#endif //_WIN32 + +#ifdef APSTUDIO_INVOKED + +1 TEXTINCLUDE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE +BEGIN + "#include ""afxres.h""\r\n" + "\0" +END + +3 TEXTINCLUDE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + +VS_VERSION_INFO VERSIONINFO + FILEVERSION @GLIBMM_MAJOR_VERSION@,@GLIBMM_MINOR_VERSION@,@GLIBMM_MICRO_VERSION@,1 + PRODUCTVERSION @GLIBMM_MAJOR_VERSION@,@GLIBMM_MINOR_VERSION@,@GLIBMM_MICRO_VERSION@,1 + FILEFLAGSMASK 0x17L +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x4L + FILETYPE 0x2L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "CompanyName", "The glibmm development team (see AUTHORS)" + VALUE "FileDescription", "The official C++ wrapper for glib" + VALUE "FileVersion", "@VERSION@" + VALUE "LegalCopyright", "Distribution is under the LGPL (see COPYING)" + VALUE "OriginalFilename", "glibmm-2.4" + VALUE "ProductName", "glibmm" + VALUE "ProductVersion", "@VERSION@" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END + +#endif // English (U.S.) resources + +#ifndef APSTUDIO_INVOKED + +#endif // not APSTUDIO_INVOKED diff --git a/MSVC_Net2008/glibmm/glibmm.vcproj b/MSVC_Net2008/glibmm/glibmm.vcproj new file mode 100644 index 00000000..ab3306d2 --- /dev/null +++ b/MSVC_Net2008/glibmm/glibmm.vcproj @@ -0,0 +1,652 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/MSVC_Net2008/tests/Makefile.am b/MSVC_Net2008/tests/Makefile.am new file mode 100644 index 00000000..a442a190 --- /dev/null +++ b/MSVC_Net2008/tests/Makefile.am @@ -0,0 +1,4 @@ +SUBDIRS = glibmm_value giomm_simple + + + diff --git a/MSVC_Net2008/tests/giomm_simple/Makefile.am b/MSVC_Net2008/tests/giomm_simple/Makefile.am new file mode 100644 index 00000000..db07adbc --- /dev/null +++ b/MSVC_Net2008/tests/giomm_simple/Makefile.am @@ -0,0 +1 @@ +EXTRA_DIST = giomm_simple.vcproj diff --git a/MSVC_Net2008/tests/giomm_simple/giomm_simple.vcproj b/MSVC_Net2008/tests/giomm_simple/giomm_simple.vcproj new file mode 100644 index 00000000..cc9c9fc5 --- /dev/null +++ b/MSVC_Net2008/tests/giomm_simple/giomm_simple.vcproj @@ -0,0 +1,210 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/MSVC_Net2008/tests/glibmm_value/Makefile.am b/MSVC_Net2008/tests/glibmm_value/Makefile.am new file mode 100644 index 00000000..d4f28507 --- /dev/null +++ b/MSVC_Net2008/tests/glibmm_value/Makefile.am @@ -0,0 +1 @@ +EXTRA_DIST = glibmm_value.vcproj diff --git a/MSVC_Net2008/tests/glibmm_value/glibmm_value.vcproj b/MSVC_Net2008/tests/glibmm_value/glibmm_value.vcproj new file mode 100644 index 00000000..2b49f48d --- /dev/null +++ b/MSVC_Net2008/tests/glibmm_value/glibmm_value.vcproj @@ -0,0 +1,214 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Makefile.am b/Makefile.am index f7a49016..335a2197 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ ACLOCAL_AMFLAGS = -I scripts -SUBDIRS = tools glib gio examples scripts tests MSVC_Net2005 docs +SUBDIRS = tools glib gio examples scripts tests MSVC_Net2005 MSVC_Net2008 docs DIST_SUBDIRS = $(SUBDIRS) EXTRA_DIST = build_shared/Makefile_build.am_fragment \ diff --git a/configure.in b/configure.in index d398736f..6f418407 100644 --- a/configure.in +++ b/configure.in @@ -345,6 +345,23 @@ AC_CONFIG_FILES([ MSVC_Net2005/tests/Makefile MSVC_Net2005/tests/glibmm_value/Makefile MSVC_Net2005/tests/giomm_simple/Makefile + + MSVC_Net2008/Makefile + MSVC_Net2008/gendef/Makefile + MSVC_Net2008/glibmm/Makefile + MSVC_Net2008/glibmm/glibmm.rc + MSVC_Net2008/giomm/Makefile + MSVC_Net2008/giomm/giomm.rc + MSVC_Net2008/examples/Makefile + MSVC_Net2008/examples/dispatcher/Makefile + MSVC_Net2008/examples/dispatcher2/Makefile + MSVC_Net2008/examples/markup/Makefile + MSVC_Net2008/examples/options/Makefile + MSVC_Net2008/examples/thread/Makefile + MSVC_Net2008/examples/thread_pool/Makefile + MSVC_Net2008/tests/Makefile + MSVC_Net2008/tests/glibmm_value/Makefile + MSVC_Net2008/tests/giomm_simple/Makefile ]) AC_OUTPUT() -- cgit v1.2.1