Skip to content
Snippets Groups Projects
Commit bfa653ca authored by BlackCoder's avatar BlackCoder
Browse files

- first driver merge attempt

parent b2fe4985
No related branches found
No related tags found
No related merge requests found
...@@ -18,7 +18,7 @@ IF(HOSTNAME) ...@@ -18,7 +18,7 @@ IF(HOSTNAME)
IF(extension) IF(extension)
SET(local "${local_prefix}${host}-${extension}.cmake") SET(local "${local_prefix}${host}-${extension}.cmake")
ENDIF(extension) ENDIF(extension)
IF(EXISTS ${local}) IF(EXISTS ${local})
MESSAGE(STATUS "Including local configuration ${local}.") MESSAGE(STATUS "Including local configuration ${local}.")
INCLUDE(${local}) INCLUDE(${local})
......
...@@ -61,7 +61,7 @@ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -ggdb -Wall") ...@@ -61,7 +61,7 @@ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -ggdb -Wall")
# for realpath # for realpath
IF("${CMAKE_SYSTEM}" MATCHES "Linux") IF("${CMAKE_SYSTEM}" MATCHES "Linux")
ADD_DEFINITIONS(-DLINUX) ADD_DEFINITIONS(-DLINUX)
ENDIF("${CMAKE_SYSTEM}" MATCHES "Linux") ENDIF("${CMAKE_SYSTEM}" MATCHES "Linux")
########### Options ########## ########### Options ##########
...@@ -72,7 +72,7 @@ SUBDIRS(lib/egsl) ...@@ -72,7 +72,7 @@ SUBDIRS(lib/egsl)
SUBDIRS(lib/gpc) SUBDIRS(lib/gpc)
SUBDIRS(csm) SUBDIRS(csm)
SUBDIRS(csmpp) SUBDIRS(csmpp)
SUBDIRS(drivers/playerstage/mricp)
......
...@@ -48,6 +48,7 @@ TARGET_LINK_LIBRARIES(mricp ...@@ -48,6 +48,7 @@ TARGET_LINK_LIBRARIES(mricp
${CSM_LIBRARIES} ${CSM_LIBRARIES}
${GTK_LIBRARIES} ${GTK_LIBRARIES}
${GDKPIXBUF_LIBRARIES} ${GDKPIXBUF_LIBRARIES}
${CSM_LIBRARY_DIRS}
) )
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
...@@ -55,6 +56,8 @@ INCLUDE_DIRECTORIES( ...@@ -55,6 +56,8 @@ INCLUDE_DIRECTORIES(
${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}
${GTK_INCLUDE_DIRS} ${GTK_INCLUDE_DIRS}
${GDKPIXBUF_INCLUDE_DIRS} ${GDKPIXBUF_INCLUDE_DIRS}
${CSM_INCLUDE_DIRS}
./include ./include
../../../csmpp ../../../csmpp
../../../csm
) )
This diff is collapsed.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment