Discussion:
[Clanlib-devel] Patch for 0.8 to finish the new configure script w/o MFC
Jason Green
2005-11-30 22:13:59 UTC
Permalink
This should finish the job that Judas- started getting rid of MFC in the
configure script. It replaces all of the MFC CString's with std::string's
and changes the string access methods. Also adds the create_workspace
function that was missing.

Only tested in VS.Net 2003, which correctly imported the new .dsp file (just
used a text editor to update it). Should probably be tested in VC6 to make
sure.

Jason
Sean Heber
2005-11-30 22:21:30 UTC
Permalink
I tried to apply this, but got errors... perhaps I'm missing
something, but I haven't had this problem before. Here's the output:

$ patch -p0 < ~/Desktop/clanlib_win32_configure.patch
patching file configure.dsp
Hunk #1 FAILED at 31.
Hunk #2 FAILED at 88.
Hunk #3 FAILED at 100.
Hunk #4 FAILED at 124.
Hunk #5 FAILED at 144.
5 out of 5 hunks FAILED -- saving rejects to file configure.dsp.rej
patching file Setup/Win32/wizard.cpp
Hunk #1 FAILED at 1.
Hunk #2 FAILED at 29.
Hunk #3 FAILED at 46.
3 out of 3 hunks FAILED -- saving rejects to file Setup/Win32/
wizard.cpp.rej
patching file Setup/Win32/wizard.h
Hunk #1 FAILED at 6.
1 out of 1 hunk FAILED -- saving rejects to file Setup/Win32/
wizard.h.rej
patching file Setup/Win32/workspace_generator_msvc.cpp

l8r
Sean
Post by Jason Green
This should finish the job that Judas- started getting rid of MFC
in the configure script. It replaces all of the MFC CString's with
std::string's and changes the string access methods. Also adds the
create_workspace function that was missing.
Only tested in VS.Net 2003, which correctly imported the new .dsp
file (just used a text editor to update it). Should probably be
tested in VC6 to make sure.
Jason
<clanlib_win32_configure.patch>
Magnus Norddahl
2005-12-01 11:35:06 UTC
Permalink
Post by Sean Heber
I tried to apply this, but got errors... perhaps I'm missing
The svn eol properties are different for the dsw/dsp than for all other
files in the project. To ensure that a unix checkout of ClanLib creates
project files that work with Visual Studio, these files will always be
checked out in the CRNL format.

This causes problems because the patch file most likely has unix eol lines
when you try to apply it. The effect is that it fails all the hunks.

To apply this patch, either dos2unix the dsp/dsw files, or unix2dos the
patch file. But don't bother with this one - I'll apply it myself now. :)

--
Magnus Norddahl

Magnus Norddahl
2005-12-01 11:29:32 UTC
Permalink
Post by Jason Green
This should finish the job that Judas- started getting rid of MFC in the
configure script. It replaces all of the MFC CString's with std::string's
and changes the string access methods. Also adds the create_workspace
function that was missing.
Ah you finished my work. Excellent. :)
Post by Jason Green
Only tested in VS.Net 2003, which correctly imported the new .dsp file (just
used a text editor to update it). Should probably be tested in VC6 to make
sure.
I'll try open it in the VC6 I have here at the office. It most likely will
work, just need to confirm that the MFC settings are disabled now.

--
Magnus Norddahl
Loading...