Download-Tools/mkvtoolnix
1
0
Fork 0
mirror of https://gitlab.com/mbunkus/mkvtoolnix.git synced 2024-12-24 11:54:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Only build one DLL on Windows.

Browse Source
This commit is contained in:
Moritz Bunkus 2004-01-23 20:26:54 +00:00
parent 4d3b90a3ee
commit 475473201c
4 changed files with 22 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/Makefile.mingw
View File

@ -17,11 +17,10 @@ mkvmerge_SOURCES = mkvmerge.cpp \
cluster_helper.cpp \
pr_generic.cpp
mkvmerge_OBJECTS := $(patsubst %.cpp,%.o,$(mkvmerge_SOURCES))
mkvmerge_DEPENDENCIES += $(DEP_COMMON) $(DEP_EBMLCOMMON) $(DEP_KAXCOMMON) \
mkvmerge_DEPENDENCIES += $(DEP_COMMON) \
$(DEP_COMP) $(DEP_INPUT) $(DEP_OUTPUT) $(DEP_AVI)
mkvmerge_LDADD = -lmtxinput -lmtxoutput \
-lmtxkaxcommon -lmtxebmlcommon -lmtxcommon \
-lmatroska -lebml \
-lmtxcommon -lmatroska -lebml \
-lavi $(AVICLASSES_LIBDIRS) $(AVICLASSES_LIBRARIES) \
-lvorbis -lflac -logg -lz $(COMPRESSION_LIBRARIES) \
-lexpat -liconv
@ -30,8 +29,8 @@ mkvinfo_SOURCES = mkvinfo.cpp \
mkvinfo_gui.cpp \
mkvinfo_tag_types.cpp
mkvinfo_OBJECTS := $(patsubst %.cpp,%.o,$(mkvinfo_SOURCES))
mkvinfo_DEPENDENCIES += $(DEP_COMMON) $(DEP_EBMLCOMMON)
mkvinfo_LDADD = -lmtxebmlcommon -lmtxcommon -lmatroska -lebml \
mkvinfo_DEPENDENCIES += $(DEP_COMMON)
mkvinfo_LDADD = -lmtxcommon -lmatroska -lebml \
$(WXWINDOWS_LDFLAGS) $(WXWINDOWS_LIBS) \
-liconv
@ -41,15 +40,13 @@ mkvextract_SOURCES = mkvextract.cpp \
mkvextract_tags.cpp \
mkvextract_tracks.cpp
mkvextract_OBJECTS := $(patsubst %.cpp,%.o,$(mkvextract_SOURCES))
mkvextract_DEPENDENCIES += $(DEP_COMMON) $(DEP_EBMLCOMMON) $(DEP_KAXCOMMON) \
$(DEP_AVILIB)
mkvextract_LDADD = -lmtxebmlcommon -lmtxkaxcommon -lmtxcommon \
-lvorbis -logg -lavi -lmatroska -lebml -liconv
mkvextract_DEPENDENCIES += $(DEP_COMMON) $(DEP_AVILIB)
mkvextract_LDADD = -lmtxcommon -lvorbis -logg -lavi -lmatroska -lebml -liconv
base64tool_SOURCES = base64tool.cpp
base64tool_OBJECTS := $(patsubst %.cpp,%.o,$(base64tool_SOURCES))
base64tool_DEPENDENCIES += $(DEP_COMMON) $(DEP_EBMLCOMMON)
base64tool_LDADD = -lmtxcommon -lmtxebmlcommon -liconv
base64tool_DEPENDENCIES += $(DEP_COMMON)
base64tool_LDADD = -lmtxcommon -liconv
# Definitions that are needed before the inclusions.
SUBDIRS = common input output mmg
@ -60,7 +57,7 @@ EXTRA_CLEAN = $(PROGRAMS)
all: subdirs $(PROGRAMS)
# Include the common stuff.
include ../Makefile.mingw.common
include ../Makefile.common
mkvmerge: $(mkvmerge_OBJECTS) $(mkvmerge_DEPENDENCIES)
$(LINK) -o $@ $(mkvmerge_OBJECTS) $(mkvmerge_LDADD)

45
src/common/Makefile.mingw
View File

