Fixed things pointed out by Alex Szpakowski and Bart von Strien

This commit is contained in:
T-Bone
2016-04-09 07:28:03 +02:00
parent b2291fb62a
commit 4ef7504c05
6 changed files with 22 additions and 14 deletions
+1 -1
View File
@@ -521,7 +521,7 @@ std::string Filesystem::getAppdataDirectory()
{
#ifdef LOVE_WINDOWS_UWP
appdata = getUserDirectory();
#elif LOVE_WINDOWS
#elif defined(LOVE_WINDOWS)
wchar_t *w_appdata = _wgetenv(L"APPDATA");
appdata = to_utf8(w_appdata);
replace_char(appdata, '\\', '/');
+1 -1
View File
@@ -308,7 +308,7 @@ int luaopen_love(lua_State *L)
lua_setfield(L, -2, "isVersionCompatible");
#ifdef LOVE_WINDOWS_UWP
lua_pushstring(L, "Universal Windows Platform");
lua_pushstring(L, "UWP");
#elif LOVE_WINDOWS
lua_pushstring(L, "Windows");
#elif defined(LOVE_MACOSX)
+2 -2
View File
@@ -24,7 +24,7 @@
#include <iostream>
#ifndef LOVE_NO_MPG123
#ifndef LOVE_NOMPG123
namespace love
{
@@ -289,4 +289,4 @@ double Mpg123Decoder::getDuration()
} // sound
} // love
#endif // LOVE_NO_MPG123
#endif // LOVE_NOMPG123
+2 -2
View File
@@ -25,7 +25,7 @@
#include "common/Data.h"
#include "Decoder.h"
#ifndef LOVE_NO_MPG123
#ifndef LOVE_NOMPG123
// libmpg123
#ifdef LOVE_APPLE_USE_FRAMEWORKS
@@ -90,6 +90,6 @@ private:
} // sound
} // love
#endif // LOVE_NO_MPG123
#endif // LOVE_NOMPG123
#endif // LOVE_SOUND_LULLABY_LIBMPG123_DECODER_H
+6 -6
View File
@@ -30,9 +30,9 @@
#include "WaveDecoder.h"
//#include "FLACDecoder.h"
#ifndef LOVE_NO_MPG123
#ifndef LOVE_NOMPG123
# include "Mpg123Decoder.h"
#endif // LOVE_NO_MPG123
#endif // LOVE_NOMPG123
#ifdef LOVE_SUPPORT_COREAUDIO
# include "CoreAudioDecoder.h"
@@ -51,9 +51,9 @@ Sound::Sound()
Sound::~Sound()
{
#ifndef LOVE_NO_MPG123
#ifndef LOVE_NOMPG123
Mpg123Decoder::quit();
#endif // LOVE_NO_MPG123
#endif // LOVE_NOMPG123
}
const char *Sound::getName() const
@@ -75,10 +75,10 @@ sound::Decoder *Sound::newDecoder(love::filesystem::FileData *data, int bufferSi
else if (ModPlugDecoder::accepts(ext))
decoder = new ModPlugDecoder(data, ext, bufferSize);
#endif // LOVE_NO_MODPLUG
#ifndef LOVE_NO_MPG123
#ifndef LOVE_NOMPG123
else if (Mpg123Decoder::accepts(ext))
decoder = new Mpg123Decoder(data, ext, bufferSize);
#endif // LOVE_NO_MPG123
#endif // LOVE_NOMPG123
else if (VorbisDecoder::accepts(ext))
decoder = new VorbisDecoder(data, ext, bufferSize);
#ifdef LOVE_SUPPORT_GME
+10 -2
View File
@@ -83,6 +83,8 @@ std::string System::getOS() const
return "OS X";
#elif defined(LOVE_IOS)
return "iOS";
#elif defined(LOVE_WINDOWS_UWP)
return "UWP";
#elif defined(LOVE_WINDOWS)
return "Windows";
#elif defined(LOVE_ANDROID)
@@ -149,7 +151,13 @@ bool System::openURL(const std::string &url) const
HINSTANCE result = 0;
#if !defined(LOVE_WINDOWS_UWP)
#if defined(LOVE_WINDOWS_UWP)
Platform::String^ urlString = ref new Platform::String(wurl.c_str());
auto uwpUri = ref new Windows::Foundation::Uri(urlString);
Windows::System::Launcher::LaunchUriAsync(uwpUri);
#else
result = ShellExecuteW(nullptr,
L"open",
@@ -158,7 +166,7 @@ bool System::openURL(const std::string &url) const
nullptr,
SW_SHOW);
#endif // LOVE_WINDOWS_UWP
#endif
return (int) result > 32;