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

Fixes for the Windows port.

Browse Source
This commit is contained in:
Moritz Bunkus 2004-11-14 09:32:22 +00:00
parent 6c16414ff9
commit 438086af83
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile.mingw
View File

@ -53,7 +53,8 @@ APPLICATIONS=src/mkvmerge$(EXT) src/mkvinfo$(EXT) src/mkvextract$(EXT) \
all: config.h $(APPLICATIONS)
SYSTEM_INCLUDES = -Iavilib-0.6.10 \
-I. -Ilibrmff -Isrc/merge -Isrc/common -Isrc/input -Isrc/output
-I. -Ilibrmff -Isrc/merge -Isrc/common -Isrc/input \
-Isrc/output -Isrc/mpegparser
SYSTEM_LIBDIRS = -Lavilib-0.6.10 \
-Llibrmff -Lsrc/common -Lsrc/input -Lsrc/output
@ -68,7 +69,7 @@ ALL_SOURCES=$(wildcard avilib-0.6.10/*.c) $(wildcard librmff/*.c) \
$(wildcard src/*.cpp) $(wildcard src/input/*.cpp) \
$(wildcard src/output/*.cpp) $(wildcard src/common/*.cpp) \
$(wildcard src/mmg/*.cpp) $(wildcard src/merge/*.cpp) \
$(wildcard src/info/*.cpp)
$(wildcard src/info/*.cpp) $(wildcard src/mpegparser/*.cpp)
ifeq ($(V),1)
Q =

2
src/common/commonebml.cpp
View File

@ -66,7 +66,7 @@ cstr_to_UTFstring(const string &c) {
len = c.length();
new_string = (wchar_t *)safemalloc((len + 1) * sizeof(wchar_t));
#if defined(COMP_MSC) || defined(COMP_MINGW)
MultiByteToWideChar(CP_ACP, 0, c, -1, new_string, len + 1);
MultiByteToWideChar(CP_ACP, 0, c.c_str(), -1, new_string, len + 1);
u = new_string;
#else
char *old_locale;