Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Alchemy Viewer
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Package registry
Operate
Terraform modules
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Silent mode is enabled
All outbound communications are blocked.
Learn more
.
Show more breadcrumbs
Alchemy Viewer
Alchemy Viewer
Commits
76a08a78
Commit
76a08a78
authored
16 years ago
by
Bryan O'Sullivan
Browse files
Options
Downloads
Patches
Plain Diff
DEV-18513 - Don't fail if we have no debug FMOD libraries
Reviewed by Poppy.
parent
9a7d68cf
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
indra/cmake/FMOD.cmake
+9
-8
9 additions, 8 deletions
indra/cmake/FMOD.cmake
with
9 additions
and
8 deletions
indra/cmake/FMOD.cmake
+
9
−
8
View file @
76a08a78
# -*- cmake -*-
# -*- cmake -*-
include
(
Linking
)
if
(
INSTALL_PROPRIETARY
)
if
(
INSTALL_PROPRIETARY
)
include
(
Prebuilt
)
include
(
Prebuilt
)
use_prebuilt_binary
(
fmod
)
use_prebuilt_binary
(
fmod
)
...
@@ -9,22 +11,21 @@ find_library(FMOD_LIBRARY_RELEASE
...
@@ -9,22 +11,21 @@ find_library(FMOD_LIBRARY_RELEASE
NAMES fmod fmodvc fmod-3.75
NAMES fmod fmodvc fmod-3.75
PATHS
PATHS
${
ARCH_PREBUILT_DIRS_RELEASE
}
${
ARCH_PREBUILT_DIRS_RELEASE
}
${
LIBS_PREBUILT_DIR
}
/
${
LL_ARCH_DIR
}
/lib/release
${
LIBS_PREBUILT_DIR
}
/
${
LL_ARCH_DIR
}
/lib_release
${
LIBS_PREBUILT_DIR
}
/
${
LL_ARCH_DIR
}
/lib_release_client
)
)
find_library
(
FMOD_LIBRARY_DEBUG
find_library
(
FMOD_LIBRARY_DEBUG
NAMES fmod fmodvc fmod-3.75
NAMES fmod fmodvc fmod-3.75
PATHS
PATHS
${
ARCH_PREBUILT_DIRS_DEBUG
}
${
ARCH_PREBUILT_DIRS_DEBUG
}
${
LIBS_PREBUILT_DIR
}
/
${
LL_ARCH_DIR
}
/lib/debug
${
LIBS_PREBUILT_DIR
}
/
${
LL_ARCH_DIR
}
/lib_debug
)
)
if
(
FMOD_LIBRARY_RELEASE AND FMOD_LIBRARY_DEBUG
)
if
(
FMOD_LIBRARY_RELEASE AND FMOD_LIBRARY_DEBUG
)
set
(
FMOD_LIBRARY debug
${
FMOD_LIBRARY_DEBUG
}
optimized
${
FMOD_LIBRARY_RELEASE
}
)
set
(
FMOD_LIBRARY
endif
(
FMOD_LIBRARY_RELEASE AND FMOD_LIBRARY_DEBUG
)
debug
${
FMOD_LIBRARY_DEBUG
}
optimized
${
FMOD_LIBRARY_RELEASE
}
)
elseif
(
FMOD_LIBRARY_RELEASE
)
set
(
FMOD_LIBRARY
${
FMOD_LIBRARY_RELEASE
}
)
endif
(
FMOD_LIBRARY_RELEASE AND FMOD_LIBRARY_DEBUG
)
if
(
NOT FMOD_LIBRARY
)
if
(
NOT FMOD_LIBRARY
)
set
(
FMOD_SDK_DIR CACHE PATH
"Path to the FMOD SDK."
)
set
(
FMOD_SDK_DIR CACHE PATH
"Path to the FMOD SDK."
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment