mirror/musikcube
1
0
Fork 0
mirror of https://github.com/clangen/musikcube.git synced 2024-12-27 21:14:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Moved curl and libressl dlls to the plugins directory for windows build.

Browse Source
This commit is contained in:
casey langen 2017-04-20 23:16:11 -07:00
parent 3c34c7a494
commit 657208ae87
3 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
archive-win32.sh
View File

@ -17,10 +17,6 @@ mkdir -p "$VANILLA/plugins"
mkdir -p "$VANILLA/themes"
mkdir -p "$VANILLA/locales"
cp bin/release/musikbox.exe "$VANILLA"
cp bin/release/libcurl.dll "$VANILLA"
cp bin/release/crypto-41.dll "$VANILLA"
cp bin/release/ssl-43.dll "$VANILLA"
cp bin/release/tls-15.dll "$VANILLA"
cp bin/release/plugins/*.dll "$VANILLA/plugins"
cp bin/release/themes/*.json "$VANILLA/themes"
cp bin/release/locales/*.json "$VANILLA/locales"
@ -34,10 +30,6 @@ mkdir -p "$MILKDROP/plugins"
mkdir -p "$MILKDROP/themes"
mkdir -p "$MILKDROP/locales"
cp bin/release/musikbox.exe "$MILKDROP"
cp bin/release/libcurl.dll "$VANILLA"
cp bin/release/crypto-41.dll "$VANILLA"
cp bin/release/ssl-43.dll "$VANILLA"
cp bin/release/tls-15.dll "$VANILLA"
cp bin/release/plugins/*.dll "$MILKDROP/plugins"
cp bin/release/themes/*.json "$MILKDROP/themes"
cp bin/release/locales/*.json "$MILKDROP/locales"

4
src/musikbox/Main.cpp
View File

@ -104,6 +104,10 @@ int main(int argc, char* argv[]) {
/* ensure we have the correct locale loaded */
musik::core::i18n::Locale::Instance().Initialize(musik::core::GetApplicationDirectory() + "/locales/");
#ifdef WIN32
AddDllDirectory(u8to16(musik::core::GetPluginDirectory()).c_str());
#endif
#ifndef WIN32
#if 1 /*DEBUG*/
freopen("/tmp/musikbox.log", "w", stderr);

4
src/musikbox/musikbox.vcxproj
View File

@ -89,7 +89,7 @@
xcopy "$(ProjectDir)data\themes\*" "$(TargetDir)themes\" /Y /e
if not exist "$(TargetDir)locales" mkdir "$(TargetDir)locales"
xcopy "$(ProjectDir)data\locales\*" "$(TargetDir)locales\" /Y /e
xcopy "$(SolutionDir)src\3rdparty\win32_bin\*" "$(TargetDir)" /Y /e</Command>
xcopy "$(SolutionDir)src\3rdparty\win32_bin\*" "$(TargetDir)plugins" /Y /e</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@ -129,7 +129,7 @@ xcopy "$(SolutionDir)src\3rdparty\win32_bin\*" "$(TargetDir)" /Y /e</Command>
xcopy "$(ProjectDir)data\themes\*" "$(TargetDir)themes\" /Y /e
if not exist "$(TargetDir)locales" mkdir "$(TargetDir)locales"
xcopy "$(ProjectDir)data\locales\*" "$(TargetDir)locales\" /Y /e
xcopy "$(SolutionDir)src\3rdparty\win32_bin\*" "$(TargetDir)" /Y /e</Command>
xcopy "$(SolutionDir)src\3rdparty\win32_bin\*" "$(TargetDir)plugins" /Y /e</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>