mirror of
https://github.com/TES3MP/openmw-tes3mp.git
synced 2025-01-21 13:23:52 +00:00
Merge remote-tracking branch 'ace/win-fixes' into next
This commit is contained in:
commit
5e3529783d
3 changed files with 14 additions and 5 deletions
|
@ -391,11 +391,11 @@ if(WIN32)
|
|||
INSTALL(DIRECTORY "${OpenMW_BINARY_DIR}/resources" DESTINATION ".")
|
||||
|
||||
SET(CPACK_GENERATOR "NSIS")
|
||||
SET(CPACK_PACKAGE_NAME "OpenMW")
|
||||
SET(CPACK_PACKAGE_NAME "OpenMW ${OPENMW_VERSION}")
|
||||
SET(CPACK_PACKAGE_VENDOR "OpenMW.org")
|
||||
SET(CPACK_PACKAGE_VERSION ${OPENMW_VERSION})
|
||||
SET(CPACK_PACKAGE_VERSION_MAJOR ${OPENMW_VERSION_MAJOR})
|
||||
SET(CPACK_PACKAGE_VERSION_MINOR ${OPENMW_VERSION_MINO})
|
||||
SET(CPACK_PACKAGE_VERSION_MINOR ${OPENMW_VERSION_MINOR})
|
||||
SET(CPACK_PACKAGE_VERSION_PATCH ${OPENMW_VERSION_RELEASE})
|
||||
SET(CPACK_PACKAGE_EXECUTABLES "openmw;OpenMW;omwlauncher;OpenMW Launcher")
|
||||
SET(CPACK_NSIS_CREATE_ICONS_EXTRA "CreateShortCut '\$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\Readme.lnk' '\$INSTDIR\\\\readme.txt'")
|
||||
|
|
|
@ -3,19 +3,19 @@
|
|||
|
||||
CSMWorld::RecordBase::~RecordBase() {}
|
||||
|
||||
bool CSMWorld::RecordBase::RecordBase::isDeleted() const
|
||||
bool CSMWorld::RecordBase::isDeleted() const
|
||||
{
|
||||
return mState==State_Deleted || mState==State_Erased;
|
||||
}
|
||||
|
||||
|
||||
bool CSMWorld::RecordBase::RecordBase::isErased() const
|
||||
bool CSMWorld::RecordBase::isErased() const
|
||||
{
|
||||
return mState==State_Erased;
|
||||
}
|
||||
|
||||
|
||||
bool CSMWorld::RecordBase::RecordBase::isModified() const
|
||||
bool CSMWorld::RecordBase::isModified() const
|
||||
{
|
||||
return mState==State_Modified || mState==State_ModifiedOnly;
|
||||
}
|
|
@ -17,6 +17,11 @@
|
|||
#include "../mwsound/sound_decoder.hpp"
|
||||
#include "../mwsound/sound.hpp"
|
||||
|
||||
#ifdef _WIN32
|
||||
#include <BaseTsd.h>
|
||||
|
||||
typedef SSIZE_T ssize_t;
|
||||
#endif
|
||||
|
||||
namespace MWRender
|
||||
{
|
||||
|
@ -361,7 +366,11 @@ class MovieAudioDecoder : public MWSound::Sound_Decoder
|
|||
}
|
||||
|
||||
void open(const std::string&)
|
||||
#ifdef _WIN32
|
||||
{ fail(std::string("Invalid call to ")+__FUNCSIG__); }
|
||||
#else
|
||||
{ fail(std::string("Invalid call to ")+__PRETTY_FUNCTION__); }
|
||||
#endif
|
||||
|
||||
void close() { }
|
||||
|
||||
|
|
Loading…
Reference in a new issue