From 21567b0960efa40f51275e9e6216bf880eccff3a Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 24 Oct 2010 14:34:22 +0000 Subject: [PATCH] Output header to the same directory as the .cpp file in wxrc. If "-o" option is given, generate the output header file in the same directory as the .cpp file and not in the current directory. Closes #4054. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65892 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- utils/wxrc/wxrc.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/utils/wxrc/wxrc.cpp b/utils/wxrc/wxrc.cpp index d54dab604e..9597c6e2d8 100644 --- a/utils/wxrc/wxrc.cpp +++ b/utils/wxrc/wxrc.cpp @@ -707,16 +707,17 @@ void XmlResApp::MakePackageCPP(const wxArrayString& flist) void XmlResApp::GenCPPHeader() { - wxString fileSpec = ((parOutput.BeforeLast('.')).AfterLast('/')).AfterLast('\\'); - wxString heaFileName = fileSpec + wxT(".h"); + // Generate the output header in the same directory as the source file. + wxFileName headerName(parOutput); + headerName.SetExt("h"); - wxFFile file(heaFileName, wxT("wt")); + wxFFile file(headerName.GetFullPath(), wxT("wt")); file.Write( "//\n" "// This file was automatically generated by wxrc, do not edit by hand.\n" "//\n\n" -"#ifndef __" + fileSpec + "_h__\n" -"#define __" + fileSpec + "_h__\n" +"#ifndef __" + headerName.GetName() + "_h__\n" +"#define __" + headerName.GetName() + "_h__\n" ); for(size_t i=0;i