Skip to content

Commit 70b20a1

Browse files
author
Erik Sohns
committed
minor changes
1 parent 889f5b1 commit 70b20a1

File tree

2 files changed

+6
-8
lines changed

2 files changed

+6
-8
lines changed

src/modules/lib/scripts/DirectXBaseClasses.cmake

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,15 @@ if (WIN32)
77
# "$ENV{${_PF86}}/Microsoft SDKs/Windows/v7.0/Samples/multimedia/directshow/baseclasses")
88
# message (STATUS "DirectShow baseclasses directory: \"${DIRECTSHOW_BASECLASSES_DIRECTORY}\"")
99

10-
set (LIB_FILE_SUFFIX "")
11-
set (PATH_SUFFIX "Release")
12-
if (CMAKE_BUILD_TYPE STREQUAL "Debug")
13-
set (LIB_FILE_SUFFIX "d")
14-
set (PATH_SUFFIX "Debug")
15-
endif (CMAKE_BUILD_TYPE STREQUAL "Debug")
10+
# set (LIB_FILE_SUFFIX "")
11+
# if (CMAKE_BUILD_TYPE STREQUAL "Debug")
12+
# set (LIB_FILE_SUFFIX "d")
13+
# endif (CMAKE_BUILD_TYPE STREQUAL "Debug")
1614
set (DIRECTSHOW_BASECLASSES_LIB_FILE BaseClasses${LIB_FILE_SUFFIX}.lib)
1715
# *TODO*: add unicode support
1816
find_library (BASECLASSES_LIBRARY ${DIRECTSHOW_BASECLASSES_LIB_FILE}
1917
PATHS ${DIRECTSHOW_BASECLASSES_DIRECTORY}/build/msvc/baseclasses
20-
PATH_SUFFIXES ${PATH_SUFFIX}
18+
PATH_SUFFIXES ${CMAKE_BUILD_TYPE}
2119
DOC "searching for \"${DIRECTSHOW_BASECLASSES_LIB_FILE}\""
2220
NO_DEFAULT_PATH)
2321
if (BASECLASSES_LIBRARY)

test_i/commandspeech/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ if (WIN32)
124124
add_compile_options ($<$<CONFIG:Debug>:-DDEBUG>)
125125
add_compile_options ($<$<CONFIG:Debug>:-DD3D_DEBUG_INFO>)
126126
# add_definitions (-DSWIG) # *WORKAROUND*
127-
endif ()
127+
endif (WIN32)
128128

129129
#cmake_policy (SET CMP0065 OLD) # do not add flags to export symbols from executables without the ENABLE_EXPORTS target property
130130
add_executable (${EXECUTABLE}

0 commit comments

Comments
 (0)