[librsvg/drop-rsvg-symbols: 3/4] MSVC builds: Export symbols using compiler directives



commit a3fa1c53f0ca5e5127cd2d467e3b95d9c5c8e848
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Wed Jul 3 16:08:03 2019 +0800

    MSVC builds: Export symbols using compiler directives
    
    This will enable us to stop using the rsvg.symbols file for our Visual
    Studio builds.

 win32/build-rules-msvc.mak | 2 --
 win32/config-msvc.mak.in   | 3 ++-
 win32/generate-msvc.mak    | 6 ------
 3 files changed, 2 insertions(+), 9 deletions(-)
---
diff --git a/win32/build-rules-msvc.mak b/win32/build-rules-msvc.mak
index 863dbec3..ceb91d3a 100644
--- a/win32/build-rules-msvc.mak
+++ b/win32/build-rules-msvc.mak
@@ -55,12 +55,10 @@ $(LIBRSVG_LIB): $(LIBRSVG_DLL)
 #      @-if exist $@.manifest mt /manifest $@.manifest /outputresource:$@;2
 $(LIBRSVG_DLL):        \
 $(RSVG_INTERNAL_LIB)           \
-$(OUTDIR)\librsvg\rsvg.def     \
 $(OUTDIR)\librsvg\config.h     \
 $(librsvg_OBJS)
        link /DLL $(LDFLAGS)    \
        $(LIBRSVG_DEP_LIBS)     \
-       /def:$(OUTDIR)\librsvg\rsvg.def \
        /implib:$(LIBRSVG_LIB)  \
        -out:$@ @<<
 $(librsvg_OBJS)
diff --git a/win32/config-msvc.mak.in b/win32/config-msvc.mak.in
index 0300ef79..cd9b5157 100644
--- a/win32/config-msvc.mak.in
+++ b/win32/config-msvc.mak.in
@@ -60,7 +60,8 @@ LIBRSVG_CFLAGS =                              \
        $(BASE_CFLAGS)                          \
        $(LIBRSVG_LOG_DOMAIN)                   \
        /DRSVG_DISABLE_DEPRECATION_WARNINGS     \
-       /DRSVG_COMPILATION
+       /DRSVG_COMPILATION                      \
+       /DRSVG_API=__declspec(dllexport)
 
 LIBRSVG_INCLUDES =                     \
        /I..                            \
diff --git a/win32/generate-msvc.mak b/win32/generate-msvc.mak
index b010e1df..ed22a20e 100644
--- a/win32/generate-msvc.mak
+++ b/win32/generate-msvc.mak
@@ -15,12 +15,6 @@ $(OUTDIR)\rsvg-tools                 \
 $(OUTDIR)\rsvg-tests:
        @-mkdir $@
 
-# Generate the .def file
-$(OUTDIR)\librsvg\rsvg.def: ..\rsvg.symbols
-       @if not exist $(@D) $(MAKE) /f Makefile.vc CFG=$(CFG) $(@D)
-       @echo EXPORTS > $@
-       $(CPP) /EP $** >> $@
-
 # Generate listing file for introspection
 $(OUTDIR)\librsvg\Rsvg_2_0_gir_list:   \
 $(librsvg_real_pub_HDRS)               \


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