Wed Nov 15 13:10:06 CET 2006 Arie Middelkoop <[EMAIL PROTECTED]>
* Added the -fPIC compiler flag to CXX options in the makefile.
Apparantly, my platform (gentoo x86_64 linux) required that .o files are
"relocatable" when there
are linked into a dynamic library.
(It might be an idea to use libtool to hide this kind of platform-specific
details)
Wed Nov 15 13:14:08 CET 2006 Arie Middelkoop <[EMAIL PROTECTED]>
* Compiling wxHaskell on a 64bits platform fails, because there
are some assumptions in the code that assume that integers are
32bits. For example, there are a couple of assignments of a
pointer to an int.
This patch fixes these problems. Sometimes, after assigning a
pointer to an integer, the int was used as a boolean value. In
those cases, instead of returning a pointer p, I changed the
code to return p != NULL. In two other cases, a pointer is stored
inside the int and in these cases I changed the type of the
int to intptr_t, of which it is guaranteed that a pointer can be
assigned to it and recovered from it (requires <inttypes.h>, i'm
not sure if it is available of windows platforms though).
New patches:
[Added the -fPIC compiler flag to CXX options in the makefile.
Arie Middelkoop <[EMAIL PROTECTED]>**20061115121006
Apparantly, my platform (gentoo x86_64 linux) required that .o files are "relocatable" when there
are linked into a dynamic library.
(It might be an idea to use libtool to hide this kind of platform-specific details)
] {
hunk ./makefile 663
-WXC-CXXFLAGS =$(WXWIN-CXXFLAGS) -I$(WXC-INCDIR)
+WXC-CXXFLAGS =$(WXWIN-CXXFLAGS) -fPIC -I$(WXC-INCDIR)
}
[Compiling wxHaskell on a 64bits platform fails, because there
Arie Middelkoop <[EMAIL PROTECTED]>**20061115121408
are some assumptions in the code that assume that integers are
32bits. For example, there are a couple of assignments of a
pointer to an int.
This patch fixes these problems. Sometimes, after assigning a
pointer to an integer, the int was used as a boolean value. In
those cases, instead of returning a pointer p, I changed the
code to return p != NULL. In two other cases, a pointer is stored
inside the int and in these cases I changed the type of the
int to intptr_t, of which it is guaranteed that a pointer can be
assigned to it and recovered from it (requires <inttypes.h>, i'm
not sure if it is available of windows platforms though).
] {
hunk ./wxc/include/ewxw/wxc_types.h 102
-#define TArrayIntOut int*
+#define TArrayIntOut intptr_t*
hunk ./wxc/include/wrapper.h 6
+
+/* just to ensure that intptr_t exists */
+#include <inttypes.h>
hunk ./wxc/src/ewxw/eljcolour.cpp 104
- return (int) wxTheColourDatabase->FindColour ((wxChar*)_name);
+ return (wxTheColourDatabase->FindColour ((wxChar*)_name)) != NULL;
hunk ./wxc/src/ewxw/eljtoolbar.cpp 18
- return (int)((wxToolBar*)_obj)->AddControl ((wxControl*)ctrl);
+ return ((wxToolBar*)_obj)->AddControl ((wxControl*)ctrl) != NULL;
hunk ./wxc/src/extra.cpp 195
- int GetId();
+ intptr_t GetId();
hunk ./wxc/src/extra.cpp 222
-int wxInputSink::GetId()
+intptr_t wxInputSink::GetId()
hunk ./wxc/src/extra.cpp 224
- return (int)m_input;
+ return (intptr_t)m_input;
hunk ./wxc/src/treectrl.cpp 299
-EWXWEXPORT(int, wxTreeCtrl_GetSelections)(void* _obj, int* selections)
+EWXWEXPORT(int, wxTreeCtrl_GetSelections)(void* _obj, intptr_t* selections)
hunk ./wxc/src/treectrl.cpp 312
- selections[i] = (int)(((wxTreeItemId*)sel[i])->m_pItem);
+ selections[i] = (intptr_t)(((wxTreeItemId*)sel[i])->m_pItem);
hunk ./wxc/src/treectrl.cpp 314
- selections[i] = (int)(sel[i].m_pItem);
+ selections[i] = (intptr_t)(sel[i].m_pItem);
}
Context:
[Tweak wx build target to depend on wxcore-clean.
Eric Kow <[EMAIL PROTECTED]>**20061115002142
This avoids weird build errors with GHC 6.6 like
wx/src/Graphics/UI/WX/Types.hs:94:0:
Bad interface file: out/wx/imports/Graphics/UI/WXCore/Types.hi
Something is amiss; requested module
]
[Update Windows/VC++ build for 0.10.1 (from [EMAIL PROTECTED]).
Eric Kow <[EMAIL PROTECTED]>**20061029082957
]
[Separate make/make install for wxcore and wx.
Eric Kow <[EMAIL PROTECTED]>**20061027201218
Now the user has to type
make
(sudo) make install
make wx
(sudo) make wx-install
This is a tweak of Shelarcy's patch for making wxhaskell compile on GHC 6.6.
The intention is to avoid the surprising behaviour of wxcore being installed
when the user types 'make'.
]
[Add shelarcy patch for compile with GHC-6.6
[EMAIL PROTECTED]
[Add support for toolbar divider and other toolbar options (from [EMAIL PROTECTED])
[EMAIL PROTECTED]
[Add support for toolbar divider (for [EMAIL PROTECTED])
[EMAIL PROTECTED]
[Add support for list item mask (from [EMAIL PROTECTED])
[EMAIL PROTECTED]
[Add support for Calendar events (from [EMAIL PROTECTED])
[EMAIL PROTECTED]
[Add support for wxWidgets version >= 2.5 (Sound API, db API)
[EMAIL PROTECTED]
[Shelarcy patch: fix typos in wxHaskell samples/contrib
[EMAIL PROTECTED]
[(OS X) Skip intermediate step of compiling master.o.
Eric Kow <[EMAIL PROTECTED]>**20060813212620
Removing this step (which compiles master.o, and combines it with other
stuff to get the real library we want) avoids weird error messages like
ld: out/wxc/master.o undefined symbol 36218 (__ZdaPv) can't be a weak
definition
It's quite possible that this breaks something else, though...
]
[Update VC++ project file to reflect new wxWidgets version support (untested)
[EMAIL PROTECTED]
[Update VC++ project file to reflect updated DLL version supporting wxWidgets 2.6.3
[EMAIL PROTECTED]
[Update revision numbers and wxversion guesses for Windows / VC++ ([EMAIL PROTECTED])
[EMAIL PROTECTED]
[Shelarcy patch (VC project for wxWindows 2.6.3)
[EMAIL PROTECTED]
[Shelarcy patch (WxcTypes.hs)
[EMAIL PROTECTED]
[Shelarcy patch (eljdialup.cpp)
[EMAIL PROTECTED]
[Shelarcy patch (db.cpp)
[EMAIL PROTECTED]
[(wxc, Unicode) Files for compiling unicode version under Visual Studio.
shelarcy <[EMAIL PROTECTED]>**20060813212315
This is Eric Kow recording on Shelarcy's behalf. This corresponds to version
08 of my Unicode patch.
]
[Add a small makefile for compiling the samples.
Eric Kow <[EMAIL PROTECTED]>**20060813211705
(This comes from version 08 of my Unicode patch).
]
[(wxcore, Unicode) Add/use ability to interact with C wchar_t.
Eric Kow <[EMAIL PROTECTED]>**20060813211211
This corresponds to the wxcore part of my Unicode patch, version 08
modulo trailing whitespace.
I believe this would require for wxWidgets and wxhaskell to be compiled with
Unicode enabled.
]
[(wxdirect, Unicode) Use the Haskell types for C wchar_t and friends.
Eric Kow <[EMAIL PROTECTED]>**20060813210420
I believe this would require that wxWidgets be compiled with Unicode
enabled.
]
[(wxc, Unicode) Use wxChar instead of char.
Eric Kow <[EMAIL PROTECTED]>**20060813205557
wxChar is a C preprocessor macro that selects for char under
--disable-unicode, and for wchar_t under --enable-unicode.
This corresponds to version 08 of my Unicode patch, but only the parts
which affect wxc.
]
[[wxhaskell-from-cvs @ 2005-05-08 08:12:51 by dleijen]
dleijen**20050508081251
updated change log
]
[[wxhaskell-from-cvs @ 2005-05-08 07:24:23 by dleijen]
dleijen**20050508072423
Compile wx via -fvia-C to fix crash with ghci on windows
]
[TAG wxhakell-0-9-4
Unknown tagger**20060712042545]
Patch bundle hash:
39f9c5c1159a05d48ab8f8d068eea7d7200d90a4
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
wxhaskell-users mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/wxhaskell-users
