Skip to content

Commit

Permalink
Update
Browse files Browse the repository at this point in the history
  • Loading branch information
Chocobo1 committed Oct 21, 2018
1 parent 350b52a commit 127a789
Show file tree
Hide file tree
Showing 17 changed files with 622 additions and 38 deletions.
45 changes: 39 additions & 6 deletions .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,22 @@ environment:
OGG_MSBUILD_CMD_X64: /maxcpucount /property:Configuration=Release,Platform=x64

OPUS_SOL_FILE: opus.sln
OPUS_GIT_TAG: v1.2.1
OPUS_GIT_TAG: v1.3
OPUS_MSBUILD_CMD_X86: /maxcpucount /property:Configuration=Release,Platform=Win32 /target:opus
OPUS_MSBUILD_CMD_X64: /maxcpucount /property:Configuration=Release,Platform=x64 /target:opus

NASM_URL: http://www.nasm.us/pub/nasm/releasebuilds/2.13.01/win64/nasm-2.13.01-win64.zip
LIBOPUSENC_SOL_FILE: opusenc.sln
LIBOPUSENC_MSBUILD_CMD_X86: /maxcpucount /property:Configuration=Release,Platform=Win32
LIBOPUSENC_MSBUILD_CMD_X64: /maxcpucount /property:Configuration=Release,Platform=x64

OPENSSL32_BIN_URL: https://github.com/Chocobo1/openssl_win32-build/releases/download/2018.10.19/openssl-1.0.2p-32.exe
OPENSSL64_BIN_URL: https://github.com/Chocobo1/openssl_win32-build/releases/download/2018.10.19/openssl-1.0.2p-64.exe

OPUSFILE_SOL_FILE: opusfile.sln
OPUSFILE_MSBUILD_CMD_X86: /maxcpucount /property:Configuration=Release,Platform=Win32 /target:opusfile
OPUSFILE_MSBUILD_CMD_X64: /maxcpucount /property:Configuration=Release,Platform=x64 /target:opusfile

NASM_URL: https://www.nasm.us/pub/nasm/releasebuilds/2.13.03/win64/nasm-2.13.03-win64.zip

FLAC_SOL_FILE: libFLAC_static.sln
FLAC_MSBUILD_CMD_X86: /maxcpucount /property:Configuration=Release,Platform=x86
Expand Down Expand Up @@ -80,6 +91,28 @@ before_build:
- msbuild "lib\opus\win32\VS2015\%OPUS_SOL_FILE%" %OPUS_MSBUILD_CMD_X86%
- msbuild "lib\opus\win32\VS2015\%OPUS_SOL_FILE%" %OPUS_MSBUILD_CMD_X64%

# prepare libopusenc
- cd "%REPO_DIR%"
- if exist "lib\libopusenc\win32\VS2015" (rd /S /Q "lib\libopusenc\win32\VS2015")
- move /Y "src\libopusenc\VS2015" "lib\libopusenc\win32"
- msbuild "lib\libopusenc\win32\VS2015\%LIBOPUSENC_SOL_FILE%" %LIBOPUSENC_MSBUILD_CMD_X86%
- msbuild "lib\libopusenc\win32\VS2015\%LIBOPUSENC_SOL_FILE%" %LIBOPUSENC_MSBUILD_CMD_X64%

# prepare openssl
- cd "%REPO_DIR%\lib"
- mkdir "openssl" && cd "openssl"
- appveyor DownloadFile "%OPENSSL32_BIN_URL%" -FileName "openssl32.exe"
- 7z x "openssl32.exe" -oWin32 > nul
- appveyor DownloadFile "%OPENSSL64_BIN_URL%" -FileName "openssl64.exe"
- 7z x "openssl64.exe" -ox64 > nul

# prepare opusfile
- cd "%REPO_DIR%"
- if exist "lib\opusfile\win32\VS2015" (rd /S /Q "lib\opusfile\win32\VS2015")
- move /Y "src\opusfile\VS2015" "lib\opusfile\win32"
- msbuild "lib\opusfile\win32\VS2015\%OPUSFILE_SOL_FILE%" %OPUSFILE_MSBUILD_CMD_X86%
- msbuild "lib\opusfile\win32\VS2015\%OPUSFILE_SOL_FILE%" %OPUSFILE_MSBUILD_CMD_X64%

# install NASM
- cd \
- appveyor DownloadFile "%NASM_URL%" -FileName "c:\nasm.zip"
Expand All @@ -101,8 +134,8 @@ build_script:
- move /Y "src\opus-tools\VS2015" "lib\opus-tools\win32\VS2015"
- msbuild "lib\opus-tools\win32\VS2015\%OPUS-TOOLS_SOL_FILE%" %OPUS-TOOLS_MSBUILD_CMD_X86%

