diff options
-rw-r--r-- | MSVC_NMake/compose.vcxproj (renamed from MSVC_Net2015/compose.vcxproj) | 0 | ||||
-rw-r--r-- | MSVC_NMake/compose.vcxproj.filters (renamed from MSVC_Net2015/compose.vcxproj.filters) | 0 | ||||
-rw-r--r-- | MSVC_NMake/dispatcher.vcxproj (renamed from MSVC_Net2015/dispatcher.vcxproj) | 0 | ||||
-rw-r--r-- | MSVC_NMake/dispatcher.vcxproj.filters (renamed from MSVC_Net2015/dispatcher.vcxproj.filters) | 0 | ||||
-rw-r--r-- | MSVC_NMake/dispatcher2.vcxproj (renamed from MSVC_Net2015/dispatcher2.vcxproj) | 0 | ||||
-rw-r--r-- | MSVC_NMake/dispatcher2.vcxproj.filters (renamed from MSVC_Net2015/dispatcher2.vcxproj.filters) | 0 | ||||
-rw-r--r-- | MSVC_NMake/filelist.am (renamed from MSVC_Net2015/filelist.am) | 0 | ||||
-rw-r--r-- | MSVC_NMake/gendef.vcxproj (renamed from MSVC_Net2015/gendef.vcxproj) | 0 | ||||
-rw-r--r-- | MSVC_NMake/gendef.vcxproj.filters (renamed from MSVC_Net2015/gendef.vcxproj.filters) | 0 | ||||
-rw-r--r-- | MSVC_NMake/gendef/gendef.cc (renamed from MSVC_Net2015/gendef/gendef.cc) | 0 | ||||
-rw-r--r-- | MSVC_NMake/giomm.vcxproj (renamed from MSVC_Net2015/giomm.vcxproj) | 0 | ||||
-rw-r--r-- | MSVC_NMake/giomm.vcxproj.filters (renamed from MSVC_Net2015/giomm.vcxproj.filters) | 0 | ||||
-rw-r--r-- | MSVC_NMake/giomm/giomm.rc.in (renamed from MSVC_Net2015/giomm/giomm.rc.in) | 0 | ||||
-rw-r--r-- | MSVC_NMake/giomm_simple.vcxproj (renamed from MSVC_Net2015/giomm_simple.vcxproj) | 0 | ||||
-rw-r--r-- | MSVC_NMake/giomm_simple.vcxproj.filters (renamed from MSVC_Net2015/giomm_simple.vcxproj.filters) | 0 | ||||
-rw-r--r-- | MSVC_NMake/glibmm-build-defines.props (renamed from MSVC_Net2015/glibmm-build-defines.props) | 0 | ||||
-rw-r--r-- | MSVC_NMake/glibmm-install.props (renamed from MSVC_Net2015/glibmm-install.props) | 0 | ||||
-rw-r--r-- | MSVC_NMake/glibmm-version-paths.props (renamed from MSVC_Net2015/glibmm-version-paths.props) | 0 | ||||
-rw-r--r-- | MSVC_NMake/glibmm.sln (renamed from MSVC_Net2015/glibmm.sln) | 0 | ||||
-rw-r--r-- | MSVC_NMake/glibmm.vcxproj (renamed from MSVC_Net2015/glibmm.vcxproj) | 0 | ||||
-rw-r--r-- | MSVC_NMake/glibmm.vcxproj.filters (renamed from MSVC_Net2015/glibmm.vcxproj.filters) | 0 | ||||
-rw-r--r-- | MSVC_NMake/glibmm/glibmm.rc.in (renamed from MSVC_Net2015/glibmm/glibmm.rc.in) | 0 | ||||
-rw-r--r-- | MSVC_NMake/glibmm_value.vcxproj (renamed from MSVC_Net2015/glibmm_value.vcxproj) | 0 | ||||
-rw-r--r-- | MSVC_NMake/glibmm_value.vcxproj.filters (renamed from MSVC_Net2015/glibmm_value.vcxproj.filters) | 0 | ||||
-rw-r--r-- | MSVC_NMake/install.vcxproj (renamed from MSVC_Net2015/install.vcxproj) | 0 | ||||
-rw-r--r-- | MSVC_NMake/keyfile.vcxproj (renamed from MSVC_Net2015/keyfile.vcxproj) | 0 | ||||
-rw-r--r-- | MSVC_NMake/keyfile.vcxproj.filters (renamed from MSVC_Net2015/keyfile.vcxproj.filters) | 0 | ||||
-rw-r--r-- | MSVC_NMake/markup.vcxproj (renamed from MSVC_Net2015/markup.vcxproj) | 0 | ||||
-rw-r--r-- | MSVC_NMake/markup.vcxproj.filters (renamed from MSVC_Net2015/markup.vcxproj.filters) | 0 | ||||
-rw-r--r-- | MSVC_NMake/options.vcxproj (renamed from MSVC_Net2015/options.vcxproj) | 0 | ||||
-rw-r--r-- | MSVC_NMake/options.vcxproj.filters (renamed from MSVC_Net2015/options.vcxproj.filters) | 0 | ||||
-rw-r--r-- | MSVC_NMake/properties.vcxproj (renamed from MSVC_Net2015/properties.vcxproj) | 0 | ||||
-rw-r--r-- | MSVC_NMake/properties.vcxproj.filters (renamed from MSVC_Net2015/properties.vcxproj.filters) | 0 | ||||
-rw-r--r-- | MSVC_NMake/regex.vcxproj (renamed from MSVC_Net2015/regex.vcxproj) | 0 | ||||
-rw-r--r-- | MSVC_NMake/regex.vcxproj.filters (renamed from MSVC_Net2015/regex.vcxproj.filters) | 0 | ||||
-rw-r--r-- | MSVC_NMake/resolver.vcxproj (renamed from MSVC_Net2015/resolver.vcxproj) | 0 | ||||
-rw-r--r-- | MSVC_NMake/resolver.vcxproj.filters (renamed from MSVC_Net2015/resolver.vcxproj.filters) | 0 | ||||
-rw-r--r-- | MSVC_NMake/socket-client.vcxproj (renamed from MSVC_Net2015/socket-client.vcxproj) | 0 | ||||
-rw-r--r-- | MSVC_NMake/socket-client.vcxproj.filters (renamed from MSVC_Net2015/socket-client.vcxproj.filters) | 0 | ||||
-rw-r--r-- | MSVC_NMake/socket-server.vcxproj (renamed from MSVC_Net2015/socket-server.vcxproj) | 0 | ||||
-rw-r--r-- | MSVC_NMake/socket-server.vcxproj.filters (renamed from MSVC_Net2015/socket-server.vcxproj.filters) | 0 | ||||
-rw-r--r-- | MSVC_NMake/thread.vcxproj (renamed from MSVC_Net2015/thread.vcxproj) | 0 | ||||
-rw-r--r-- | MSVC_NMake/thread.vcxproj.filters (renamed from MSVC_Net2015/thread.vcxproj.filters) | 0 | ||||
-rw-r--r-- | MSVC_NMake/threadpool.vcxproj (renamed from MSVC_Net2015/threadpool.vcxproj) | 0 | ||||
-rw-r--r-- | MSVC_NMake/threadpool.vcxproj.filters (renamed from MSVC_Net2015/threadpool.vcxproj.filters) | 0 | ||||
-rw-r--r-- | Makefile.am | 4 | ||||
-rw-r--r-- | configure.ac | 12 |
47 files changed, 8 insertions, 8 deletions
diff --git a/MSVC_Net2015/compose.vcxproj b/MSVC_NMake/compose.vcxproj index 21d7241e..21d7241e 100644 --- a/MSVC_Net2015/compose.vcxproj +++ b/MSVC_NMake/compose.vcxproj diff --git a/MSVC_Net2015/compose.vcxproj.filters b/MSVC_NMake/compose.vcxproj.filters index 252ebc2f..252ebc2f 100644 --- a/MSVC_Net2015/compose.vcxproj.filters +++ b/MSVC_NMake/compose.vcxproj.filters diff --git a/MSVC_Net2015/dispatcher.vcxproj b/MSVC_NMake/dispatcher.vcxproj index 94fb2d7f..94fb2d7f 100644 --- a/MSVC_Net2015/dispatcher.vcxproj +++ b/MSVC_NMake/dispatcher.vcxproj diff --git a/MSVC_Net2015/dispatcher.vcxproj.filters b/MSVC_NMake/dispatcher.vcxproj.filters index c7d81a08..c7d81a08 100644 --- a/MSVC_Net2015/dispatcher.vcxproj.filters +++ b/MSVC_NMake/dispatcher.vcxproj.filters diff --git a/MSVC_Net2015/dispatcher2.vcxproj b/MSVC_NMake/dispatcher2.vcxproj index ee481a46..ee481a46 100644 --- a/MSVC_Net2015/dispatcher2.vcxproj +++ b/MSVC_NMake/dispatcher2.vcxproj diff --git a/MSVC_Net2015/dispatcher2.vcxproj.filters b/MSVC_NMake/dispatcher2.vcxproj.filters index b53d4e95..b53d4e95 100644 --- a/MSVC_Net2015/dispatcher2.vcxproj.filters +++ b/MSVC_NMake/dispatcher2.vcxproj.filters diff --git a/MSVC_Net2015/filelist.am b/MSVC_NMake/filelist.am index 32140497..32140497 100644 --- a/MSVC_Net2015/filelist.am +++ b/MSVC_NMake/filelist.am diff --git a/MSVC_Net2015/gendef.vcxproj b/MSVC_NMake/gendef.vcxproj index 280e9d89..280e9d89 100644 --- a/MSVC_Net2015/gendef.vcxproj +++ b/MSVC_NMake/gendef.vcxproj diff --git a/MSVC_Net2015/gendef.vcxproj.filters b/MSVC_NMake/gendef.vcxproj.filters index d8cb693f..d8cb693f 100644 --- a/MSVC_Net2015/gendef.vcxproj.filters +++ b/MSVC_NMake/gendef.vcxproj.filters diff --git a/MSVC_Net2015/gendef/gendef.cc b/MSVC_NMake/gendef/gendef.cc index d18ac9fb..d18ac9fb 100644 --- a/MSVC_Net2015/gendef/gendef.cc +++ b/MSVC_NMake/gendef/gendef.cc diff --git a/MSVC_Net2015/giomm.vcxproj b/MSVC_NMake/giomm.vcxproj index 6c4b57ab..6c4b57ab 100644 --- a/MSVC_Net2015/giomm.vcxproj +++ b/MSVC_NMake/giomm.vcxproj diff --git a/MSVC_Net2015/giomm.vcxproj.filters b/MSVC_NMake/giomm.vcxproj.filters index 4f01b13d..4f01b13d 100644 --- a/MSVC_Net2015/giomm.vcxproj.filters +++ b/MSVC_NMake/giomm.vcxproj.filters diff --git a/MSVC_Net2015/giomm/giomm.rc.in b/MSVC_NMake/giomm/giomm.rc.in index c2335f89..c2335f89 100644 --- a/MSVC_Net2015/giomm/giomm.rc.in +++ b/MSVC_NMake/giomm/giomm.rc.in diff --git a/MSVC_Net2015/giomm_simple.vcxproj b/MSVC_NMake/giomm_simple.vcxproj index bc7e3fd5..bc7e3fd5 100644 --- a/MSVC_Net2015/giomm_simple.vcxproj +++ b/MSVC_NMake/giomm_simple.vcxproj diff --git a/MSVC_Net2015/giomm_simple.vcxproj.filters b/MSVC_NMake/giomm_simple.vcxproj.filters index 6f87c63f..6f87c63f 100644 --- a/MSVC_Net2015/giomm_simple.vcxproj.filters +++ b/MSVC_NMake/giomm_simple.vcxproj.filters diff --git a/MSVC_Net2015/glibmm-build-defines.props b/MSVC_NMake/glibmm-build-defines.props index 5cbde3cf..5cbde3cf 100644 --- a/MSVC_Net2015/glibmm-build-defines.props +++ b/MSVC_NMake/glibmm-build-defines.props diff --git a/MSVC_Net2015/glibmm-install.props b/MSVC_NMake/glibmm-install.props index b5b0862c..b5b0862c 100644 --- a/MSVC_Net2015/glibmm-install.props +++ b/MSVC_NMake/glibmm-install.props diff --git a/MSVC_Net2015/glibmm-version-paths.props b/MSVC_NMake/glibmm-version-paths.props index 48b75a12..48b75a12 100644 --- a/MSVC_Net2015/glibmm-version-paths.props +++ b/MSVC_NMake/glibmm-version-paths.props diff --git a/MSVC_Net2015/glibmm.sln b/MSVC_NMake/glibmm.sln index 4bc1b442..4bc1b442 100644 --- a/MSVC_Net2015/glibmm.sln +++ b/MSVC_NMake/glibmm.sln diff --git a/MSVC_Net2015/glibmm.vcxproj b/MSVC_NMake/glibmm.vcxproj index e664673b..e664673b 100644 --- a/MSVC_Net2015/glibmm.vcxproj +++ b/MSVC_NMake/glibmm.vcxproj diff --git a/MSVC_Net2015/glibmm.vcxproj.filters b/MSVC_NMake/glibmm.vcxproj.filters index 31609346..31609346 100644 --- a/MSVC_Net2015/glibmm.vcxproj.filters +++ b/MSVC_NMake/glibmm.vcxproj.filters diff --git a/MSVC_Net2015/glibmm/glibmm.rc.in b/MSVC_NMake/glibmm/glibmm.rc.in index 548ac23f..548ac23f 100644 --- a/MSVC_Net2015/glibmm/glibmm.rc.in +++ b/MSVC_NMake/glibmm/glibmm.rc.in diff --git a/MSVC_Net2015/glibmm_value.vcxproj b/MSVC_NMake/glibmm_value.vcxproj index 90276156..90276156 100644 --- a/MSVC_Net2015/glibmm_value.vcxproj +++ b/MSVC_NMake/glibmm_value.vcxproj diff --git a/MSVC_Net2015/glibmm_value.vcxproj.filters b/MSVC_NMake/glibmm_value.vcxproj.filters index 80e9bb76..80e9bb76 100644 --- a/MSVC_Net2015/glibmm_value.vcxproj.filters +++ b/MSVC_NMake/glibmm_value.vcxproj.filters diff --git a/MSVC_Net2015/install.vcxproj b/MSVC_NMake/install.vcxproj index fb1a1b88..fb1a1b88 100644 --- a/MSVC_Net2015/install.vcxproj +++ b/MSVC_NMake/install.vcxproj diff --git a/MSVC_Net2015/keyfile.vcxproj b/MSVC_NMake/keyfile.vcxproj index b21a4307..b21a4307 100644 --- a/MSVC_Net2015/keyfile.vcxproj +++ b/MSVC_NMake/keyfile.vcxproj diff --git a/MSVC_Net2015/keyfile.vcxproj.filters b/MSVC_NMake/keyfile.vcxproj.filters index dea2aa95..dea2aa95 100644 --- a/MSVC_Net2015/keyfile.vcxproj.filters +++ b/MSVC_NMake/keyfile.vcxproj.filters diff --git a/MSVC_Net2015/markup.vcxproj b/MSVC_NMake/markup.vcxproj index 804d67bb..804d67bb 100644 --- a/MSVC_Net2015/markup.vcxproj +++ b/MSVC_NMake/markup.vcxproj diff --git a/MSVC_Net2015/markup.vcxproj.filters b/MSVC_NMake/markup.vcxproj.filters index 245f5714..245f5714 100644 --- a/MSVC_Net2015/markup.vcxproj.filters +++ b/MSVC_NMake/markup.vcxproj.filters diff --git a/MSVC_Net2015/options.vcxproj b/MSVC_NMake/options.vcxproj index 1d7fe943..1d7fe943 100644 --- a/MSVC_Net2015/options.vcxproj +++ b/MSVC_NMake/options.vcxproj diff --git a/MSVC_Net2015/options.vcxproj.filters b/MSVC_NMake/options.vcxproj.filters index 53f47f4c..53f47f4c 100644 --- a/MSVC_Net2015/options.vcxproj.filters +++ b/MSVC_NMake/options.vcxproj.filters diff --git a/MSVC_Net2015/properties.vcxproj b/MSVC_NMake/properties.vcxproj index 73932622..73932622 100644 --- a/MSVC_Net2015/properties.vcxproj +++ b/MSVC_NMake/properties.vcxproj diff --git a/MSVC_Net2015/properties.vcxproj.filters b/MSVC_NMake/properties.vcxproj.filters index a9825fd9..a9825fd9 100644 --- a/MSVC_Net2015/properties.vcxproj.filters +++ b/MSVC_NMake/properties.vcxproj.filters diff --git a/MSVC_Net2015/regex.vcxproj b/MSVC_NMake/regex.vcxproj index 89dd31d6..89dd31d6 100644 --- a/MSVC_Net2015/regex.vcxproj +++ b/MSVC_NMake/regex.vcxproj diff --git a/MSVC_Net2015/regex.vcxproj.filters b/MSVC_NMake/regex.vcxproj.filters index 96dea5e1..96dea5e1 100644 --- a/MSVC_Net2015/regex.vcxproj.filters +++ b/MSVC_NMake/regex.vcxproj.filters diff --git a/MSVC_Net2015/resolver.vcxproj b/MSVC_NMake/resolver.vcxproj index d35176ee..d35176ee 100644 --- a/MSVC_Net2015/resolver.vcxproj +++ b/MSVC_NMake/resolver.vcxproj diff --git a/MSVC_Net2015/resolver.vcxproj.filters b/MSVC_NMake/resolver.vcxproj.filters index 2c9dc796..2c9dc796 100644 --- a/MSVC_Net2015/resolver.vcxproj.filters +++ b/MSVC_NMake/resolver.vcxproj.filters diff --git a/MSVC_Net2015/socket-client.vcxproj b/MSVC_NMake/socket-client.vcxproj index 71d105d7..71d105d7 100644 --- a/MSVC_Net2015/socket-client.vcxproj +++ b/MSVC_NMake/socket-client.vcxproj diff --git a/MSVC_Net2015/socket-client.vcxproj.filters b/MSVC_NMake/socket-client.vcxproj.filters index edb14c14..edb14c14 100644 --- a/MSVC_Net2015/socket-client.vcxproj.filters +++ b/MSVC_NMake/socket-client.vcxproj.filters diff --git a/MSVC_Net2015/socket-server.vcxproj b/MSVC_NMake/socket-server.vcxproj index 2c4bb980..2c4bb980 100644 --- a/MSVC_Net2015/socket-server.vcxproj +++ b/MSVC_NMake/socket-server.vcxproj diff --git a/MSVC_Net2015/socket-server.vcxproj.filters b/MSVC_NMake/socket-server.vcxproj.filters index 66a88d3a..66a88d3a 100644 --- a/MSVC_Net2015/socket-server.vcxproj.filters +++ b/MSVC_NMake/socket-server.vcxproj.filters diff --git a/MSVC_Net2015/thread.vcxproj b/MSVC_NMake/thread.vcxproj index 4cbff001..4cbff001 100644 --- a/MSVC_Net2015/thread.vcxproj +++ b/MSVC_NMake/thread.vcxproj diff --git a/MSVC_Net2015/thread.vcxproj.filters b/MSVC_NMake/thread.vcxproj.filters index ba19e27b..ba19e27b 100644 --- a/MSVC_Net2015/thread.vcxproj.filters +++ b/MSVC_NMake/thread.vcxproj.filters diff --git a/MSVC_Net2015/threadpool.vcxproj b/MSVC_NMake/threadpool.vcxproj index afd7585a..afd7585a 100644 --- a/MSVC_Net2015/threadpool.vcxproj +++ b/MSVC_NMake/threadpool.vcxproj diff --git a/MSVC_Net2015/threadpool.vcxproj.filters b/MSVC_NMake/threadpool.vcxproj.filters index 4069cf59..4069cf59 100644 --- a/MSVC_Net2015/threadpool.vcxproj.filters +++ b/MSVC_NMake/threadpool.vcxproj.filters diff --git a/Makefile.am b/Makefile.am index 8abfc501..e7c25510 100644 --- a/Makefile.am +++ b/Makefile.am @@ -43,10 +43,10 @@ nodist_giomm_libinclude_HEADERS = gio/giommconfig.h pkgconfigdir = $(libdir)/pkgconfig nodist_pkgconfig_DATA = glib/$(GLIBMM_MODULE_NAME).pc gio/$(GIOMM_MODULE_NAME).pc -include $(srcdir)/MSVC_Net2015/filelist.am +include $(srcdir)/MSVC_NMake/filelist.am text_files = COPYING.tools README.SUN README.win32 -msvc_files = $(addprefix MSVC_Net2015/,$(msvc_net2015_data)) +msvc_files = $(addprefix MSVC_NMake/,$(msvc_net2015_data)) dist_noinst_DATA = $(text_files) $(msvc_files) dist_noinst_SCRIPTS = autogen.sh diff --git a/configure.ac b/configure.ac index 61ebfd49..2a1955f7 100644 --- a/configure.ac +++ b/configure.ac @@ -169,12 +169,12 @@ AC_CONFIG_FILES([Makefile examples/Makefile docs/Makefile docs/reference/Doxyfile - MSVC_Net2015/glibmm/glibmm.rc - MSVC_Net2015/giomm/giomm.rc]) + MSVC_NMake/glibmm/glibmm.rc + MSVC_NMake/giomm/giomm.rc]) # Copy the generated configuration headers into the MSVC project directories. -AC_CONFIG_COMMANDS([MSVC_Net2015/glibmm/glibmmconfig.h], - [cp -f glib/glibmmconfig.h MSVC_Net2015/glibmm/glibmmconfig.h]) -AC_CONFIG_COMMANDS([MSVC_Net2015/giomm/giommconfig.h], - [cp -f gio/giommconfig.h MSVC_Net2015/giomm/giommconfig.h]) +AC_CONFIG_COMMANDS([MSVC_NMake/glibmm/glibmmconfig.h], + [cp -f glib/glibmmconfig.h MSVC_NMake/glibmm/glibmmconfig.h]) +AC_CONFIG_COMMANDS([MSVC_NMake/giomm/giommconfig.h], + [cp -f gio/giommconfig.h MSVC_NMake/giomm/giommconfig.h]) AC_OUTPUT |