Menu
▾
▴
[wxhaskell-devel] darcs patch: Fix: linking incorrect runtime on Visual... (and 1 more)
|
From: shelarcy <she...@gm...> - 2008-07-09 06:54:58
|
DarcsURL: C:/home/shelarcy/wxhaskell
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="=_"
--=_
Content-Type: text/plain
Content-Transfer-Encoding: quoted-printable
Wed Jul 9 15:38:20 =93=8C=8B=9E (=95W=8F=80=8E=9E) 2008 shelarcy <shelarc=
y...@gm...>
* Fix: linking incorrect runtime on Visual Studio (pointed out by John La=
sk).
Wed Jul 9 15:38:51 =93=8C=8B=9E (=95W=8F=80=8E=9E) 2008 shelarcy <shelarc=
y...@gm...>
* Fix building with old version of Visual Studio (according to John Lask).
--=_
Content-Type: text/x-darcs-patch; name="fix_-linking-incorrect-runtime-on-visual-studio-_pointed-out-by-john-lask__.dpatch"
Content-Transfer-Encoding: quoted-printable
Content-Description: A darcs patch for your repository!
New patches:
[Fix: linking incorrect runtime on Visual Studio (pointed out by John Lask)=
.
shelarcy <she...@gm...>**20080709063820] {
hunk ./wxc/wxc-2.4.dsp 45
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS=
" /D "_MBCS" /D "_USRDLL" /D "WXC_EXPORTS" /YX /FD /c=0D
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\wxWindows-2.4.2\lib\mswu" /I "=
include" /I "..\..\wxWindows-2.4.2\contrib\include" /I "..\..\wxWindows-2.4=
.2\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D=
"WXC_EXPORTS" /D WINVER=3D0x400 /D "_MT" /D wxUSE_GUI=3D1 /D wxUSE_UNICODE=
=3D1 /D BUILD_WXC=3D1 /D "_DLL" /YX /FD /c=0D
+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS=
" /D "_MBCS" /D "_USRDLL" /D "WXC_EXPORTS" /YX /FD /c=0D
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\wxWindows-2.4.2\lib\mswu" /I "=
include" /I "..\..\wxWindows-2.4.2\contrib\include" /I "..\..\wxWindows-2.4=
.2\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D=
"WXC_EXPORTS" /D WINVER=3D0x400 /D "_MT" /D wxUSE_GUI=3D1 /D wxUSE_UNICODE=
=3D1 /D BUILD_WXC=3D1 /D "_DLL" /YX /FD /c=0D
hunk ./wxc/wxc-2.4.dsp 75
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D =
"_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXC_EXPORTS" /YX /FD /GZ /c=0D
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\..\wxWindows-2.4.2\lib\m=
swud" /I "..\..\wxWindows-2.4.2\contrib\include" /I "include" /I "..\..\wxW=
indows-2.4.2\include" /D "_DEBUG" /D "__WXDEBUG__" /D WXDEBUG=3D1 /D "WIN32=
" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXC_EXPORTS" /D WINVER=3D0x400 =
/D "_MT" /D wxUSE_GUI=3D1 /D wxUSE_UNICODE=3D1 /D BUILD_WXC=3D1 /D "_DLL" /=
YX /FD /GZ /c=0D
+# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D =
"_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXC_EXPORTS" /YX /FD /GZ /c=0D
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\wxWindows-2.4.2\lib\m=
swud" /I "..\..\wxWindows-2.4.2\contrib\include" /I "include" /I "..\..\wxW=
indows-2.4.2\include" /D "_DEBUG" /D "__WXDEBUG__" /D WXDEBUG=3D1 /D "WIN32=
" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXC_EXPORTS" /D WINVER=3D0x400 =
/D "_MT" /D wxUSE_GUI=3D1 /D wxUSE_UNICODE=3D1 /D BUILD_WXC=3D1 /D "_DLL" /=
YX /FD /GZ /c=0D
hunk ./wxc/wxc-2.6.dsp 45
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS=
" /D "_MBCS" /D "_USRDLL" /D "WXC_EXPORTS" /YX /FD /c=0D
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\wxWidgets-2.6.4\lib\vc_lib\msw=
u" /I "..\..\wxWidgets-2.6.4\contrib\include" /I "include" /I "..\..\wxWidg=
ets-2.6.4\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USR=
DLL" /D "WXC_EXPORTS" /D WINVER=3D0x400 /D "_MT" /D wxUSE_GUI=3D1 /D wxUSE_=
UNICODE=3D1 /D wxUSE_STC=3D1 /D wxUSE_SVG=3D1 /D BUILD_WXC=3D1 /D "_DLL" /Y=
X /FD /c=0D
+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS=
" /D "_MBCS" /D "_USRDLL" /D "WXC_EXPORTS" /YX /FD /c=0D
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\wxWidgets-2.6.4\lib\vc_lib\msw=
u" /I "..\..\wxWidgets-2.6.4\contrib\include" /I "include" /I "..\..\wxWidg=
ets-2.6.4\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USR=
DLL" /D "WXC_EXPORTS" /D WINVER=3D0x400 /D "_MT" /D wxUSE_GUI=3D1 /D wxUSE_=
UNICODE=3D1 /D wxUSE_STC=3D1 /D wxUSE_SVG=3D1 /D BUILD_WXC=3D1 /D "_DLL" /Y=
X /FD /c=0D
hunk ./wxc/wxc-2.6.dsp 76
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D =
"_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXC_EXPORTS" /YX /FD /GZ /c=0D
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\..\wxWidgets-2.6.4\lib\v=
c_lib\mswud" /I "include" /I "..\..\wxWidgets-2.6.4\include" /I "..\..\wxWi=
dgets-2.6.4\contrib\include" /D "_DEBUG" /D "__WXDEBUG__" /D WXDEBUG=3D1 /D=
"WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXC_EXPORTS" /D WINVER=
=3D0x400 /D "_MT" /D wxUSE_GUI=3D1 /D wxUSE_UNICODE=3D1 /D wxUSE_STC=3D1 /D=
wxUSE_SVG=3D1 /D BUILD_WXC=3D1 /D "_DLL" /YX /FD /GZ /c=0D
+# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D =
"_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXC_EXPORTS" /YX /FD /GZ /c=0D
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\wxWidgets-2.6.4\lib\v=
c_lib\mswud" /I "include" /I "..\..\wxWidgets-2.6.4\include" /I "..\..\wxWi=
dgets-2.6.4\contrib\include" /D "_DEBUG" /D "__WXDEBUG__" /D WXDEBUG=3D1 /D=
"WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXC_EXPORTS" /D WINVER=
=3D0x400 /D "_MT" /D wxUSE_GUI=3D1 /D wxUSE_UNICODE=3D1 /D wxUSE_STC=3D1 /D=
wxUSE_SVG=3D1 /D BUILD_WXC=3D1 /D "_DLL" /YX /FD /GZ /c=0D
hunk ./wxc/wxc-2.8.dsp 45
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS=
" /D "_MBCS" /D "_USRDLL" /D "WXC_EXPORTS" /YX /FD /c=0D
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\wxWidgets-2.8.7\lib\vc_lib\msw=
u" /I "..\..\wxWidgets-2.8.7\contrib\include" /I "include" /I "..\..\wxWidg=
ets-2.8.7\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USR=
DLL" /D "WXC_EXPORTS" /D WINVER=3D0x400 /D "_MT" /D wxUSE_GUI=3D1 /D wxUSE_=
UNICODE=3D1 /D wxUSE_STC=3D1 /D wxUSE_SVG=3D1 /D BUILD_WXC=3D1 /D "_DLL" /Y=
X /FD /c=0D
+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS=
" /D "_MBCS" /D "_USRDLL" /D "WXC_EXPORTS" /YX /FD /c=0D
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\wxWidgets-2.8.7\lib\vc_lib\msw=
u" /I "..\..\wxWidgets-2.8.7\contrib\include" /I "include" /I "..\..\wxWidg=
ets-2.8.7\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USR=
DLL" /D "WXC_EXPORTS" /D WINVER=3D0x400 /D "_MT" /D wxUSE_GUI=3D1 /D wxUSE_=
UNICODE=3D1 /D wxUSE_STC=3D1 /D wxUSE_SVG=3D1 /D BUILD_WXC=3D1 /D "_DLL" /Y=
X /FD /c=0D
hunk ./wxc/wxc-2.8.dsp 76
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D =
"_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXC_EXPORTS" /YX /FD /GZ /c=0D
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\..\wxWidgets-2.8.7\lib\v=
c_lib\mswud" /I "include" /I "..\..\wxWidgets-2.8.7\include" /I "..\..\wxWi=
dgets-2.8.7\contrib\include" /D "_DEBUG" /D "__WXDEBUG__" /D WXDEBUG=3D1 /D=
"WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXC_EXPORTS" /D WINVER=
=3D0x400 /D "_MT" /D wxUSE_GUI=3D1 /D wxUSE_UNICODE=3D1 /D wxUSE_STC=3D1 /D=
wxUSE_SVG=3D1 /D BUILD_WXC=3D1 /D "_DLL" /YX /FD /GZ /c=0D
+# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D =
"_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXC_EXPORTS" /YX /FD /GZ /c=0D
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\wxWidgets-2.8.7\lib\v=
c_lib\mswud" /I "include" /I "..\..\wxWidgets-2.8.7\include" /I "..\..\wxWi=
dgets-2.8.7\contrib\include" /D "_DEBUG" /D "__WXDEBUG__" /D WXDEBUG=3D1 /D=
"WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXC_EXPORTS" /D WINVER=
=3D0x400 /D "_MT" /D wxUSE_GUI=3D1 /D wxUSE_UNICODE=3D1 /D wxUSE_STC=3D1 /D=
wxUSE_SVG=3D1 /D BUILD_WXC=3D1 /D "_DLL" /YX /FD /GZ /c=0D
}
[Fix building with old version of Visual Studio (according to John Lask).
shelarcy <she...@gm...>**20080709063851] {
hunk ./wxc/include/wrapper.h 12
+/* MSVC-6 defines _MSC_VER=3D1200 */
+#elif _MSC_VER> 1200
+#else
+/* MSVC-6 does not define intptr_t */
+typedef int intptr_t;
hunk ./wxc/src/sound.cpp 63
- return self->Stop();
+ self->Stop();
}
Context:
[Add download link to two GHC 6.8.3's binary.
shelarcy <she...@gm...>**20080630144522] =
[Fix Building without WXWIN_COMPATIBILITY_2_6 in eljrc.cpp.
shelarcy <she...@gm...>**20080630120326] =
[Fix: hardcoded keycode doesn't work well when using wxWidgets 2.8.x.
shelarcy <she...@gm...>**20080630120118] =
[Clean up duplicate ewxw_def.h file.
shelarcy <she...@gm...>**20080628114449] =
[Remove wxScintilla code (use wxStyledTextCtrl instead).
shelarcy <she...@gm...>**20080626055907] =
[Fix: eljdcsvg.cpp doesn't build other than Windows.
shelarcy <she...@gm...>**20080625095858] =
[Just reviving ELJ's wxXmlResource code.
shelarcy <she...@gm...>**20080625052046] =
[Use Int64 representing wxFileOffset type.
shelarcy <she...@gm...>**20080624152015] =
[Add dropped wxMedia's events to wxc.
shelarcy <she...@gm...>**20080624140139] =
[Add dropped wx*DCs.
shelarcy <she...@gm...>**20080624122641] =
[Update building information about --with-contrib option.
shelarcy <she...@gm...>**20080624113243] =
[Revive wxSVGFileDC code.
shelarcy <she...@gm...>**20080624113214] =
[Change --with-stc to --with-contrib for future contrib libraries support.
shelarcy <she...@gm...>**20080624032429] =
[Update information about builiding wxWidgets and wxc with Microsoft Visual=
C++ Express Edition.
shelarcy <she...@gm...>**20080624023628] =
[Fix #1400488: Win install problem when path with spaces, e.g. "Program Fil=
es".
shelarcy <she...@gm...>**20080624020657] =
[Partialy fix a bug in wxhaskell-register.bat.
shelarcy <she...@gm...>**20080623152256] =
[Add --enable-optimization opition for building library with optimization f=
lags.
shelarcy <she...@gm...>**20080531114050] =
[Use CDouble and realToFrac instead of marshaling Double type directly.
shelarcy <she...@gm...>**20080530024730] =
[Remove unused make before-dist.
shelarcy <she...@gm...>**20080529120234] =
[Fix a bug in haddock documentation structure of Rectangle.
shelarcy <she...@gm...>**20080529111415] =
[Use putTraceMsg instead of hPutStrLn for Windows GUI-only program.
shelarcy <she...@gm...>**20080526070627] =
[Add very experimental wxGraphicsContext support.
shelarcy <she...@gm...>**20080526063228] =
[Change Point, Size, Vector and Rect to be type synonym for adding wxGraphi=
csContext support.
shelarcy <she...@gm...>**20080526055033] =
[Fix: wxSound isn't managed object.
shelarcy <she...@gm...>**20080524021436] =
[Remove wxWidgets 2.4.x's wxWave code.
shelarcy <she...@gm...>**20080430002921] =
[Remove Wave type synonym.
shelarcy <she...@gm...>**20080429233348] =
[Change samples/contrib/PaintDirect to use withPixelBuffer instead of image=
GetPixelBuffer.
shelarcy <she...@gm...>**20080429232026] =
[Change imageGetPixelArray and imageCreateFromPixelArray to be more flexibl=
e.
shelarcy <she...@gm...>**20080429183518] =
[Fix: some samples don't run because of using undefined function since wxWi=
dgets 2.8.x support.
shelarcy <she...@gm...>**20080429145931] =
[Add note about defaultButton's incompatible change since wxWidgets 2.8.x s=
upport.
shelarcy <she...@gm...>**20080429141545] =
[Change Var type synonym from IORef to stm's TVar for thread safety.
shelarcy <she...@gm...>**20080425114909] =
[Fix: dists dropped two samples in samples/wx direcotory.
shelarcy <she...@gm...>**20080425102416] =
[Clean up wxWindows class's function declaration.
shelarcy <she...@gm...>**20080425054152] =
[Clean up #ifdef wxUSE_UNICODE flag by wxStrdup function.
shelarcy <she...@gm...>**20080425051404] =
[Replace _wcsdup with wxStrdup in wxWidgets 2.8 compat code.
Eric Kow <eri...@gm...>**20080420115042
According to shelarcy and Jeremy, _wcsdup is Windows-specific.
] =
[wxWidgets 2.8.7 on 0.10.3 release version
jer...@gm...**20080410134132] =
[TAG wxWidgets2.8.7_on_0.10.3rc1
jer...@gm...**20080410113256] =
[Add TopLevelWindow for wxWidgets 2.8.7 support
jer...@gm...**20080410113113] =
[Preliminary wxWidgets 2.8.7 support
jer...@gm...**20080410112559] =
[Shifted to Pavel's Debian build system
Mads Lindstroem <mad...@ya...>**20080413131752
=
I have changed the current Debian build system to the one made by
Pavel Shramov. It is a lot simpler than the current one. Also it is
similar to what can normally be found in the Debian archieve, and I
therefore assume that it will be easier to some day get an offecial
WxHaskell Debian package.
=
All of the files in the debian directory is the work of Pavel.
=
I changed only one thing, as compared to Pavel's version. Namely that
I removed the dependcy on libghc6-time-dev. I did it, as this
dependency makes the package un-buildable on Debian unstable (GHC
6.8). At release 0.10.3, some users requested a GHC 6.8 version, and
it is therefore important that we can provide one.
=
=
] =
[Removed check for Data.Time
Mads Lindstroem <mad...@ya...>**20080413114242
=
Removed the check for Data.Time as it is not needed. I originally
added it as I had somehow overlooked the Debian package
libghc6-time-dev. Sorry about the unneccessary noise :(
=
] =
[Fix: samples/wx/makefile's "make clean" doesn't clean Windows things.
shelarcy <she...@gm...>**20080409133446] =
[Fix 1932640: samples/wx/FileBrowse is broken on Windows. =
shelarcy <she...@gm...>**20080409132157] =
[Add containers package dependency to wxcore.cabal.
shelarcy <she...@gm...>**20080328131307] =
[Remove IntMap from wxcore. Use the containers version instead.
shelarcy <she...@gm...>**20080328131144] =
[Add containers package to wxcore.
shelarcy <she...@gm...>**20080328123744] =
[Remove Set from wxdirect. Use the containers version instead.
Eric Kow <eri...@gm...>**20080322140544] =
[Remove Map from wxdirect. Use the containers version instead.
Eric Kow <eri...@gm...>**20080322140245] =
[Add containers package to wxdirect.
Eric Kow <eri...@gm...>**20080322135933] =
[Split makefile entry for wxdirect containers into separate lines.
Eric Kow <eri...@gm...>**20080322135824
For more independence between patches which remove Map, Set and
MultiSet in favour of the containers version.
] =
[Use string comparison in haddockversion test.
Eric Kow <eri...@gm...>**20080326224059
Again, for the case where haddock is not found.
] =
[Fix bug in configure script if Haddock is not found.
Eric Kow <eri...@gm...>**20080324155706
(discovered by S. Doaitse Swierstra)
] =
[Add wx/license.txt to srcdist (to avoid build error).
Eric Kow <eri...@gm...>**20080323125315] =
[Fix download link typos.
Eric Kow <eri...@gm...>**20080322130605] =
[Kill a broken link (we no longer use CVS).
Eric Kow <eri...@gm...>**20080322125822] =
[Overwrite 0.10.3rc1 news with proper 0.10.3 news.
Eric Kow <eri...@gm...>**20080322125032] =
[TAG 0.10.3
Eric Kow <eri...@gm...>**20080321183613] =
Patch bundle hash:
ef8bb653f2416634cbc120fb4db13943dbe4fcaa
--=_--
.
|
