Move base module to laf library

.gitmodules

@@ -36,3 +36,6 @@
 [submodule "src/undo"]
 	path = src/undo
 	url = https://github.com/aseprite/undo.git
+[submodule "laf"]
+	path = laf
+	url = https://github.com/aseprite/laf.git

CMakeLists.txt

@@ -12,8 +12,6 @@ else()
   cmake_minimum_required(VERSION 2.6)
 endif()
 
-enable_testing()
-
 if(COMMAND cmake_policy)
   # CMP0003: Libraries linked via full path no longer produce linker search paths.
   #cmake_policy(SET CMP0003 NEW)
@@ -37,10 +35,16 @@ set(CMAKE_CONFIGURATION_TYPES "${CMAKE_BUILD_TYPE}" CACHE INTERNAL "internal")
 # Aseprite project
 project(aseprite C CXX)
 
+# Check repository status
+if(NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/laf/CMakeLists2.txt)
+  message(FATAL_ERROR "Your Aseprite repository is incomplete, initialize submodules using:\n  git submodule update --init --recursive")
+endif()
+
 # This required for KDE/Qt destop integration, which sets BUILD_SHARED_LIBS to
 # TRUE by default
 set(BUILD_SHARED_LIBS off)
 
+enable_testing()
 
 ######################################################################
 # Options (these can be specified in cmake command line or modifying
@@ -142,7 +146,6 @@ set(SIMPLEINI_DIR       ${CMAKE_SOURCE_DIR}/third_party/simpleini)
 set(TINYXML_DIR         ${CMAKE_SOURCE_DIR}/third_party/tinyxml)
 set(ZLIB_DIR            ${CMAKE_SOURCE_DIR}/third_party/zlib)
 set(DUKTAPE_DIR         ${CMAKE_SOURCE_DIR}/third_party/duktape)
-set(MODP_B64_DIR        ${CMAKE_SOURCE_DIR}/third_party/modp_b64)
 
 # Search in the "cmake" directory for additional CMake modules.
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
@@ -425,12 +428,17 @@ if(WITH_DESKTOP_INTEGRATION)
   add_subdirectory(desktop)
 endif()
 
-######################################################################
-# Main ASE targets
+# Third parties
+add_subdirectory(third_party)
 
-add_subdirectory(src)
+# LAF libraries + Aseprite are compiled with config.h
+include_directories(src)
+add_definitions(-DHAVE_CONFIG_H)
+if(ENABLE_MEMLEAK)
+  add_definitions(-DMEMLEAK)
+endif()
 
-######################################################################
-# Third party libraries
+set(LAF_WITH_TESTS ${ENABLE_TESTS} CACHE BOOL "Enable LAF tests")
+add_subdirectory(laf)
 
-add_subdirectory(third_party)
+add_subdirectory(src)

src/CMakeLists.txt

@@ -1,15 +1,6 @@
 # Aseprite
 # Copyright (C) 2001-2016  David Capello
 
-######################################################################
-# Common definitions for all Aseprite libraries/projects
-
-add_definitions(-DHAVE_CONFIG_H)
-
-if(ENABLE_MEMLEAK)
-  add_definitions(-DMEMLEAK)
-endif()
-
 ######################################################################
 # Compiler-specific flags
 
@@ -32,8 +23,10 @@ if(ENABLE_UPDATER)
   add_definitions(-DENABLE_UPDATER)
 endif()
 
-# Directories where .h files can be found
-include_directories(. .. ../third_party)
+if(WIN32)
+  # Needed to include icons in win32 .rc file
+  include_directories(..)
+endif()
 
 # Use patched version of Allegro 4 (with window resize support).
 if(USE_ALLEG4_BACKEND AND NOT USE_SHARED_ALLEGRO4)
@@ -93,12 +86,6 @@ add_subdirectory(clip)
 set(UNDO_TESTS OFF CACHE BOOL "Compile undo tests")
 add_subdirectory(undo)
 
-# Our base library
-add_subdirectory(base)
-
-# Directory where base/config.h file is located
-include_directories(${BASE_INCLUDE_DIR})
-
 add_subdirectory(cfg)
 add_subdirectory(css)
 add_subdirectory(doc)
@@ -181,7 +168,6 @@ install(DIRECTORY ../data
 if(ENABLE_TESTS)
   include(FindTests)
 
-  find_tests(base base-lib)
   find_tests(gfx gfx-lib)
   find_tests(doc doc-lib)
   find_tests(render render-lib)

src/app/CMakeLists.txt

@@ -446,7 +446,7 @@ add_library(app-lib
   ${generated_files})
 
 target_link_libraries(app-lib
-  base-lib
+  laf-base
   cfg-lib
   clip
   css-lib