@ -5,10 +5,10 @@
include ../../Makefile.mingw.options
ifneq (,$(findstring yes,$(MTX_DLLS)))
LIBRARIES = libmtxcommon.dll libmtxebmlcommon.dll libmtxkaxcommon.dll
LIBRARIES = libmtxcommon.dll
CXXFLAGS += -DMTX_DLL_EXPORT
else
LIBRARIES = libmtxcommon.a libmtxebmlcommon.a libmtxkaxcommon.a
LIBRARIES = libmtxcommon.a
endif
SYSTEM_INCLUDES = -I$(TOP) -I$(TOP)/src -I$(TOP)/src/common
@ -16,27 +16,22 @@ SYSTEM_INCLUDES = -I$(TOP) -I$(TOP)/src -I$(TOP)/src/common
libmtxcommon_SOURCES = base64.cpp \
aac_common.cpp \
ac3_common.cpp \
chapters.cpp \
chapter_parser_xml.cpp \
chapter_writer.cpp \
common.cpp \
commonebml.cpp \
compression.cpp \
dts_common.cpp \
iso639.cpp \
mp3_common.cpp
libmtxcommon_OBJECTS := $(patsubst %.cpp,%.o,$(libmtxcommon_SOURCES))
libmtxebmlcommon_SOURCES = commonebml.cpp \
mm_io.cpp
libmtxebmlcommon_OBJECTS := $(patsubst %.cpp,%.o,$(libmtxebmlcommon_SOURCES))
libmtxkaxcommon_SOURCES = chapters.cpp \
chapter_parser_xml.cpp \
chapter_writer.cpp \
mp3_common.cpp \
mm_io.cpp \
tagparser_start.cpp \
tagparser_end.cpp \
tagwriter.cpp
libmtxkaxcommon_OBJECTS := $(patsubst %.cpp,%.o,$(libmtxkaxcommon_SOURCES))
libmtxcommon_OBJECTS := $(patsubst %.cpp,%.o,$(libmtxcommon_SOURCES))
ALL_SOURCES = $(libmtxcommon_SOURCES) $(libmtxebmlcommon_SOURCES) \
$(libmtxkaxcommon_SOURCES)
ALL_SOURCES = $(libmtxcommon_SOURCES)
EXTRA_CLEAN = lib*.dll
all: $(LIBRARIES)
@ -45,27 +40,9 @@ include ../../Makefile.common
libmtxcommon.dll: $(libmtxcommon_OBJECTS)
$(LINKSHARED) -Wl,--out-implib=$@.a -o $@ $(libmtxcommon_OBJECTS) \
-liconv -lz $(COMPRESSION_LIBRARIES)
libmtxebmlcommon.dll: $(libmtxebmlcommon_OBJECTS)
$(LINKSHARED) -Wl,--out-implib=$@.a -o $@ $(libmtxebmlcommon_OBJECTS) \
-L. -lmtxcommon -lebml
libmtxkaxcommon.dll: $(libmtxkaxcommon_OBJECTS)
$(LINKSHARED) -Wl,--out-implib=$@.a -o $@ $(libmtxkaxcommon_OBJECTS) \
-L. -lmtxcommon -lmatroska -lebml -lmtxebmlcommon -lexpat
-liconv -lz $(COMPRESSION_LIBRARIES) -lmatroska -lebml -lexpat
libmtxcommon.a: $(libmtxcommon_OBJECTS)
rm -f $@
$(RUNAR) $@ $(libmtxcommon_OBJECTS)
$(RANLIB) $@
libmtxebmlcommon.a: $(libmtxebmlcommon_OBJECTS)
rm -f $@
$(RUNAR) $@ $(libmtxebmlcommon_OBJECTS)
$(RANLIB) $@
libmtxkaxcommon.a: $(libmtxkaxcommon_OBJECTS)
rm -f $@
$(RUNAR) $@ $(libmtxkaxcommon_OBJECTS)
$(RANLIB) $@

1
src/common/common.cpp
View File

@ -48,7 +48,6 @@
using namespace std;
#include "common.h"
#include "hacks.h"
#include "mkvmerge.h"

5
src/mmg/Makefile.mingw
View File

@ -21,9 +21,8 @@ mmg_SOURCES = mmg.cpp \
tab_global.cpp \
tab_settings.cpp
mmg_OBJECTS := $(patsubst %.cpp,%.o,$(mmg_SOURCES))
mmg_DEPENDENCIES += $(DEP_COMMON) $(DEP_EBMLCOMMON) $(DEP_KAXCOMMON)
mmg_LDADD = -lmtxkaxcommon -lmtxebmlcommon -lmtxcommon \
-lmatroska -lebml -liconv -lexpat \
mmg_DEPENDENCIES += $(DEP_COMMON)
mmg_LDADD = -lmtxcommon -lmatroska -lebml -liconv -lexpat \
$(WXWINDOWS_LDFLAGS) $(WXWINDOWS_LIBS) \
-mwindows