Merge branch 'dev' into metadata-exiv2
This commit is contained in:
@@ -192,6 +192,7 @@ if(WIN32)
|
||||
${GTK_INCLUDE_DIRS}
|
||||
${LENSFUN_INCLUDE_DIRS}
|
||||
${RSVG_INCLUDE_DIRS}
|
||||
${TIFF_INCLUDE_DIRS}
|
||||
)
|
||||
link_directories(.
|
||||
${EXTRA_LIBDIR}
|
||||
@@ -203,6 +204,7 @@ if(WIN32)
|
||||
${GTK_LIBRARY_DIRS}
|
||||
${LENSFUN_LIBRARY_DIRS}
|
||||
${RSVG_LIBRARY_DIRS}
|
||||
${TIFF_LIBRARY_DIRS}
|
||||
)
|
||||
else()
|
||||
include_directories(${EXTRA_INCDIR}
|
||||
@@ -221,6 +223,7 @@ else()
|
||||
${LCMS_INCLUDE_DIRS}
|
||||
${LENSFUN_INCLUDE_DIRS}
|
||||
${RSVG_INCLUDE_DIRS}
|
||||
${TIFF_INCLUDE_DIRS}
|
||||
)
|
||||
link_directories(${EXTRA_LIBDIR}
|
||||
${CANBERRA-GTK_LIBRARY_DIRS}
|
||||
@@ -238,6 +241,7 @@ else()
|
||||
${LCMS_LIBRARY_DIRS}
|
||||
${LENSFUN_LIBRARY_DIRS}
|
||||
${RSVG_LIBRARY_DIRS}
|
||||
${TIFF_LIBRARY_DIRS}
|
||||
)
|
||||
endif()
|
||||
|
||||
|
Reference in New Issue
Block a user