From 438086af83001ea3df3b85a472fa4cf7c30d3be3 Mon Sep 17 00:00:00 2001 From: Moritz Bunkus Date: Sun, 14 Nov 2004 09:32:22 +0000 Subject: [PATCH] Fixes for the Windows port. --- Makefile.mingw | 5 +++-- src/common/commonebml.cpp | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile.mingw b/Makefile.mingw index 5d3fde90b..63054a642 100644 --- a/Makefile.mingw +++ b/Makefile.mingw @@ -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 = diff --git a/src/common/commonebml.cpp b/src/common/commonebml.cpp index 8b73da153..53121d01b 100644 --- a/src/common/commonebml.cpp +++ b/src/common/commonebml.cpp @@ -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;