- mkdir "lib\opus-tools\win32\VS2015\x64\Release"
- copy "src\opus-tools\opusenc.pgd" "lib\opus-tools\win32\VS2015\x64\Release\"
#- mkdir "lib\opus-tools\win32\VS2015\x64\Release"
#- copy "src\opus-tools\opusenc.pgd" "lib\opus-tools\win32\VS2015\x64\Release\"
- msbuild "lib\opus-tools\win32\VS2015\%OPUS-TOOLS_SOL_FILE%" %OPUS-TOOLS_MSBUILD_CMD_X64%

# scripts to run before deployment
Expand All @@ -114,7 +147,7 @@ after_build:
- copy "lib\opus-tools\win32\VS2015\Win32\Release\opus*.exe" "opus-tools\win32"
- copy "lib\opus-tools\win32\VS2015\x64\Release\opus*.exe" "opus-tools\x64"
- 7z a -sfx7z.sfx -mx9 "opus-tools.exe" "opus-tools" # the artifact must reside at the source repo root
- 'powershell -Command "& { $hash = (Get-FileHash -Algorithm SHA1 "opus-tools.exe").hash.ToString().toLower(); Write-Host $hash " *opus-tools.exe"; }" > "opus-tools.exe.sha1"'
- 'powershell -Command "& { $hash = (Get-FileHash -Algorithm SHA256 "opus-tools.exe").hash.ToString().toLower(); Write-Host $hash " *opus-tools.exe"; }" > "opus-tools.exe.sha256"'


#---------------------------------#
Expand All @@ -132,5 +165,5 @@ test: off
artifacts:
- path: opus-tools.exe
name: exe
- path: opus-tools.exe.sha1
- path: opus-tools.exe.sha256
name: checksum
6 changes: 6 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,9 @@
[submodule "lib/flac"]
path = lib/flac
url = https://git.xiph.org/flac.git
[submodule "lib/libopusenc"]
path = lib/libopusenc
url = https://git.xiph.org/libopusenc.git
[submodule "lib/opusfile"]
path = lib/opusfile
url = https://git.xiph.org/opusfile.git
10 changes: 9 additions & 1 deletion Readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,25 +7,33 @@
### <a href="https://www.opus-codec.org/"><img src="https://www.opus-codec.org/assets/img/opus-logo.svg" alt="opus logo" height="96"></a>
* x86 & x64 executables for Windows
* Portable executables, no external dependencies (dlls)
* Release build, optimized for *speed* :rocket:. PGO enabled for x64 encoder.
* Release build, optimized for *speed* :rocket:.
* Can run in WindowsXP
* Source code unmodified

| Project | Version |
| ----------------------------------------------------------------- | --------------------- |
| [opus-tools][opus-tools-link], [(mirror)][opus-tools-mirror-link] | git master |
| [opus][opus-link], [(mirror)][opus-mirror-link] | Latest stable release |
| [libopusenc][libopusenc-link], [(mirror)][libopusenc-mirror-link] | git master |
| [opusfile][opusfile-link], [(mirror)][opusfile-mirror-link] | git master |
| [ogg][ogg-link], [(mirror)][ogg-mirror-link] | git master |
| [flac][flac-link], [(mirror)][flac-mirror-link] | git master |
| [openssl][openssl-link] | Latest 1.0.x |

[opus-tools-link]: https://git.xiph.org/?p=opus-tools.git
[opus-tools-mirror-link]: https://github.com/xiph/opus-tools
[opus-link]: https://git.xiph.org/?p=opus.git
[opus-mirror-link]: https://github.com/xiph/opus
[libopusenc-link]: https://git.xiph.org/?p=libopusenc.git
[libopusenc-mirror-link]: https://github.com/xiph/libopusenc
[opusfile-link]: https://git.xiph.org/?p=opusfile.git
[opusfile-mirror-link]: https://github.com/xiph/opusfile
[ogg-link]: https://git.xiph.org/?p=ogg.git
[ogg-mirror-link]: https://github.com/xiph/ogg
[flac-link]: https://git.xiph.org/?p=flac.git
[flac-mirror-link]: https://github.com/xiph/flac
[openssl-link]: https://www.openssl.org/


