[glibmm/use-dllexport-2-62: 1/2] Drop gendef



commit d5901cd42204ee562d46cad2565e591f9a96f3f3
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Mon Mar 9 12:12:48 2020 +0800

    Drop gendef
    
    We are now using __declspec(dllexport) to export symbols from the glibmm
    and giomm DLLs, so we no longer need to have gendef around.

 MSVC_NMake/build-rules-msvc.mak |   1 -
 MSVC_NMake/filelist.am          |   1 -
 MSVC_NMake/gendef/gendef.cc     | 104 ----------------------------------------
 MSVC_NMake/gendef/meson.build   |   9 ----
 Makefile.am                     |   1 -
 glib/glibmm/meson.build         |   2 +-
 meson.build                     |   1 -
 7 files changed, 1 insertion(+), 118 deletions(-)
---
diff --git a/MSVC_NMake/build-rules-msvc.mak b/MSVC_NMake/build-rules-msvc.mak
index 15231167..f3f5cf03 100644
--- a/MSVC_NMake/build-rules-msvc.mak
+++ b/MSVC_NMake/build-rules-msvc.mak
@@ -251,7 +251,6 @@ clean:
        @-del /f /q vs$(VSVER)\$(CFG)\$(PLAT)\*.lib
        @-del ..\tools\generate_wrap_init.pl
        @-del ..\tools\gmmproc
-<<<<<<< HEAD
        @-del /f /q vs$(PDBVER)\$(CFG)\$(PLAT)\gschemas.compiled
        @-del vs$(PDBVER)\$(CFG)\$(PLAT)\glib-extra-defs-gen\*.pdb
        @-del vs$(PDBVER)\$(CFG)\$(PLAT)\glib-extra-defs-gen\*.obj
diff --git a/MSVC_NMake/filelist.am b/MSVC_NMake/filelist.am
index 51cd3147..c450c502 100644
--- a/MSVC_NMake/filelist.am
+++ b/MSVC_NMake/filelist.am
@@ -6,7 +6,6 @@ msvc_nmake_data =               \
        create-lists.bat        \
        create-lists-msvc.mak   \
        detectenv-msvc.mak      \
-       gendef/gendef.cc        \
        generate-msvc.mak       \
        glibmm/glibmmconfig.h   \
        glibmm/glibmm.rc        \
diff --git a/Makefile.am b/Makefile.am
index f2f18f7d..31aa2419 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -57,7 +57,6 @@ DISTCLEANFILES = $(filter %mmconfig.h,$(msvc_files))
 EXTRA_DIST = \
   meson.build \
   meson_options.txt \
-  MSVC_NMake/gendef/meson.build \
   MSVC_NMake/giomm/meson.build \
   MSVC_NMake/glibmm/meson.build \
   docs/reference/meson.build \
diff --git a/glib/glibmm/meson.build b/glib/glibmm/meson.build
index 6915e2b5..abd0af1d 100644
--- a/glib/glibmm/meson.build
+++ b/glib/glibmm/meson.build
@@ -3,7 +3,7 @@
 # Input: glibmm_build_dep, glibmm_pcname, maintainer_mode, project_source_root,
 #        generate_binding_py, handle_built_files_py, m4_files, pm_files,
 #        glibmm_libversion, install_includedir, python3, glibmm_rc, gmmproc_dir,
-#        is_host_windows, gendef, gmmproc, generate_wrap_init_pl
+#        is_host_windows, gmmproc, generate_wrap_init_pl
 # Output: glibmm_hg_ccg_basenames, glibmm_extra_h_files, built_files_root,
 #         glibmm_built_h_file_targets, glibmm_dep
 
diff --git a/meson.build b/meson.build
index daa536e0..0fa3f4cd 100644
--- a/meson.build
+++ b/meson.build
@@ -195,7 +195,6 @@ if is_msvc
 endif
 
 subdir('tools')
-subdir('MSVC_NMake/gendef')
 subdir('glib')
 subdir('MSVC_NMake/glibmm')
 subdir('glib/glibmm')


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]