equal
deleted
inserted
replaced
141 #find libsdmain.a |
141 #find libsdmain.a |
142 find_file(SDLMAIN_LIB libSDLMain.a PATHS ${sdl_dir}/Resources/) |
142 find_file(SDLMAIN_LIB libSDLMain.a PATHS ${sdl_dir}/Resources/) |
143 |
143 |
144 if(SDLMAIN_LIB MATCHES "SDLMAIN_LIB-NOTFOUND") |
144 if(SDLMAIN_LIB MATCHES "SDLMAIN_LIB-NOTFOUND") |
145 include_directories(${SDL_INCLUDE_DIR}) |
145 include_directories(${SDL_INCLUDE_DIR}) |
146 add_library (SDLmain STATIC SDLMain.m) |
146 add_library (SDLmain STATIC sdlmain_osx/SDLMain.m) |
147 #add a dependency to the hwengine target |
147 #add a dependency to the hwengine target |
148 set(engine_sources ${engine_sources} SDLmain) |
148 set(engine_sources ${engine_sources} SDLmain) |
149 set(SDLMAIN_LIB "${LIBRARY_OUTPUT_PATH}/libSDLmain.a") |
149 set(SDLMAIN_LIB "${LIBRARY_OUTPUT_PATH}/libSDLmain.a") |
150 endif() |
150 endif() |
151 |
151 |
203 if(${FFMPEG_FOUND}) |
203 if(${FFMPEG_FOUND}) |
204 include_directories(${FFMPEG_INCLUDE_DIR}) |
204 include_directories(${FFMPEG_INCLUDE_DIR}) |
205 set(pascal_flags "-dUSE_VIDEO_RECORDING" ${pascal_flags}) |
205 set(pascal_flags "-dUSE_VIDEO_RECORDING" ${pascal_flags}) |
206 IF (WIN32) |
206 IF (WIN32) |
207 # there are some problems with linking our avwrapper as static lib, so link it as shared |
207 # there are some problems with linking our avwrapper as static lib, so link it as shared |
208 add_library(avwrapper SHARED avwrapper.c) |
208 add_library(avwrapper SHARED videorec/avwrapper.c) |
209 target_link_libraries(avwrapper ${FFMPEG_LIBRARIES}) |
209 target_link_libraries(avwrapper ${FFMPEG_LIBRARIES}) |
210 install(PROGRAMS "${EXECUTABLE_OUTPUT_PATH}/${CMAKE_SHARED_LIBRARY_PREFIX}avwrapper${CMAKE_SHARED_LIBRARY_SUFFIX}" DESTINATION ${target_dir}) |
210 install(PROGRAMS "${EXECUTABLE_OUTPUT_PATH}/${CMAKE_SHARED_LIBRARY_PREFIX}avwrapper${CMAKE_SHARED_LIBRARY_SUFFIX}" DESTINATION ${target_dir}) |
211 ELSE() |
211 ELSE() |
212 add_library(avwrapper STATIC avwrapper.c) |
212 add_library(avwrapper STATIC videorec/avwrapper.c) |
213 set(pascal_flags "-k${FFMPEG_LIBAVCODEC}" "-k${FFMPEG_LIBAVFORMAT}" "-k${FFMPEG_LIBAVUTIL}" ${pascal_flags}) |
213 set(pascal_flags "-k${FFMPEG_LIBAVCODEC}" "-k${FFMPEG_LIBAVFORMAT}" "-k${FFMPEG_LIBAVUTIL}" ${pascal_flags}) |
214 ENDIF() |
214 ENDIF() |
215 if(fpc_version LESS "020600") |
215 if(fpc_version LESS "020600") |
216 add_dependencies(avwrapper ENGINECLEAN) |
216 add_dependencies(avwrapper ENGINECLEAN) |
217 endif() |
217 endif() |