diff options
| author | Nick Wellnhofer <wellnhofer@aevum.de> | 2023-05-02 13:32:24 +0200 |
|---|---|---|
| committer | Nick Wellnhofer <wellnhofer@aevum.de> | 2023-05-02 13:36:04 +0200 |
| commit | 11a95279a93241b32839f1f796602254215be0fb (patch) | |
| tree | 9c0b66ea7918c7660346f22593c1a48f2ece9d93 | |
| parent | c613ab14b85d5813ff834afe23adcab2cc82dc04 (diff) | |
| download | libxml2-11a95279a93241b32839f1f796602254215be0fb.tar.gz | |
win32: Don't depend on removed .def file
Fixes broken build after 21cec82b.
Fixes #532.
| -rw-r--r-- | win32/Makefile.bcb | 10 | ||||
| -rw-r--r-- | win32/Makefile.msvc | 10 |
2 files changed, 3 insertions, 17 deletions
diff --git a/win32/Makefile.bcb b/win32/Makefile.bcb index 4b0a2ef5..bf599a5e 100644 --- a/win32/Makefile.bcb +++ b/win32/Makefile.bcb @@ -31,7 +31,6 @@ XML_NAME = xml2 XML_BASENAME = lib$(XML_NAME) XML_SO = $(XML_BASENAME).dll XML_IMP = $(XML_BASENAME).lib -XML_DEF = $(XML_BASENAME).def XML_A = $(XML_BASENAME)_a.lib DUMMY = dir.exists @@ -292,17 +291,12 @@ $(XML_OBJS_A) : $(XML_INTDIR_A)\$(DUMMY) #def4bcb.exe : def4bcb.c -# Creates the export definition file (DEF) for libxml. -#$(XML_INTDIR)\$(XML_DEF) : $(XML_INTDIR)\$(DUMMY) $(XML_DEF).src def4bcb.exe -# $(CPP) $(CPPFLAGS) -o $(XML_INTDIR)\$(XML_DEF).tmp $(XML_DEF).src -# def4bcb -msnames < $(XML_INTDIR)\$(XML_DEF).tmp > $(XML_INTDIR)\$(XML_DEF) - # Creates the libxml shared object. $(BINDIR)\$(XML_SO) : $(BINDIR)\$(DUMMY) $(XML_OBJS) $(LD) $(LDFLAGS) -Tpd -Gi c0d32.obj $(XML_OBJS),$(BINDIR)\$(XML_SO),,$(LIBS) -#$(BINDIR)\$(XML_SO) : $(BINDIR)\$(DUMMY) $(XML_OBJS) $(XML_INTDIR)\$(XML_DEF) -# $(LD) $(LDFLAGS) -Tpd -Gi c0d32.obj $(XML_OBJS),$(BINDIR)\$(XML_SO),,$(LIBS),$(XML_INTDIR)\$(XML_DEF) +#$(BINDIR)\$(XML_SO) : $(BINDIR)\$(DUMMY) $(XML_OBJS) +# $(LD) $(LDFLAGS) -Tpd -Gi c0d32.obj $(XML_OBJS),$(BINDIR)\$(XML_SO),,$(LIBS) # Creates the libxml archive. $(BINDIR)\$(XML_A) : $(BINDIR)\$(DUMMY) $(XML_OBJS_A) diff --git a/win32/Makefile.msvc b/win32/Makefile.msvc index 7cc25b84..cf348f5e 100644 --- a/win32/Makefile.msvc +++ b/win32/Makefile.msvc @@ -24,7 +24,6 @@ XML_BASENAME = lib$(XML_NAME) XML_SO = $(XML_BASENAME).dll XML_RES = $(XML_BASENAME).res XML_IMP = $(XML_BASENAME).lib -XML_DEF = $(XML_BASENAME).def XML_A = $(XML_BASENAME)_a.lib XML_A_DLL = $(XML_BASENAME)_a_dll.lib @@ -365,22 +364,15 @@ $(XML_OBJS_A) : $(XML_INTDIR_A) # Compiles static for dll libxml source. Uses the implicit rule for commands. $(XML_OBJS_A_DLL) : $(XML_INTDIR_A_DLL) -# Creates the export definition file (DEF) for libxml. -$(XML_INTDIR)\$(XML_DEF) : $(XML_INTDIR) $(XML_DEF).src - $(CPP) $(CPPFLAGS) $(XML_DEF).src > $(XML_INTDIR)\$(XML_DEF) $(XML_INTDIR)\$(XML_RES) : $(XML_INTDIR) libxml2.rc rc -Fo $(XML_INTDIR)\$(XML_RES) libxml2.rc # Creates the libxml shared object. -$(BINDIR)\$(XML_SO) : $(BINDIR) $(XML_OBJS) $(XML_INTDIR)\$(XML_DEF) $(XML_INTDIR)\$(XML_RES) +$(BINDIR)\$(XML_SO) : $(BINDIR) $(XML_OBJS) $(XML_INTDIR)\$(XML_RES) $(LD) $(LDFLAGS) /DLL \ /IMPLIB:$(BINDIR)\$(XML_IMP) /OUT:$(BINDIR)\$(XML_SO) $(XML_OBJS) $(XML_INTDIR)\$(XML_RES) $(LIBS) @$(_VC_MANIFEST_EMBED_DLL) -#$(BINDIR)\$(XML_SO) : $(BINDIR) $(XML_OBJS) $(XML_INTDIR)\$(XML_DEF) -# $(LD) $(LDFLAGS) /DLL /DEF:$(XML_INTDIR)\$(XML_DEF) \ -# /IMPLIB:$(BINDIR)\$(XML_IMP) /OUT:$(BINDIR)\$(XML_SO) $(XML_OBJS) $(LIBS) - # Creates the libxml archive. $(BINDIR)\$(XML_A) : $(BINDIR) $(XML_OBJS_A) $(AR) $(ARFLAGS) /OUT:$(BINDIR)\$(XML_A) $(XML_OBJS_A) |