diff --git a/Makefile.in b/Makefile.in index 2dd632b14..1194dc45a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -134,7 +134,10 @@ LIBMTXCOMMONEXT = a endif ifeq (1,$(MINGW)) -MMG_RESOURCES = src/mmg/mmg-resources.rc +mmg_RESOURCES = src/mmg/mmg-resources.rc +mkvmerge_RESOURCES = src/merge/resources.rc +mkvinfo_RESOURCES = src/info/resources.rc +mkvextract_RESOURCES = src/extract/resources.rc LIBRPCRT = -lrpcrt4 endif @@ -418,7 +421,8 @@ src/output/libmtxoutput.a: $(libmtxoutput_OBJECTS) # mkvmerge_SOURCES = $(wildcard src/merge/*.cpp) -mkvmerge_OBJECTS := $(patsubst %.cpp,%.o,$(mkvmerge_SOURCES)) +mkvmerge_OBJECTS := $(patsubst %.cpp,%.o,$(mkvmerge_SOURCES)) \ + $(patsubst %.rc,%.o,$(mkvmerge_RESOURCES)) mkvmerge_DEPENDENCIES += $(DEP_COMMON) \ $(DEP_COMP) $(DEP_INPUT) $(DEP_OUTPUT) $(DEP_AVI) $(DEP_RMFF) \ $(DEP_MPEGPARSER) @@ -451,7 +455,8 @@ mkvinfo_LDADD += $(WXWIDGETS_LIBS) endif endif -mkvinfo_OBJECTS := $(patsubst %.cpp,%.o,$(mkvinfo_SOURCES)) +mkvinfo_OBJECTS := $(patsubst %.cpp,%.o,$(mkvinfo_SOURCES)) \ + $(patsubst %.rc,%.o,$(mkvinfo_RESOURCES)) mkvinfo_DEPENDENCIES += $(DEP_COMMON) mkvinfo_LDADD += -lexpat $(ICONV_LIBS) $(LIBINTL_LIBS) $(LIBRPCRT) @@ -461,7 +466,8 @@ mkvinfo_LDADD += -lexpat $(ICONV_LIBS) $(LIBINTL_LIBS) $(LIBRPCRT) # mkvextract_SOURCES = $(wildcard src/extract/*.cpp) -mkvextract_OBJECTS := $(patsubst %.cpp,%.o,$(mkvextract_SOURCES)) +mkvextract_OBJECTS := $(patsubst %.cpp,%.o,$(mkvextract_SOURCES)) \ + $(patsubst %.rc,%.o,$(mkvextract_RESOURCES)) mkvextract_DEPENDENCIES += $(DEP_COMMON) $(DEP_AVILIB) $(DEP_RMFF) mkvextract_LDADD = -lmtxcommon $(MAGIC_LIBS) -lvorbis -logg -lavi -lmatroska -lebml -lrmff \ $(ICONV_LIBS) $(LIBINTL_LIBS) -lexpat \ @@ -473,7 +479,7 @@ mkvextract_LDADD = -lmtxcommon $(MAGIC_LIBS) -lvorbis -logg -lavi -lmatroska -le mmg_SOURCES = $(wildcard src/mmg/*.cpp) mmg_OBJECTS := $(patsubst %.cpp,%.o,$(mmg_SOURCES)) \ - $(patsubst %.rc,%.o,$(MMG_RESOURCES)) + $(patsubst %.rc,%.o,$(mmg_RESOURCES)) mmg_DEPENDENCIES += $(DEP_COMMON) mmg_LDADD = -lmtxcommon $(MAGIC_LIBS) -lmatroska -lebml -lexpat $(ICONV_LIBS) \ $(WXWIDGETS_LIBS) $(LIBINTL_LIBS) $(MINGW_GUIAPP) \ diff --git a/src/extract/resources.rc b/src/extract/resources.rc new file mode 100644 index 000000000..069bbd7e1 --- /dev/null +++ b/src/extract/resources.rc @@ -0,0 +1,21 @@ +1 VERSIONINFO + FILEVERSION 2, 3, 0, 0 + PRODUCTVERSION 2, 3, 0, 0 + FILEFLAGSMASK 0x3f + FILEOS 0x4 +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904B0" + BEGIN + VALUE "CompanyName", "Moritz Bunkus" + VALUE "FileDescription", "mkvextract" + VALUE "FileVersion", "2.3.0" + VALUE "InternalName", "mkvextract" + VALUE "LegalCopyright", "Released under the GNU Pulic License http://www.gnu.org/licenses/gpl-2.0.html" + VALUE "OriginalFilename", "mkvextract" + VALUE "ProductName", "MKVToolNix" + VALUE "ProductVersion", "2.3.0" + END + END +END diff --git a/src/info/resources.rc b/src/info/resources.rc new file mode 100644 index 000000000..a3d647141 --- /dev/null +++ b/src/info/resources.rc @@ -0,0 +1,21 @@ +1 VERSIONINFO + FILEVERSION 2, 3, 0, 0 + PRODUCTVERSION 2, 3, 0, 0 + FILEFLAGSMASK 0x3f + FILEOS 0x4 +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904B0" + BEGIN + VALUE "CompanyName", "Moritz Bunkus" + VALUE "FileDescription", "mkvinfo" + VALUE "FileVersion", "2.3.0" + VALUE "InternalName", "mkvinfo" + VALUE "LegalCopyright", "Released under the GNU Pulic License http://www.gnu.org/licenses/gpl-2.0.html" + VALUE "OriginalFilename", "mkvinfo" + VALUE "ProductName", "MKVToolNix" + VALUE "ProductVersion", "2.3.0" + END + END +END diff --git a/src/merge/resources.rc b/src/merge/resources.rc new file mode 100644 index 000000000..6ff66f698 --- /dev/null +++ b/src/merge/resources.rc @@ -0,0 +1,21 @@ +1 VERSIONINFO + FILEVERSION 2, 3, 0, 0 + PRODUCTVERSION 2, 3, 0, 0 + FILEFLAGSMASK 0x3f + FILEOS 0x4 +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904B0" + BEGIN + VALUE "CompanyName", "Moritz Bunkus" + VALUE "FileDescription", "mkvmerge" + VALUE "FileVersion", "2.3.0" + VALUE "InternalName", "mkvmerge" + VALUE "LegalCopyright", "Released under the GNU Pulic License http://www.gnu.org/licenses/gpl-2.0.html" + VALUE "OriginalFilename", "mkvmerge" + VALUE "ProductName", "MKVToolNix" + VALUE "ProductVersion", "2.3.0" + END + END +END diff --git a/src/mmg/mmg-resources.rc b/src/mmg/mmg-resources.rc index 484f9d164..63843d433 100644 --- a/src/mmg/mmg-resources.rc +++ b/src/mmg/mmg-resources.rc @@ -1,3 +1,25 @@ MATROSKAICON ICON matroskalogo_big.ico #include "wx/msw/wx.rc" + +1 VERSIONINFO + FILEVERSION 2, 3, 0, 0 + PRODUCTVERSION 2, 3, 0, 0 + FILEFLAGSMASK 0x3f + FILEOS 0x4 +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904B0" + BEGIN + VALUE "CompanyName", "Moritz Bunkus" + VALUE "FileDescription", "mmg" + VALUE "FileVersion", "2.3.0" + VALUE "InternalName", "mmg" + VALUE "LegalCopyright", "Released under the GNU Pulic License http://www.gnu.org/licenses/gpl-2.0.html" + VALUE "OriginalFilename", "mmg" + VALUE "ProductName", "MKVToolNix" + VALUE "ProductVersion", "2.3.0" + END + END +END