Mercurial > fife-parpg
changeset 394:5bb52a43f48b
Fixed a small issue when building with scons on windows. If you have another version of mingw in PATH it would use that one instead.
Also updated the a couple SWIG interfaces to handle simple output parameters as described in ticket 340.
| author | prock@33b003aa-7bff-0310-803a-e67f0ece8222 |
|---|---|
| date | Tue, 26 Jan 2010 16:53:51 +0000 |
| parents | d819a70949d2 |
| children | 70697641fca3 |
| files | build/win32-config.py engine/core/vfs/raw/rawdata.i engine/core/video/video.i |
| diffstat | 3 files changed, 6 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/build/win32-config.py Sun Jan 24 16:52:40 2010 +0000 +++ b/build/win32-config.py Tue Jan 26 16:53:51 2010 +0000 @@ -10,8 +10,8 @@ swigdir = os.path.join(path, 'build', 'win32', 'applications', 'swigwin-1.3.40') mingwbindir = os.path.join(path, 'build', 'win32', 'applications', 'mingw', 'bin') - env.AppendENVPath('PATH', swigdir) - env.AppendENVPath('PATH', mingwbindir) + env.PrependENVPath('PATH', swigdir) + env.PrependENVPath('PATH', mingwbindir) includepath = os.path.join(path, 'build', 'win32', 'includes') staticlibpath = os.path.join(path, 'build', 'win32', 'static_libs', 'mingw')
--- a/engine/core/vfs/raw/rawdata.i Sun Jan 24 16:52:40 2010 +0000 +++ b/engine/core/vfs/raw/rawdata.i Tue Jan 26 16:53:51 2010 +0000 @@ -28,6 +28,8 @@ namespace FIFE { %apply std::string &OUTPUT { std::string& outbuffer }; + %apply uint8_t *OUTPUT { uint8_t* buffer }; + class RawData { public: RawData(RawDataSource* datasource);
--- a/engine/core/video/video.i Sun Jan 24 16:52:40 2010 +0000 +++ b/engine/core/video/video.i Tue Jan 26 16:53:51 2010 +0000 @@ -39,6 +39,8 @@ class Point; class ResourceLocation; + %apply uint8_t *OUTPUT { uint8_t* r, uint8_t* g, uint8_t* b, uint8_t* a }; + class AbstractImage { public: virtual ~AbstractImage() {}