libAthena
/
athena
mirror of https://github.com/libAthena/athena.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

confirmed linux build working; solved signing warnings

This commit is contained in:
Jack Andersen 2015-06-20 08:07:11 -10:00
parent 5a0f2e8ed4
commit a0f0690719
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Athena.pro
View File

@ -51,15 +51,15 @@ unix {
} }
win32 { win32 {
isEmpty(PREFIX) { isEmpty(PREFIX) {
PREFIX = $$PWD/pkg PREFIX = $$PWD/pkg
} }
libFiles.path = $$PREFIX/lib libFiles.path = $$PREFIX/lib
libFiles.files = $$PWD/lib/* libFiles.files = $$PWD/lib/*
headerFiles.path = $$PREFIX/include/Athena headerFiles.path = $$PREFIX/include/Athena
headerFiles.files = $$PWD/include/* headerFiles.files = $$PWD/include/*
INSTALLS += libFiles headerFiles INSTALLS += libFiles headerFiles
} }

2
PKGBUILD
View File

@ -1,7 +1,7 @@
# PKGBUILD for libAthena # PKGBUILD for libAthena
_pkgname=libathena _pkgname=libathena
pkgname=$_pkgname-git pkgname=$_pkgname-git
pkgver=1.1.0.39.g2d8aeb7 pkgver=1.1.0.40.g687a7ee
pkgrel=1 pkgrel=1
pkgdesc="Basic cross platform IO library" pkgdesc="Basic cross platform IO library"
arch=('i686' 'x86_64') arch=('i686' 'x86_64')

12
src/Athena/FileWriter.cpp
View File

@ -316,16 +316,16 @@ void FileWriter::writeString(const std::string& val, atInt32 fixedLen)
} }
else else
{ {
if (val.length() >= fixedLen) if ((atInt32)val.length() >= fixedLen)
{ {
if (fwrite(val.c_str(), 1, fixedLen, m_fileHandle) != fixedLen) if ((atInt32)fwrite(val.c_str(), 1, fixedLen, m_fileHandle) != fixedLen)
THROW_IO_EXCEPTION("Unable to write to stream"); THROW_IO_EXCEPTION("Unable to write to stream");
} }
else else
{ {
if (fwrite(val.c_str(), 1, val.length(), m_fileHandle) != val.length()) if (fwrite(val.c_str(), 1, val.length(), m_fileHandle) != val.length())
THROW_IO_EXCEPTION("Unable to write to stream"); THROW_IO_EXCEPTION("Unable to write to stream");
for (atUint32 i=val.length() ; i<fixedLen ; ++i) for (atInt32 i=val.length() ; i<fixedLen ; ++i)
{ {
if (fwrite(&term, 1, 1, m_fileHandle) != 1) if (fwrite(&term, 1, 1, m_fileHandle) != 1)
THROW_IO_EXCEPTION("Unable to write to stream"); THROW_IO_EXCEPTION("Unable to write to stream");
@ -352,16 +352,16 @@ void FileWriter::writeWString(const std::wstring& val, atInt32 fixedLen)
} }
else else
{ {
if (val.length() >= fixedLen) if ((atInt32)val.length() >= fixedLen)
{ {
if (fwrite(val.c_str(), 2, fixedLen, m_fileHandle) != fixedLen) if ((atInt32)fwrite(val.c_str(), 2, fixedLen, m_fileHandle) != fixedLen)
THROW_IO_EXCEPTION("Unable to write to stream"); THROW_IO_EXCEPTION("Unable to write to stream");
} }
else else
{ {
if (fwrite(val.c_str(), 2, val.length(), m_fileHandle) != val.length()) if (fwrite(val.c_str(), 2, val.length(), m_fileHandle) != val.length())
THROW_IO_EXCEPTION("Unable to write to stream"); THROW_IO_EXCEPTION("Unable to write to stream");
for (atUint32 i=val.length() ; i<fixedLen ; ++i) for (atInt32 i=val.length() ; i<fixedLen ; ++i)
{ {
if (fwrite(&term, 2, 1, m_fileHandle) != 1) if (fwrite(&term, 2, 1, m_fileHandle) != 1)
THROW_IO_EXCEPTION("Unable to write to stream"); THROW_IO_EXCEPTION("Unable to write to stream");