- Updated project build settings to all favor fast code, instead of small

code. Also ensure all projects are compiled against the unicode charset.
- Updated CHANGELOG and bumped versions.
This commit is contained in:
casey langen 2017-03-09 08:38:03 -08:00
parent 493da2a7bd
commit 8b1cac7f9b
27 changed files with 444 additions and 32 deletions

View File

@ -1,3 +1,18 @@
0.9.3
win32 only release:
* updated `WASAPI` output plugin to disable endpoint routing by default. it
causes a crash in some rare cases that i don't seem to be able to work
around. i see similar crashes in firefox and some other apps that use this
feature.
* updated `DirectSound` output volume adjustment to be as close to the `WASAPI`
`WaveOut` plugins as possible
* changed compiler optimizations to favor fast code, instead of small code,
plus a few other small tweaks to (hopefully) improve performance.
--------------------------------------------------------------------------------
0.9.2
* added an icon to the windows and android builds (not great, but better than

View File

@ -8,7 +8,7 @@ cmake_minimum_required(VERSION 3.0)
project(musikbox)
set (musikbox_VERSION_MAJOR 0)
set (musikbox_VERSION_MINOR 9)
set (musikbox_VERSION_PATCH 2)
set (musikbox_VERSION_PATCH 3)
set (musikbox_VERSION "${musikbox_VERSION_MAJOR}.${musikbox_VERSION_MINOR}.${musikbox_VERSION_PATCH}")
include(ExternalProject)

View File

@ -70,7 +70,7 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<Optimization>Full</Optimization>
<InlineFunctionExpansion>Default</InlineFunctionExpansion>
<IntrinsicFunctions>true</IntrinsicFunctions>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>

View File

@ -100,10 +100,10 @@ static int getTrackNumber(const char* uri) {
bool CddaDataStream::Open(const char *uri, unsigned int options) {
int trackIndex;
char driveLetter = 'A' + PathGetDriveNumber(uri);
char driveLetter = 'A' + PathGetDriveNumberA(uri);
std::string drivePath = "\\\\.\\" + std::string(1, driveLetter) + ":";
this->drive = CreateFile(
this->drive = CreateFileA(
drivePath.c_str(),
GENERIC_READ,
FILE_SHARE_READ,

View File

@ -46,7 +46,7 @@ CddaDataStreamFactory::~CddaDataStreamFactory() {
}
bool CddaDataStreamFactory::CanRead(const char *uri) {
std::string extension = PathFindExtension(uri);
std::string extension = PathFindExtensionA(uri);
return (extension == ".cda");
}

View File

@ -19,13 +19,13 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
<CharacterSet>Unicode</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
<PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v140</PlatformToolset>
<WholeProgramOptimization>false</WholeProgramOptimization>
</PropertyGroup>
@ -89,6 +89,8 @@
<ObjectFileName>$(IntDir)</ObjectFileName>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<FunctionLevelLinking>true</FunctionLevelLinking>
<Optimization>Full</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
</ClCompile>
<Link>
<AdditionalDependencies>shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>

View File

@ -19,13 +19,13 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<PlatformToolset>v140</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
<CharacterSet>Unicode</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<PlatformToolset>v140</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
<CharacterSet>Unicode</CharacterSet>
<WholeProgramOptimization>false</WholeProgramOptimization>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
@ -81,7 +81,7 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
<InlineFunctionExpansion>Default</InlineFunctionExpansion>
<IntrinsicFunctions>true</IntrinsicFunctions>
<AdditionalIncludeDirectories>../..;../../3rdparty/include;../../../../boost_1_60_0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@ -94,6 +94,7 @@
<WholeProgramOptimization>true</WholeProgramOptimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<Optimization>Full</Optimization>
</ClCompile>
<Link>
<AdditionalDependencies>dsound.lib;dxguid.lib;%(AdditionalDependencies)</AdditionalDependencies>

View File

@ -43,7 +43,7 @@ class DirectSoundPlugin : public musik::core::sdk::IPlugin {
public:
virtual void Destroy() { delete this; }
virtual const char* Name() { return "DirectSound IOutput"; };
virtual const char* Version() { return "0.3.0"; };
virtual const char* Version() { return "0.4.0"; };
virtual const char* Author() { return "clangen"; };
virtual int SdkVersion() { return musik::core::sdk::SdkVersion; }
};

View File

@ -87,6 +87,8 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<FunctionLevelLinking>true</FunctionLevelLinking>
<Optimization>Full</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
</ClCompile>
<Link>
<AdditionalLibraryDirectories>./lib;../../3rdparty/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

View File

@ -84,6 +84,8 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<FunctionLevelLinking>true</FunctionLevelLinking>
<Optimization>Full</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
</ClCompile>
<Link>
<AdditionalLibraryDirectories>../../3rdparty/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

View File

@ -80,7 +80,7 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
<InlineFunctionExpansion>Default</InlineFunctionExpansion>
<IntrinsicFunctions>true</IntrinsicFunctions>
<AdditionalIncludeDirectories>.;./mad;./nomad;../..;../../3rdparty/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>FPM_DEFAULT;_LIB;HAVE_CONFIG_H;ASO_ZEROCHECK;WIN32;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@ -90,6 +90,7 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<FunctionLevelLinking>true</FunctionLevelLinking>
<Optimization>Full</Optimization>
</ClCompile>
<Link>
<AdditionalDependencies>shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>

View File

@ -81,7 +81,7 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
<InlineFunctionExpansion>Default</InlineFunctionExpansion>
<IntrinsicFunctions>true</IntrinsicFunctions>
<AdditionalIncludeDirectories>../..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@ -94,6 +94,7 @@
<WholeProgramOptimization>true</WholeProgramOptimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<Optimization>Full</Optimization>
</ClCompile>
<Link>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>

View File

@ -80,7 +80,7 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
<InlineFunctionExpansion>Default</InlineFunctionExpansion>
<IntrinsicFunctions>true</IntrinsicFunctions>
<AdditionalIncludeDirectories>.;../..;../../3rdparty/include;../../../../boost_1_60_0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;OGGDECODER_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@ -94,6 +94,7 @@
<ProgramDataBaseFileName>$(IntDir)vc$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<FunctionLevelLinking>true</FunctionLevelLinking>
<Optimization>Full</Optimization>
</ClCompile>
<Link>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>

View File

@ -19,13 +19,13 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
<CharacterSet>Unicode</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
<PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v140</PlatformToolset>
<WholeProgramOptimization>false</WholeProgramOptimization>
</PropertyGroup>
@ -85,7 +85,7 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
<InlineFunctionExpansion>Default</InlineFunctionExpansion>
<IntrinsicFunctions>true</IntrinsicFunctions>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<AdditionalIncludeDirectories>../../;../../3rdparty/include/;../../../../boost_1_60_0/;taglib-1.11;taglib-1.11/taglib;taglib-1.11/taglib/ape;taglib-1.11/taglib/asf;taglib-1.11/taglib/flac;taglib-1.11/taglib/mpc;taglib-1.11/taglib/mpeg;taglib-1.11/taglib/mpeg/id3v1;taglib-1.11/taglib/mpeg/id3v2;taglib-1.11/taglib/mpeg/id3v2/frames;taglib-1.11/taglib/ogg;taglib-1.11/taglib/ogg/flac;taglib-1.11/taglib/ogg/opus;taglib-1.11/taglib/ogg/speex;taglib-1.11/taglib/ogg/vorbis;taglib-1.11/taglib/toolkit;taglib-1.11/taglib/trueaudio;taglib-1.11/taglib/wavpack;taglib-1.11/taglib/xm;taglib-1.11/taglib/riff;taglib-1.11/taglib/riff/aiff;taglib-1.11/taglib/riff/wav;taglib-1.11/taglib/mod;taglib-1.11/taglib/s3m;taglib-1.11/taglib/mp4;taglib-1.11/taglib/it;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@ -100,6 +100,7 @@
<ObjectFileName>$(IntDir)</ObjectFileName>
<ProgramDataBaseFileName>$(IntDir)vc$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
<FunctionLevelLinking>true</FunctionLevelLinking>
<Optimization>Full</Optimization>
</ClCompile>
<Link>
<OutputFile>$(OutDir)$(ProjectName).dll</OutputFile>

View File

@ -81,7 +81,7 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
<InlineFunctionExpansion>Default</InlineFunctionExpansion>
<IntrinsicFunctions>true</IntrinsicFunctions>
<AdditionalIncludeDirectories>../..;../../3rdparty/include;../../../../boost_1_60_0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@ -94,6 +94,7 @@
<WholeProgramOptimization>true</WholeProgramOptimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<Optimization>Full</Optimization>
</ClCompile>
<Link>
<AdditionalDependencies>winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>

View File

@ -43,7 +43,7 @@ class WasapiPlugin : public musik::core::sdk::IPlugin {
public:
virtual void Destroy() { delete this; }
virtual const char* Name() { return "Wasapi IOutput"; };
virtual const char* Version() { return "0.3.0"; };
virtual const char* Version() { return "0.4.0"; };
virtual const char* Author() { return "clangen"; };
virtual int SdkVersion() { return musik::core::sdk::SdkVersion; }
};

View File

@ -81,7 +81,7 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
<InlineFunctionExpansion>Default</InlineFunctionExpansion>
<IntrinsicFunctions>true</IntrinsicFunctions>
<AdditionalIncludeDirectories>../..;../../3rdparty/include;../../../../boost_1_60_0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@ -94,6 +94,7 @@
<WholeProgramOptimization>true</WholeProgramOptimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<Optimization>Full</Optimization>
</ClCompile>
<Link>
<AdditionalDependencies>winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>

View File

@ -106,7 +106,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<Optimization>MaxSpeed</Optimization>
<Optimization>Full</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>true</SDLCheck>
@ -114,7 +114,7 @@
<PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<DebugInformationFormat>None</DebugInformationFormat>
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
<InlineFunctionExpansion>Default</InlineFunctionExpansion>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
</ClCompile>
<Link>
@ -146,6 +146,101 @@
<ItemGroup>
<ClCompile Include="main.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="3rdparty\include\websocketpp\base64\base64.hpp" />
<ClInclude Include="3rdparty\include\websocketpp\client.hpp" />
<ClInclude Include="3rdparty\include\websocketpp\close.hpp" />
<ClInclude Include="3rdparty\include\websocketpp\common\asio.hpp" />
<ClInclude Include="3rdparty\include\websocketpp\common\asio_ssl.hpp" />
<ClInclude Include="3rdparty\include\websocketpp\common\chrono.hpp" />
<ClInclude Include="3rdparty\include\websocketpp\common\connection_hdl.hpp" />
<ClInclude Include="3rdparty\include\websocketpp\common\cpp11.hpp" />
<ClInclude Include="3rdparty\include\websocketpp\common\functional.hpp" />
<ClInclude Include="3rdparty\include\websocketpp\common\md5.hpp" />
<ClInclude Include="3rdparty\include\websocketpp\common\memory.hpp" />
<ClInclude Include="3rdparty\include\websocketpp\common\network.hpp" />
<ClInclude Include="3rdparty\include\websocketpp\common\platforms.hpp" />
<ClInclude Include="3rdparty\include\websocketpp\common\random.hpp" />
<ClInclude Include="3rdparty\include\websocketpp\common\regex.hpp" />
<ClInclude Include="3rdparty\include\websocketpp\common\stdint.hpp" />
<ClInclude Include="3rdparty\include\websocketpp\common\system_error.hpp" />
<ClInclude Include="3rdparty\include\websocketpp\common\thread.hpp" />
<ClInclude Include="3rdparty\include\websocketpp\common\time.hpp" />
<ClInclude Include="3rdparty\include\websocketpp\common\type_traits.hpp" />
<ClInclude Include="3rdparty\include\websocketpp\concurrency\basic.hpp" />
<ClInclude Include="3rdparty\include\websocketpp\concurrency\none.hpp" />
<ClInclude Include="3rdparty\include\websocketpp\config\asio.hpp" />
<ClInclude Include="3rdparty\include\websocketpp\config\asio_client.hpp" />
<ClInclude Include="3rdparty\include\websocketpp\config\asio_no_tls.hpp" />
<ClInclude Include="3rdparty\include\websocketpp\config\asio_no_tls_client.hpp" />
<ClInclude Include="3rdparty\include\websocketpp\config\boost_config.hpp" />
<ClInclude Include="3rdparty\include\websocketpp\config\core.hpp" />
<ClInclude Include="3rdparty\include\websocketpp\config\core_client.hpp" />
<ClInclude Include="3rdparty\include\websocketpp\config\debug.hpp" />
<ClInclude Include="3rdparty\include\websocketpp\config\debug_asio.hpp" />
<ClInclude Include="3rdparty\include\websocketpp\config\debug_asio_no_tls.hpp" />
<ClInclude Include="3rdparty\include\websocketpp\config\minimal_client.hpp" />
<ClInclude Include="3rdparty\include\websocketpp\config\minimal_server.hpp" />
<ClInclude Include="3rdparty\include\websocketpp\connection.hpp" />
<ClInclude Include="3rdparty\include\websocketpp\connection_base.hpp" />
<ClInclude Include="3rdparty\include\websocketpp\endpoint.hpp" />
<ClInclude Include="3rdparty\include\websocketpp\endpoint_base.hpp" />
<ClInclude Include="3rdparty\include\websocketpp\error.hpp" />
<ClInclude Include="3rdparty\include\websocketpp\extensions\extension.hpp" />
<ClInclude Include="3rdparty\include\websocketpp\extensions\permessage_deflate\disabled.hpp" />
<ClInclude Include="3rdparty\include\websocketpp\extensions\permessage_deflate\enabled.hpp" />
<ClInclude Include="3rdparty\include\websocketpp\frame.hpp" />
<ClInclude Include="3rdparty\include\websocketpp\http\constants.hpp" />
<ClInclude Include="3rdparty\include\websocketpp\http\impl\parser.hpp" />
<ClInclude Include="3rdparty\include\websocketpp\http\impl\request.hpp" />
<ClInclude Include="3rdparty\include\websocketpp\http\impl\response.hpp" />
<ClInclude Include="3rdparty\include\websocketpp\http\parser.hpp" />
<ClInclude Include="3rdparty\include\websocketpp\http\request.hpp" />
<ClInclude Include="3rdparty\include\websocketpp\http\response.hpp" />
<ClInclude Include="3rdparty\include\websocketpp\impl\connection_impl.hpp" />
<ClInclude Include="3rdparty\include\websocketpp\impl\endpoint_impl.hpp" />
<ClInclude Include="3rdparty\include\websocketpp\impl\utilities_impl.hpp" />
<ClInclude Include="3rdparty\include\websocketpp\logger\basic.hpp" />
<ClInclude Include="3rdparty\include\websocketpp\logger\levels.hpp" />
<ClInclude Include="3rdparty\include\websocketpp\logger\stub.hpp" />
<ClInclude Include="3rdparty\include\websocketpp\logger\syslog.hpp" />
<ClInclude Include="3rdparty\include\websocketpp\message_buffer\alloc.hpp" />
<ClInclude Include="3rdparty\include\websocketpp\message_buffer\message.hpp" />
<ClInclude Include="3rdparty\include\websocketpp\message_buffer\pool.hpp" />
<ClInclude Include="3rdparty\include\websocketpp\processors\base.hpp" />
<ClInclude Include="3rdparty\include\websocketpp\processors\hybi00.hpp" />
<ClInclude Include="3rdparty\include\websocketpp\processors\hybi07.hpp" />
<ClInclude Include="3rdparty\include\websocketpp\processors\hybi08.hpp" />
<ClInclude Include="3rdparty\include\websocketpp\processors\hybi13.hpp" />
<ClInclude Include="3rdparty\include\websocketpp\processors\processor.hpp" />
<ClInclude Include="3rdparty\include\websocketpp\random\none.hpp" />
<ClInclude Include="3rdparty\include\websocketpp\random\random_device.hpp" />
<ClInclude Include="3rdparty\include\websocketpp\roles\client_endpoint.hpp" />
<ClInclude Include="3rdparty\include\websocketpp\roles\server_endpoint.hpp" />
<ClInclude Include="3rdparty\include\websocketpp\server.hpp" />
<ClInclude Include="3rdparty\include\websocketpp\sha1\sha1.hpp" />
<ClInclude Include="3rdparty\include\websocketpp\transport\asio\base.hpp" />
<ClInclude Include="3rdparty\include\websocketpp\transport\asio\connection.hpp" />
<ClInclude Include="3rdparty\include\websocketpp\transport\asio\endpoint.hpp" />
<ClInclude Include="3rdparty\include\websocketpp\transport\asio\security\base.hpp" />
<ClInclude Include="3rdparty\include\websocketpp\transport\asio\security\none.hpp" />
<ClInclude Include="3rdparty\include\websocketpp\transport\asio\security\tls.hpp" />
<ClInclude Include="3rdparty\include\websocketpp\transport\base\connection.hpp" />
<ClInclude Include="3rdparty\include\websocketpp\transport\base\endpoint.hpp" />
<ClInclude Include="3rdparty\include\websocketpp\transport\debug\base.hpp" />
<ClInclude Include="3rdparty\include\websocketpp\transport\debug\connection.hpp" />
<ClInclude Include="3rdparty\include\websocketpp\transport\debug\endpoint.hpp" />
<ClInclude Include="3rdparty\include\websocketpp\transport\iostream\base.hpp" />
<ClInclude Include="3rdparty\include\websocketpp\transport\iostream\connection.hpp" />
<ClInclude Include="3rdparty\include\websocketpp\transport\iostream\endpoint.hpp" />
<ClInclude Include="3rdparty\include\websocketpp\transport\stub\base.hpp" />
<ClInclude Include="3rdparty\include\websocketpp\transport\stub\connection.hpp" />
<ClInclude Include="3rdparty\include\websocketpp\transport\stub\endpoint.hpp" />
<ClInclude Include="3rdparty\include\websocketpp\uri.hpp" />
<ClInclude Include="3rdparty\include\websocketpp\utf8_validator.hpp" />
<ClInclude Include="3rdparty\include\websocketpp\utilities.hpp" />
<ClInclude Include="3rdparty\include\websocketpp\version.hpp" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>

View File

@ -5,10 +5,294 @@
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
<Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
</Filter>
<Filter Include="websocketpp">
<UniqueIdentifier>{bb67dd4b-bdf7-4821-a714-c1606bd1a1a6}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="main.cpp">
<Filter>src</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="3rdparty\include\websocketpp\random\none.hpp">
<Filter>websocketpp</Filter>
</ClInclude>
<ClInclude Include="3rdparty\include\websocketpp\random\random_device.hpp">
<Filter>websocketpp</Filter>
</ClInclude>
<ClInclude Include="3rdparty\include\websocketpp\roles\client_endpoint.hpp">
<Filter>websocketpp</Filter>
</ClInclude>
<ClInclude Include="3rdparty\include\websocketpp\roles\server_endpoint.hpp">
<Filter>websocketpp</Filter>
</ClInclude>
<ClInclude Include="3rdparty\include\websocketpp\sha1\sha1.hpp">
<Filter>websocketpp</Filter>
</ClInclude>
<ClInclude Include="3rdparty\include\websocketpp\transport\asio\base.hpp">
<Filter>websocketpp</Filter>
</ClInclude>
<ClInclude Include="3rdparty\include\websocketpp\transport\asio\connection.hpp">
<Filter>websocketpp</Filter>
</ClInclude>
<ClInclude Include="3rdparty\include\websocketpp\transport\asio\endpoint.hpp">
<Filter>websocketpp</Filter>
</ClInclude>
<ClInclude Include="3rdparty\include\websocketpp\transport\asio\security\base.hpp">
<Filter>websocketpp</Filter>
</ClInclude>
<ClInclude Include="3rdparty\include\websocketpp\transport\asio\security\none.hpp">
<Filter>websocketpp</Filter>
</ClInclude>
<ClInclude Include="3rdparty\include\websocketpp\transport\asio\security\tls.hpp">
<Filter>websocketpp</Filter>
</ClInclude>
<ClInclude Include="3rdparty\include\websocketpp\transport\base\connection.hpp">
<Filter>websocketpp</Filter>
</ClInclude>
<ClInclude Include="3rdparty\include\websocketpp\transport\base\endpoint.hpp">
<Filter>websocketpp</Filter>
</ClInclude>
<ClInclude Include="3rdparty\include\websocketpp\transport\debug\base.hpp">
<Filter>websocketpp</Filter>
</ClInclude>
<ClInclude Include="3rdparty\include\websocketpp\transport\debug\connection.hpp">
<Filter>websocketpp</Filter>
</ClInclude>
<ClInclude Include="3rdparty\include\websocketpp\transport\debug\endpoint.hpp">
<Filter>websocketpp</Filter>
</ClInclude>
<ClInclude Include="3rdparty\include\websocketpp\transport\iostream\base.hpp">
<Filter>websocketpp</Filter>
</ClInclude>
<ClInclude Include="3rdparty\include\websocketpp\transport\iostream\connection.hpp">
<Filter>websocketpp</Filter>
</ClInclude>
<ClInclude Include="3rdparty\include\websocketpp\transport\iostream\endpoint.hpp">
<Filter>websocketpp</Filter>
</ClInclude>
<ClInclude Include="3rdparty\include\websocketpp\transport\stub\base.hpp">
<Filter>websocketpp</Filter>
</ClInclude>
<ClInclude Include="3rdparty\include\websocketpp\transport\stub\connection.hpp">
<Filter>websocketpp</Filter>
</ClInclude>
<ClInclude Include="3rdparty\include\websocketpp\transport\stub\endpoint.hpp">
<Filter>websocketpp</Filter>
</ClInclude>
<ClInclude Include="3rdparty\include\websocketpp\client.hpp">
<Filter>websocketpp</Filter>
</ClInclude>
<ClInclude Include="3rdparty\include\websocketpp\close.hpp">
<Filter>websocketpp</Filter>
</ClInclude>
<ClInclude Include="3rdparty\include\websocketpp\connection.hpp">
<Filter>websocketpp</Filter>
</ClInclude>
<ClInclude Include="3rdparty\include\websocketpp\connection_base.hpp">
<Filter>websocketpp</Filter>
</ClInclude>
<ClInclude Include="3rdparty\include\websocketpp\endpoint.hpp">
<Filter>websocketpp</Filter>
</ClInclude>
<ClInclude Include="3rdparty\include\websocketpp\endpoint_base.hpp">
<Filter>websocketpp</Filter>
</ClInclude>
<ClInclude Include="3rdparty\include\websocketpp\error.hpp">
<Filter>websocketpp</Filter>
</ClInclude>
<ClInclude Include="3rdparty\include\websocketpp\frame.hpp">
<Filter>websocketpp</Filter>
</ClInclude>
<ClInclude Include="3rdparty\include\websocketpp\server.hpp">
<Filter>websocketpp</Filter>
</ClInclude>
<ClInclude Include="3rdparty\include\websocketpp\uri.hpp">
<Filter>websocketpp</Filter>
</ClInclude>
<ClInclude Include="3rdparty\include\websocketpp\utf8_validator.hpp">
<Filter>websocketpp</Filter>
</ClInclude>
<ClInclude Include="3rdparty\include\websocketpp\utilities.hpp">
<Filter>websocketpp</Filter>
</ClInclude>
<ClInclude Include="3rdparty\include\websocketpp\version.hpp">
<Filter>websocketpp</Filter>
</ClInclude>
<ClInclude Include="3rdparty\include\websocketpp\base64\base64.hpp">
<Filter>websocketpp</Filter>
</ClInclude>
<ClInclude Include="3rdparty\include\websocketpp\common\asio.hpp">
<Filter>websocketpp</Filter>
</ClInclude>
<ClInclude Include="3rdparty\include\websocketpp\common\asio_ssl.hpp">
<Filter>websocketpp</Filter>
</ClInclude>
<ClInclude Include="3rdparty\include\websocketpp\common\chrono.hpp">
<Filter>websocketpp</Filter>
</ClInclude>
<ClInclude Include="3rdparty\include\websocketpp\common\connection_hdl.hpp">
<Filter>websocketpp</Filter>
</ClInclude>
<ClInclude Include="3rdparty\include\websocketpp\common\cpp11.hpp">
<Filter>websocketpp</Filter>
</ClInclude>
<ClInclude Include="3rdparty\include\websocketpp\common\functional.hpp">
<Filter>websocketpp</Filter>
</ClInclude>
<ClInclude Include="3rdparty\include\websocketpp\common\md5.hpp">
<Filter>websocketpp</Filter>
</ClInclude>
<ClInclude Include="3rdparty\include\websocketpp\common\memory.hpp">
<Filter>websocketpp</Filter>
</ClInclude>
<ClInclude Include="3rdparty\include\websocketpp\common\network.hpp">
<Filter>websocketpp</Filter>
</ClInclude>
<ClInclude Include="3rdparty\include\websocketpp\common\platforms.hpp">
<Filter>websocketpp</Filter>
</ClInclude>
<ClInclude Include="3rdparty\include\websocketpp\common\random.hpp">
<Filter>websocketpp</Filter>
</ClInclude>
<ClInclude Include="3rdparty\include\websocketpp\common\regex.hpp">
<Filter>websocketpp</Filter>
</ClInclude>
<ClInclude Include="3rdparty\include\websocketpp\common\stdint.hpp">
<Filter>websocketpp</Filter>
</ClInclude>
<ClInclude Include="3rdparty\include\websocketpp\common\system_error.hpp">
<Filter>websocketpp</Filter>
</ClInclude>
<ClInclude Include="3rdparty\include\websocketpp\common\thread.hpp">
<Filter>websocketpp</Filter>
</ClInclude>
<ClInclude Include="3rdparty\include\websocketpp\common\time.hpp">
<Filter>websocketpp</Filter>
</ClInclude>
<ClInclude Include="3rdparty\include\websocketpp\common\type_traits.hpp">
<Filter>websocketpp</Filter>
</ClInclude>
<ClInclude Include="3rdparty\include\websocketpp\concurrency\basic.hpp">
<Filter>websocketpp</Filter>
</ClInclude>
<ClInclude Include="3rdparty\include\websocketpp\concurrency\none.hpp">
<Filter>websocketpp</Filter>
</ClInclude>
<ClInclude Include="3rdparty\include\websocketpp\config\asio.hpp">
<Filter>websocketpp</Filter>
</ClInclude>
<ClInclude Include="3rdparty\include\websocketpp\config\asio_client.hpp">
<Filter>websocketpp</Filter>
</ClInclude>
<ClInclude Include="3rdparty\include\websocketpp\config\asio_no_tls.hpp">
<Filter>websocketpp</Filter>
</ClInclude>
<ClInclude Include="3rdparty\include\websocketpp\config\asio_no_tls_client.hpp">
<Filter>websocketpp</Filter>
</ClInclude>
<ClInclude Include="3rdparty\include\websocketpp\config\boost_config.hpp">
<Filter>websocketpp</Filter>
</ClInclude>
<ClInclude Include="3rdparty\include\websocketpp\config\core.hpp">
<Filter>websocketpp</Filter>
</ClInclude>
<ClInclude Include="3rdparty\include\websocketpp\config\core_client.hpp">
<Filter>websocketpp</Filter>
</ClInclude>
<ClInclude Include="3rdparty\include\websocketpp\config\debug.hpp">
<Filter>websocketpp</Filter>
</ClInclude>
<ClInclude Include="3rdparty\include\websocketpp\config\debug_asio.hpp">
<Filter>websocketpp</Filter>
</ClInclude>
<ClInclude Include="3rdparty\include\websocketpp\config\debug_asio_no_tls.hpp">
<Filter>websocketpp</Filter>
</ClInclude>
<ClInclude Include="3rdparty\include\websocketpp\config\minimal_client.hpp">
<Filter>websocketpp</Filter>
</ClInclude>
<ClInclude Include="3rdparty\include\websocketpp\config\minimal_server.hpp">
<Filter>websocketpp</Filter>
</ClInclude>
<ClInclude Include="3rdparty\include\websocketpp\extensions\extension.hpp">
<Filter>websocketpp</Filter>
</ClInclude>
<ClInclude Include="3rdparty\include\websocketpp\extensions\permessage_deflate\disabled.hpp">
<Filter>websocketpp</Filter>
</ClInclude>
<ClInclude Include="3rdparty\include\websocketpp\extensions\permessage_deflate\enabled.hpp">
<Filter>websocketpp</Filter>
</ClInclude>
<ClInclude Include="3rdparty\include\websocketpp\http\constants.hpp">
<Filter>websocketpp</Filter>
</ClInclude>
<ClInclude Include="3rdparty\include\websocketpp\http\impl\parser.hpp">
<Filter>websocketpp</Filter>
</ClInclude>
<ClInclude Include="3rdparty\include\websocketpp\http\impl\request.hpp">
<Filter>websocketpp</Filter>
</ClInclude>
<ClInclude Include="3rdparty\include\websocketpp\http\impl\response.hpp">
<Filter>websocketpp</Filter>
</ClInclude>
<ClInclude Include="3rdparty\include\websocketpp\http\parser.hpp">
<Filter>websocketpp</Filter>
</ClInclude>
<ClInclude Include="3rdparty\include\websocketpp\http\request.hpp">
<Filter>websocketpp</Filter>
</ClInclude>
<ClInclude Include="3rdparty\include\websocketpp\http\response.hpp">
<Filter>websocketpp</Filter>
</ClInclude>
<ClInclude Include="3rdparty\include\websocketpp\impl\connection_impl.hpp">
<Filter>websocketpp</Filter>
</ClInclude>
<ClInclude Include="3rdparty\include\websocketpp\impl\endpoint_impl.hpp">
<Filter>websocketpp</Filter>
</ClInclude>
<ClInclude Include="3rdparty\include\websocketpp\impl\utilities_impl.hpp">
<Filter>websocketpp</Filter>
</ClInclude>
<ClInclude Include="3rdparty\include\websocketpp\logger\basic.hpp">
<Filter>websocketpp</Filter>
</ClInclude>
<ClInclude Include="3rdparty\include\websocketpp\logger\levels.hpp">
<Filter>websocketpp</Filter>
</ClInclude>
<ClInclude Include="3rdparty\include\websocketpp\logger\stub.hpp">
<Filter>websocketpp</Filter>
</ClInclude>
<ClInclude Include="3rdparty\include\websocketpp\logger\syslog.hpp">
<Filter>websocketpp</Filter>
</ClInclude>
<ClInclude Include="3rdparty\include\websocketpp\message_buffer\alloc.hpp">
<Filter>websocketpp</Filter>
</ClInclude>
<ClInclude Include="3rdparty\include\websocketpp\message_buffer\message.hpp">
<Filter>websocketpp</Filter>
</ClInclude>
<ClInclude Include="3rdparty\include\websocketpp\message_buffer\pool.hpp">
<Filter>websocketpp</Filter>
</ClInclude>
<ClInclude Include="3rdparty\include\websocketpp\processors\base.hpp">
<Filter>websocketpp</Filter>
</ClInclude>
<ClInclude Include="3rdparty\include\websocketpp\processors\hybi00.hpp">
<Filter>websocketpp</Filter>
</ClInclude>
<ClInclude Include="3rdparty\include\websocketpp\processors\hybi07.hpp">
<Filter>websocketpp</Filter>
</ClInclude>
<ClInclude Include="3rdparty\include\websocketpp\processors\hybi08.hpp">
<Filter>websocketpp</Filter>
</ClInclude>
<ClInclude Include="3rdparty\include\websocketpp\processors\hybi13.hpp">
<Filter>websocketpp</Filter>
</ClInclude>
<ClInclude Include="3rdparty\include\websocketpp\processors\processor.hpp">
<Filter>websocketpp</Filter>
</ClInclude>
</ItemGroup>
</Project>

View File

@ -67,7 +67,7 @@
<InlineFunctionExpansion>Default</InlineFunctionExpansion>
<StringPooling>true</StringPooling>
<FunctionLevelLinking>true</FunctionLevelLinking>
<Optimization>MaxSpeed</Optimization>
<Optimization>Full</Optimization>
<SuppressStartupBanner>true</SuppressStartupBanner>
<WarningLevel>Level3</WarningLevel>
<AdditionalIncludeDirectories>.\;..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@ -78,6 +78,7 @@
<ProgramDataBaseFileName>.\Release\</ProgramDataBaseFileName>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<WholeProgramOptimization>true</WholeProgramOptimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
</ClCompile>
<Midl>
<SuppressStartupBanner>true</SuppressStartupBanner>

View File

@ -81,7 +81,7 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
<InlineFunctionExpansion>Default</InlineFunctionExpansion>
<IntrinsicFunctions>true</IntrinsicFunctions>
<AdditionalIncludeDirectories>../..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@ -94,6 +94,7 @@
<FunctionLevelLinking>true</FunctionLevelLinking>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<WholeProgramOptimization>true</WholeProgramOptimization>
<Optimization>Full</Optimization>
</ClCompile>
<Link>
<AdditionalDependencies>winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>

View File

@ -70,7 +70,7 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<Optimization>Full</Optimization>
<InlineFunctionExpansion>Default</InlineFunctionExpansion>
<IntrinsicFunctions>true</IntrinsicFunctions>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>

View File

@ -70,7 +70,7 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<Optimization>Full</Optimization>
<InlineFunctionExpansion>Default</InlineFunctionExpansion>
<IntrinsicFunctions>true</IntrinsicFunctions>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>

View File

@ -1,3 +1,3 @@
#pragma once
#define VERSION "0.9.2"
#define VERSION "0.9.3"

View File

@ -39,7 +39,7 @@
#ifdef WIN32
static std::basic_string<TCHAR> className = "Curses_App";
static std::basic_string<TCHAR> className = L"Curses_App";
static HWND mainWindow = nullptr;
static void findMainWindow() {
@ -53,7 +53,7 @@ static void findMainWindow() {
GetWindowThreadProcessId(hWnd, &dwWndProcID);
if (dwWndProcID == dwProcID) {
GetClassName(hWnd, buffer, sizeof(buffer));
if (className == std::string(buffer)) {
if (className == std::basic_string<TCHAR>(buffer)) {
mainWindow = hWnd;
return;
}

View File

@ -20,7 +20,7 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
<CharacterSet>Unicode</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
<PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
@ -28,7 +28,7 @@
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<UseOfAtl>false</UseOfAtl>
<CharacterSet>MultiByte</CharacterSet>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v140</PlatformToolset>
<WholeProgramOptimization>false</WholeProgramOptimization>
</PropertyGroup>
@ -101,6 +101,8 @@
<ProgramDataBaseFileName>$(IntDir)vc$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<FunctionLevelLinking>true</FunctionLevelLinking>
<Optimization>Full</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
</ClCompile>
<Link>
<AdditionalLibraryDirectories>../3rdparty/win32_lib;../../../boost_1_60_0/lib32-msvc-14.0;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

View File

@ -125,7 +125,7 @@
<WarningLevel>Level3</WarningLevel>
<PrecompiledHeader>
</PrecompiledHeader>
<Optimization>MaxSpeed</Optimization>
<Optimization>Full</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@ -133,6 +133,7 @@
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
<AdditionalIncludeDirectories>./;../;../3rdparty/include;../3rdparty/win32_include;../../../boost_1_60_0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>