diff --git a/make.ps1 b/make.ps1 index fab695f4bd..d70e8ee964 100644 --- a/make.ps1 +++ b/make.ps1 @@ -77,7 +77,7 @@ elseif ($command -eq "dependencies") { cp thirdparty/*.dll . cp thirdparty/Tao/*.dll . - cp packaging/windows/*.dll . + cp thirdparty/windows/*.dll . echo "Dependencies copied." } else diff --git a/packaging/windows/OpenRA.nsi b/packaging/windows/OpenRA.nsi index b3632743b1..6e2ba03546 100644 --- a/packaging/windows/OpenRA.nsi +++ b/packaging/windows/OpenRA.nsi @@ -93,11 +93,10 @@ Section "Game" GAME File "${SRCDIR}\KopiLua.dll" File "${SRCDIR}\NLua.dll" File "${SRCDIR}\eluant.dll" - File OpenAL32.dll - File SDL.dll - File freetype6.dll - File zlib1.dll - + File "${DEPSDIR}\OpenAL32.dll" + File "${DEPSDIR}\SDL.dll" + File "${DEPSDIR}\freetype6.dll" + File "${DEPSDIR}\zlib1.dll" File "${DEPSDIR}\lua51.dll" SetOutPath "$INSTDIR\lua" File "${SRCDIR}\lua\*.lua" diff --git a/packaging/windows/OpenAL32.dll b/thirdparty/windows/OpenAL32.dll similarity index 100% rename from packaging/windows/OpenAL32.dll rename to thirdparty/windows/OpenAL32.dll diff --git a/packaging/windows/SDL.dll b/thirdparty/windows/SDL.dll similarity index 100% rename from packaging/windows/SDL.dll rename to thirdparty/windows/SDL.dll diff --git a/packaging/windows/freetype6.dll b/thirdparty/windows/freetype6.dll similarity index 100% rename from packaging/windows/freetype6.dll rename to thirdparty/windows/freetype6.dll diff --git a/packaging/windows/zlib1.dll b/thirdparty/windows/zlib1.dll similarity index 100% rename from packaging/windows/zlib1.dll rename to thirdparty/windows/zlib1.dll