### [Download page](https://github.com/Chocobo1/opus-tools_win32-build/releases)
1 change: 1 addition & 0 deletions lib/libopusenc
Submodule libopusenc added at b19e1b
1 change: 1 addition & 0 deletions lib/opusfile
Submodule opusfile added at d59a17
5 changes: 4 additions & 1 deletion src/flac/libFLAC/libFLAC_static.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,10 @@
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
<IntDir>$(Platform)\$(Configuration)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
Expand Down
35 changes: 35 additions & 0 deletions src/libopusenc/VS2015/common.props
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="PropertySheets" />
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<OutDir>$(Platform)\$(Configuration)\</OutDir>
<IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
<CharacterSet Condition="'$(ConfigurationType)'=='Application'">Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)'=='Debug' or '$(Configuration)'=='DebugDLL' or '$(Configuration)'=='DebugDLL_fixed'">
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)'=='Release' or '$(Configuration)'=='ReleaseDLL' or '$(Configuration)'=='ReleaseDLL_fixed'">
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
<AdditionalIncludeDirectories>..\;..\..\include;..\..\..\opus\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_LIB;RANDOM_PREFIX=libopusenc;OUTSIDE_SPEEX;HAVE_CONFIG_H;WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)'=='Debug' or '$(Configuration)'=='DebugDLL' or '$(Configuration)'=='DebugDLL_fixed'">
<ClCompile>
<RuntimeLibrary Condition="'$(Configuration)'=='Debug'">MultiThreadedDebug</RuntimeLibrary>
<RuntimeLibrary Condition="'$(Configuration)'!='Debug'">MultiThreadedDebugDLL</RuntimeLibrary>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)'=='Release' or '$(Configuration)'=='ReleaseDLL' or '$(Configuration)'=='ReleaseDLL_fixed'">
<ClCompile>
<FloatingPointModel Condition="'$(Configuration)'=='Release'">Fast</FloatingPointModel>
<FloatingPointModel Condition="'$(Configuration)'!='Release'">Precise</FloatingPointModel>
<RuntimeLibrary Condition="'$(Configuration)'=='Release'">MultiThreaded</RuntimeLibrary>
<RuntimeLibrary Condition="'$(Configuration)'!='Release'">MultiThreadedDLL</RuntimeLibrary>
</ClCompile>
</ItemDefinitionGroup>
<ItemGroup />
</Project>
43 changes: 43 additions & 0 deletions src/libopusenc/VS2015/opusenc.sln
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.27130.2010
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "opusenc", "opusenc.vcxproj", "{755C376F-0786-46A6-B706-A55E37430A4A}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Debug|x64 = Debug|x64
DebugDLL|Win32 = DebugDLL|Win32
DebugDLL|x64 = DebugDLL|x64
Release|Win32 = Release|Win32
Release|x64 = Release|x64
ReleaseDLL|Win32 = ReleaseDLL|Win32
ReleaseDLL|x64 = ReleaseDLL|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{755C376F-0786-46A6-B706-A55E37430A4A}.Debug|Win32.ActiveCfg = Debug|Win32
{755C376F-0786-46A6-B706-A55E37430A4A}.Debug|Win32.Build.0 = Debug|Win32
{755C376F-0786-46A6-B706-A55E37430A4A}.Debug|x64.ActiveCfg = Debug|x64
{755C376F-0786-46A6-B706-A55E37430A4A}.Debug|x64.Build.0 = Debug|x64
{755C376F-0786-46A6-B706-A55E37430A4A}.DebugDLL|Win32.ActiveCfg = DebugDLL|Win32
{755C376F-0786-46A6-B706-A55E37430A4A}.DebugDLL|Win32.Build.0 = DebugDLL|Win32
{755C376F-0786-46A6-B706-A55E37430A4A}.DebugDLL|x64.ActiveCfg = DebugDLL|x64
{755C376F-0786-46A6-B706-A55E37430A4A}.DebugDLL|x64.Build.0 = DebugDLL|x64
{755C376F-0786-46A6-B706-A55E37430A4A}.Release|Win32.ActiveCfg = Release|Win32
{755C376F-0786-46A6-B706-A55E37430A4A}.Release|Win32.Build.0 = Release|Win32
{755C376F-0786-46A6-B706-A55E37430A4A}.Release|x64.ActiveCfg = Release|x64
{755C376F-0786-46A6-B706-A55E37430A4A}.Release|x64.Build.0 = Release|x64
{755C376F-0786-46A6-B706-A55E37430A4A}.ReleaseDLL|Win32.ActiveCfg = ReleaseDLL|Win32
{755C376F-0786-46A6-B706-A55E37430A4A}.ReleaseDLL|Win32.Build.0 = ReleaseDLL|Win32
{755C376F-0786-46A6-B706-A55E37430A4A}.ReleaseDLL|x64.ActiveCfg = ReleaseDLL|x64
{755C376F-0786-46A6-B706-A55E37430A4A}.ReleaseDLL|x64.Build.0 = ReleaseDLL|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {5155F8F7-8F52-4E77-96F3-B57072D180B6}
EndGlobalSection
EndGlobal
Loading

0 comments on commit 127a789

Please sign in to comment.