diff --git a/Windows-Build-Instructions.md b/Windows-Build-Instructions.md index ac1a334..86d2b55 100644 --- a/Windows-Build-Instructions.md +++ b/Windows-Build-Instructions.md @@ -76,21 +76,9 @@ The following environment variables need to be added to your “System Variables ### Example Variables -* DL_DIR (`C:\libdl`) -* DXSDK_DIR (`C:\Program Files\Microsoft DirectX SDK (June 2010)\`) -* FFMPEGDIR (`C:\ffmpeg-git-95f163b-win32-dev`) -* FREETYPE_DIR (`C:\Program Files\GnuWin32`) -* HOME (`C:\msys\1.0\home`) -* LIBOPENSHOT_AUDIO_DIR (`C:\Program Files\libopenshot-audio`) -* QTDIR (`C:\qt5`) +* LIBOPENSHOT_AUDIO_DIR (`C:\msys64\usr`) * SNDFILE_DIR (`C:\Program Files\libsndfile`) -* UNITTEST_DIR (`C:\UnitTest++`) -* ZMQDIR (`C:\msys2\usr\local\`) -* PATH (`The following paths are an example`) - * C:\Qt5\bin; C:\Qt5\MinGW\bin\; C:\msys\1.0\local\lib; C:\Program Files\CMake 2.8\bin; C:\UnitTest++\build; C:\libopenshot\build\src; C:\Program Files\doxygen\bin; C:\ffmpeg-git-95f163b-win32-dev\lib; C:\swigwin-2.0.4; C:\Python33; C:\Program Files\Project\lib; C:\msys2\usr\local\ - - - +* UNITTEST_DIR (`C:\msys64\usr`) ## Obtaining Source Code @@ -137,7 +125,7 @@ directions to setup a Windows build environment for OpenShot. 2) Run MSYS2 command prompt (for example: `C:\msys64\msys2_shell.cmd`) -3) Append PATH (so MSYS2 can find executables and libraries): +3) Append PATH (so MSYS2 can find executables and libraries). This only needs to be done when we are manually compiling things (such as libopenshot, libopenshot-audio, resvg, unittest++): ``` PATH=$PATH:/c/msys64/mingw64/bin:/c/msys64/mingw64/lib (64-bit PATH) @@ -151,7 +139,7 @@ PATH=$PATH:/c/msys32/mingw32/bin:/c/msys32/mingw32/lib (32-bit PATH) pacman -Syu ``` -5a) Install the following packages (**64-Bit**) +5) Install the following packages (**64-Bit**) ``` pacman -S --needed base-devel mingw-w64-x86_64-toolchain \ @@ -170,7 +158,7 @@ git pacman -S mingw64/mingw-w64-x86_64-imagemagick ``` -5b) **Or** Install the following packages (**32-Bit**) +**Or** Install the following packages (**32-Bit**) ``` pacman -S --needed base-devel mingw32/mingw-w64-i686-toolchain \ @@ -203,17 +191,10 @@ cd unittest-cpp/builds cmake -G "MSYS Makefiles" -DCMAKE_MAKE_PROGRAM=mingw32-make -DCMAKE_INSTALL_PREFIX:PATH=/usr ../ mingw32-make install ``` - -8) ZMQ++ Header (This might not be needed anymore) - NOTE: Download and copy zmq.hpp into the /c/msys64/mingw64/include/ folder +**NOTE: Be sure to create a `UNITTEST_DIR` system environment variable pointing to the install directory: `C:\msys64\usr`.** ## Manual Dependencies -* ### DLfcn - * https://github.com/dlfcn-win32/dlfcn-win32 - * Download and Extract the Win32 Static (.tar.bz2) archive to a local folder: C:\libdl\ - * Create an environment variable called DL_DIR and set the value to C:\libdl\. This environment variable will be used by CMake to find the binary and header file. - * ### DirectX SDK / Windows SDK * Windows 7: (DirectX SDK) http://www.microsoft.com/download/en/details.aspx?displaylang=en&id=6812 * Windows 8: (Windows SDK) @@ -226,12 +207,6 @@ Create an environment variable called DXSDK_DIR and set the value to C:\Program * Download and Install the Win32 Setup program. * Create an environment variable called SNDFILE_DIR and set the value to C:\Program Files\libsndfile. This environment variable will be used by CMake to find the binary and header files. -* ### libzmq - * http://zeromq.org/intro:get-the-software - * Download source code (zip) - * Follow their instructions, and build with mingw - * Create an environment variable called ZMQDIR and set the value to C:\libzmq\build\ (the location of the compiled version). This environment variable will be used by CMake to find the binary and header files. - ## Windows Build Instructions (libopenshot-audio) In order to compile libopenshot-audio, launch a command prompt and enter the following commands. This does not require the MSYS2 prompt, but it should work in both the Windows command prompt and the MSYS2 prompt. @@ -243,6 +218,7 @@ cmake -G "MSYS Makefiles" -DCMAKE_MAKE_PROGRAM=mingw32-make -DCMAKE_INSTALL_PREF mingw32-make install openshot-audio-test-sound (This should play a test sound) ``` +**NOTE: Be sure to create a `LIBOPENSHOT_AUDIO_DIR` system environment variable pointing to the libopenshot-audio install directory: `C:\msys64\usr`.** ## Windows Build Instructions (libopenshot) Run the following commands to build libopenshot: