Add flags to link with giflib and curl shared libraries.

Removed freetype and libart in the linking process because they
are not used anymore (the source code is still in the repository).

CMakeLists.txt

@@ -30,6 +30,8 @@ project(aseprite C CXX)
 # CMakeCache.txt)
 
 option(USE_STATIC_LIBC    "Use static version of C and C++ runtimes" off)
+option(USE_SHARED_CURL    "Use your installed copy of curl" off)
+option(USE_SHARED_GIFLIB  "Use your installed copy of giflib" off)
 option(USE_SHARED_JPEGLIB "Use your installed copy of jpeglib" off)
 option(USE_SHARED_ZLIB    "Use your installed copy of zlib" off)
 option(USE_SHARED_LIBPNG  "Use your installed copy of libpng" off)

src/CMakeLists.txt

@@ -8,8 +8,15 @@ if(MSVC)
   endif()
 endif(MSVC)
 
+# Libraries in this directory
+set(aseprite_libraries aseprite-library undo-lib filters-lib gui-lib gfx-lib base-lib)
+
+# Directories where .h files can be found
+include_directories(. .. ../third_party)
+
 # Third-party libraries
-set(libs3rdparty freetype libart_lgpl loadpng tinyxml giflib)
+set(libs3rdparty loadpng tinyxml)
+include_directories(${LOADPNG_DIR} ${TINYXML_DIR})
 
 if(USE_SHARED_JPEGLIB)
   find_package(JPEG)
@@ -19,6 +26,7 @@ if(USE_SHARED_JPEGLIB)
   endif(JPEG_FOUND)
 else()
   set(libs3rdparty ${libs3rdparty} jpeg)
+  include_directories(${LIBJPEG_DIR})
 endif()
 
 if(USE_SHARED_ZLIB)
@@ -29,6 +37,7 @@ if(USE_SHARED_ZLIB)
   endif(ZLIB_FOUND)
 else()
   set(libs3rdparty ${libs3rdparty} zlib)
+  include_directories(${ZLIB_DIR})
 endif()
 
 if(USE_SHARED_LIBPNG)
@@ -40,21 +49,39 @@ if(USE_SHARED_LIBPNG)
   endif(PNG_FOUND)
 else()
   set(libs3rdparty ${libs3rdparty} libpng)
+  include_directories(${LIBPNG_DIR})
 endif()
 
-if(CURL_STATICLIB)
-  add_definitions(-DCURL_STATICLIB)
+if(USE_SHARED_GIFLIB)
+  find_library(GIFLIB_LIBRARY gif)
+  find_path(GIFLIB_INCLUDE_DIR gif_lib.h)
+
+  set(libs3rdparty ${libs3rdparty} ${GIFLIB_LIBRARY})
+  include_directories(${GIFLIB_INCLUDE_DIR})
+else()
+  set(libs3rdparty ${libs3rdparty} giflib)
+  include_directories(${GIFLIB_DIR}/lib)
 endif()
 
 if (CMAKE_USE_PTHREADS_INIT)
   set(sys_libs ${sys_libs} ${CMAKE_THREAD_LIBS_INIT})
 endif()
 
-# Libraries in this directory
-set(aseprite_libraries aseprite-library undo-lib filters-lib gui-lib gfx-lib base-lib)
-
 if(ENABLE_UPDATER)
-  set(libs3rdparty ${libs3rdparty} libcurl)
+  if(USE_SHARED_CURL)
+    find_library(LIBCURL_LIBRARY curl)
+    find_path(LIBCURL_INCLUDE_DIR curl/curl.h)
+
+    set(libs3rdparty ${libs3rdparty} ${LIBCURL_LIBRARY})
+    include_directories(${LIBCURL_INCLUDE_DIR})
+  else()
+    set(libs3rdparty ${libs3rdparty} libcurl)
+    include_directories(${CURL_DIR}/include)
+    if(CURL_STATICLIB)
+      add_definitions(-DCURL_STATICLIB)
+    endif()
+  endif()
+
   set(aseprite_libraries ${aseprite_libraries} updater-lib net-lib)
   add_definitions(-DENABLE_UPDATER)
 endif()
@@ -62,18 +89,6 @@ endif()
 # All libraries for .exe files
 set(all_libs ${aseprite_libraries} ${libs3rdparty} allegro ${sys_libs})
 
-# Directories where .h files can be found
-include_directories(
-  . .. ../third_party
-  ${CURL_DIR}/include
-  ${GIFLIB_DIR}/lib
-  ${LIBFREETYPE_DIR}/include
-  ${LIBJPEG_DIR}
-  ${LIBPNG_DIR}
-  ${ZLIB_DIR}
-  ${LOADPNG_DIR}
-  ${TINYXML_DIR})
-
 ######################################################################
 # Sub-libraries
 

src/gui/font.cpp

@@ -47,7 +47,7 @@ FONT* ji_font_load_bmp(const char* filepathname)
 }
 
 /**********************************************************************/
-#if 1 /* with FreeType */
+#if 0 /* with FreeType */
 /**********************************************************************/
 
 #include "ft2build.h"

third_party/CMakeLists.txt

@@ -21,12 +21,14 @@ if(NOT USE_SHARED_LIBPNG)
   add_subdirectory(libpng)
 endif()
 
-if(ENABLE_UPDATER)
+if(NOT USE_SHARED_GIFLIB)
+  add_subdirectory(giflib)
+endif()
+
+if(ENABLE_UPDATER AND NOT USE_SHARED_CURL)
   add_subdirectory(curl)
 endif()
-add_subdirectory(giflib)
+
 add_subdirectory(gtest)
-add_subdirectory(freetype)
-add_subdirectory(libart_lgpl)
 add_subdirectory(loadpng)
 add_subdirectory(tinyxml)