diff --git a/CMakeLists.txt b/CMakeLists.txt index d7d29f627..74a73efa2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -82,6 +82,24 @@ endif() ###################################################################### # Directories +set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib") +set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib") +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin") +# We need to specify the output for each configuration to make it work +# on Visual Studio solutions. +set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_DEBUG "${CMAKE_BINARY_DIR}/lib") +set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_DEBUG "${CMAKE_BINARY_DIR}/lib") +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG "${CMAKE_BINARY_DIR}/bin") +set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELWITHDEBINFO "${CMAKE_BINARY_DIR}/lib") +set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELWITHDEBINFO "${CMAKE_BINARY_DIR}/lib") +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO "${CMAKE_BINARY_DIR}/bin") +set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELEASE "${CMAKE_BINARY_DIR}/lib") +set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE "${CMAKE_BINARY_DIR}/lib") +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE "${CMAKE_BINARY_DIR}/bin") +set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_PROFILE "${CMAKE_BINARY_DIR}/lib") +set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_PROFILE "${CMAKE_BINARY_DIR}/lib") +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_PROFILE "${CMAKE_BINARY_DIR}/bin") + set(CURL_DIR ${CMAKE_SOURCE_DIR}/third_party/curl) set(GIFLIB_DIR ${CMAKE_SOURCE_DIR}/third_party/giflib) set(LIBFREETYPE_DIR ${CMAKE_SOURCE_DIR}/third_party/freetype) diff --git a/INSTALL.md b/INSTALL.md index c7bc21ffa..1e3acfba0 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -53,11 +53,10 @@ the source code in a directory called `aseprite-source`): opening the solution, etc. 4. When the project is compiled, you can copy the resulting executable - file (e.g. `build/src/aseprite.exe`) to `aseprite-source` and + file (e.g. `build/bin/aseprite.exe`) to `aseprite-source` and execute it. If you have used a Visual Studio project, you can copy - the whole `data/` directory to `build/src/RelWithDebInfo/` so you - can run/debug the program from Visual Studio IDE. On Linux, you can - copy the `data/` directory in `~/.aseprite/` directory. + the whole `data/` directory to `build/bin/` so you can run/debug + the program from Visual Studio IDE. ## Mac OS X details