Skip to content

Fix build with Win 7 / MATLAB 2016a / Win SDK 7.1A #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
haffenloher wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix build with Win 7 / MATLAB 2016a / Win SDK 7.1A #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion m_files/build_mex.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,8 @@
build_args = {build_args{:}, ['-L', cell2mat(lib_dirs(n))]};
else
%don't use -L prefix in Windows Matlab to make compatible with more versions of Matlab
build_args = {build_args{:}, ['LIB#', cell2mat(lib_dirs(n)), ';$LIB']};
%build_args = {build_args{:}, ['LIB#', cell2mat(lib_dirs(n)), ';$LIB']};
build_args = {build_args{:}, ['-L', cell2mat(lib_dirs(n))]};
end
else
print_flush('build_mex: Unable to find ''%s''\n', cell2mat(lib_dirs(n)));
Expand Down
10 changes: 5 additions & 5 deletions m_files/compile_playrec_func.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,10 +124,10 @@

if ~isempty(sdk_path)
api_include_dirs = [api_include_dirs,...
resolve_paths(sdk_path, {'include', 'lib'})];
resolve_paths(sdk_path, {'Include', 'Lib/x64'})];
% Add library path, not using -L for backward compatibility,
% apart from with octave that needs to use it
lib_dirs = [lib_dirs, resolve_paths(sdk_path, {'lib'})];
lib_dirs = [lib_dirs, resolve_paths(sdk_path, {'Lib/x64'})];
end

if use_asio
Expand Down Expand Up @@ -159,10 +159,10 @@

% Add library path, not using -L for backward compatibility,
% apart from with octave that needs to use it
if exist(resolve_paths(dsound_path, {'lib/x64'}),'dir')
lib_dirs = [lib_dirs, resolve_paths(dsound_path, {'lib/x64'})];
if exist(resolve_paths(dsound_path, {'Lib/x64'}),'dir')
lib_dirs = [lib_dirs, resolve_paths(dsound_path, {'Lib/x64'})];
else
lib_dirs = [lib_dirs, resolve_paths(dsound_path, {'lib/x86'})];
lib_dirs = [lib_dirs, resolve_paths(dsound_path, {'Lib/x86'})];
end

compiler_flags = [compiler_flags, {'PA_USE_DS'}];
Expand Down