mirror of
https://github.com/clangen/musikcube.git
synced 2024-12-28 15:16:43 +00:00
Moved curl and libressl dlls to the plugins directory for windows build.
This commit is contained in:
parent
3c34c7a494
commit
657208ae87
@ -17,10 +17,6 @@ mkdir -p "$VANILLA/plugins"
|
|||||||
mkdir -p "$VANILLA/themes"
|
mkdir -p "$VANILLA/themes"
|
||||||
mkdir -p "$VANILLA/locales"
|
mkdir -p "$VANILLA/locales"
|
||||||
cp bin/release/musikbox.exe "$VANILLA"
|
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/plugins/*.dll "$VANILLA/plugins"
|
||||||
cp bin/release/themes/*.json "$VANILLA/themes"
|
cp bin/release/themes/*.json "$VANILLA/themes"
|
||||||
cp bin/release/locales/*.json "$VANILLA/locales"
|
cp bin/release/locales/*.json "$VANILLA/locales"
|
||||||
@ -34,10 +30,6 @@ mkdir -p "$MILKDROP/plugins"
|
|||||||
mkdir -p "$MILKDROP/themes"
|
mkdir -p "$MILKDROP/themes"
|
||||||
mkdir -p "$MILKDROP/locales"
|
mkdir -p "$MILKDROP/locales"
|
||||||
cp bin/release/musikbox.exe "$MILKDROP"
|
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/plugins/*.dll "$MILKDROP/plugins"
|
||||||
cp bin/release/themes/*.json "$MILKDROP/themes"
|
cp bin/release/themes/*.json "$MILKDROP/themes"
|
||||||
cp bin/release/locales/*.json "$MILKDROP/locales"
|
cp bin/release/locales/*.json "$MILKDROP/locales"
|
||||||
|
@ -104,6 +104,10 @@ int main(int argc, char* argv[]) {
|
|||||||
/* ensure we have the correct locale loaded */
|
/* ensure we have the correct locale loaded */
|
||||||
musik::core::i18n::Locale::Instance().Initialize(musik::core::GetApplicationDirectory() + "/locales/");
|
musik::core::i18n::Locale::Instance().Initialize(musik::core::GetApplicationDirectory() + "/locales/");
|
||||||
|
|
||||||
|
#ifdef WIN32
|
||||||
|
AddDllDirectory(u8to16(musik::core::GetPluginDirectory()).c_str());
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifndef WIN32
|
#ifndef WIN32
|
||||||
#if 1 /*DEBUG*/
|
#if 1 /*DEBUG*/
|
||||||
freopen("/tmp/musikbox.log", "w", stderr);
|
freopen("/tmp/musikbox.log", "w", stderr);
|
||||||
|
@ -89,7 +89,7 @@
|
|||||||
xcopy "$(ProjectDir)data\themes\*" "$(TargetDir)themes\" /Y /e
|
xcopy "$(ProjectDir)data\themes\*" "$(TargetDir)themes\" /Y /e
|
||||||
if not exist "$(TargetDir)locales" mkdir "$(TargetDir)locales"
|
if not exist "$(TargetDir)locales" mkdir "$(TargetDir)locales"
|
||||||
xcopy "$(ProjectDir)data\locales\*" "$(TargetDir)locales\" /Y /e
|
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>
|
</PostBuildEvent>
|
||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
<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
|
xcopy "$(ProjectDir)data\themes\*" "$(TargetDir)themes\" /Y /e
|
||||||
if not exist "$(TargetDir)locales" mkdir "$(TargetDir)locales"
|
if not exist "$(TargetDir)locales" mkdir "$(TargetDir)locales"
|
||||||
xcopy "$(ProjectDir)data\locales\*" "$(TargetDir)locales\" /Y /e
|
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>
|
</PostBuildEvent>
|
||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
Loading…
Reference in New Issue
Block a user