Download-Tools/mkvtoolnix
1
0
Fork 0
mirror of https://gitlab.com/mbunkus/mkvtoolnix.git synced 2024-12-23 19:31:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Small adjustments for building mkvtoolnix with a cross mingw gcc under Linux.

Browse Source
This commit is contained in:
Moritz Bunkus 2004-07-22 21:14:52 +00:00
parent d71f8a7261
commit 2d1dd62326
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Makefile.mingw
View File

@ -47,7 +47,8 @@ DEP_RMFF = librmff/librmff.a
# #
SUBDIRS = avilib-0.6.10 src SUBDIRS = avilib-0.6.10 src
APPLICATIONS=src/mkvmerge src/mkvinfo src/mkvextract src/base64tool src/mmg/mmg APPLICATIONS=src/mkvmerge$(EXT) src/mkvinfo$(EXT) src/mkvextract$(EXT) \
src/base64tool$(EXT) src/mmg/mmg$(EXT)
all: config.h $(APPLICATIONS) all: config.h $(APPLICATIONS)
@ -203,7 +204,7 @@ mkvmerge_DEPENDENCIES += $(DEP_COMMON) \
$(DEP_COMP) $(DEP_INPUT) $(DEP_OUTPUT) $(DEP_AVI) $(DEP_RMFF) $(DEP_COMP) $(DEP_INPUT) $(DEP_OUTPUT) $(DEP_AVI) $(DEP_RMFF)
mkvmerge_LDADD = -lmtxinput -lmtxoutput \ mkvmerge_LDADD = -lmtxinput -lmtxoutput \
-lmtxcommon -lmatroska -lebml \ -lmtxcommon -lmatroska -lebml \
-lavi -lvorbis -lflac -logg -lz $(COMPRESSION_LIBRARIES) \ -lavi -lvorbis -lFLAC -logg -lz $(COMPRESSION_LIBRARIES) \
-lexpat -liconv -lrmff -lexpat -liconv -lrmff
mkvinfo_SOURCES = $(wildcard src/mkvinfo*.cpp) mkvinfo_SOURCES = $(wildcard src/mkvinfo*.cpp)
@ -231,23 +232,23 @@ mmg_LDADD = -lmtxcommon -lmatroska -lebml -liconv -lexpat \
$(WXWINDOWS_LDFLAGS) $(WXWINDOWS_LIBS) \ $(WXWINDOWS_LDFLAGS) $(WXWINDOWS_LIBS) \
-mwindows -mwindows
src/mkvmerge: $(mkvmerge_OBJECTS) $(mkvmerge_DEPENDENCIES) src/mkvmerge$(EXT): $(mkvmerge_OBJECTS) $(mkvmerge_DEPENDENCIES)
@echo ' LINK ' $@ @echo ' LINK ' $@
$(Q)$(LINK) -o $@ $(mkvmerge_OBJECTS) $(mkvmerge_LDADD) $(Q)$(LINK) -o $@ $(mkvmerge_OBJECTS) $(mkvmerge_LDADD)
src/mkvinfo: $(mkvinfo_OBJECTS) $(mkvinfo_DEPENDENCIES) src/mkvinfo$(EXT): $(mkvinfo_OBJECTS) $(mkvinfo_DEPENDENCIES)
@echo ' LINK ' $@ @echo ' LINK ' $@
$(Q)$(LINK) -o $@ $(mkvinfo_OBJECTS) $(mkvinfo_LDADD) $(Q)$(LINK) -o $@ $(mkvinfo_OBJECTS) $(mkvinfo_LDADD)
src/mkvextract: $(mkvextract_OBJECTS) $(mkvextract_DEPENDENCIES) src/mkvextract$(EXT): $(mkvextract_OBJECTS) $(mkvextract_DEPENDENCIES)
@echo ' LINK ' $@ @echo ' LINK ' $@
$(Q)$(LINK) -o $@ $(mkvextract_OBJECTS) $(mkvextract_LDADD) $(Q)$(LINK) -o $@ $(mkvextract_OBJECTS) $(mkvextract_LDADD)
src/base64tool: $(base64tool_OBJECTS) $(base64tool_DEPENDENCIES) src/base64tool$(EXT): $(base64tool_OBJECTS) $(base64tool_DEPENDENCIES)
@echo ' LINK ' $@ @echo ' LINK ' $@
$(Q)$(LINK) -o $@ $(base64tool_OBJECTS) $(base64tool_LDADD) $(Q)$(LINK) -o $@ $(base64tool_OBJECTS) $(base64tool_LDADD)
src/mmg/mmg: $(mmg_OBJECTS) $(mmg_DEPENDENCIES) src/mmg/mmg$(EXT): $(mmg_OBJECTS) $(mmg_DEPENDENCIES)
@echo ' LINK ' $@ @echo ' LINK ' $@
$(Q)$(LINK) -o $@ $(mmg_OBJECTS) $(mmg_LDADD) $(Q)$(LINK) -o $@ $(mmg_OBJECTS) $(mmg_LDADD)

3
Makefile.mingw.options
View File

@ -27,6 +27,9 @@ DEBUG = yes
# Comment out if you don't have wxWindows installed. # Comment out if you don't have wxWindows installed.
WXWINDOWS = yes WXWINDOWS = yes
# Does '.exe' have to be appended explicitely, or is this done automatically?
#EXT=.exe
# Chose the programs to use. # Chose the programs to use.
CXX = g++.exe CXX = g++.exe
CC = gcc.exe CC = gcc.exe