Skip to content

Commit

Permalink
Convert undo library into a submodule
Browse files Browse the repository at this point in the history
  • Loading branch information
dacap committed Aug 1, 2016
1 parent 45fcd9e commit 5ea955d
Show file tree
Hide file tree
Showing 12 changed files with 13 additions and 486 deletions.
3 changes: 3 additions & 0 deletions .gitmodules
Expand Up @@ -33,3 +33,6 @@
[submodule "src/observable"]
path = src/observable
url = https://github.com/dacap/observable.git
[submodule "src/undo"]
path = src/undo
url = https://github.com/aseprite/undo.git
14 changes: 8 additions & 6 deletions src/CMakeLists.txt
Expand Up @@ -85,16 +85,20 @@ set(OBSERVABLE_TESTS OFF CACHE BOOL "Compile observable tests")
add_subdirectory(observable)
include_directories(observable)

# Disable clip examples
set(CLIP_EXAMPLES OFF CACHE BOOL "Compile clip examples")
add_subdirectory(clip)

# Disable undo tests
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})

# Disable clip examples
set(CLIP_EXAMPLES OFF CACHE BOOL "Compile clip examples")
add_subdirectory(clip)

add_subdirectory(cfg)
add_subdirectory(css)
add_subdirectory(doc)
Expand All @@ -108,7 +112,6 @@ add_subdirectory(render)
add_subdirectory(script)
add_subdirectory(she)
add_subdirectory(ui)
add_subdirectory(undo)

if(ENABLE_UPDATER)
add_subdirectory(updater)
Expand Down Expand Up @@ -178,7 +181,6 @@ if(ENABLE_TESTS)
include(FindTests)

find_tests(base base-lib)
find_tests(undo undo-lib)
find_tests(gfx gfx-lib)
find_tests(doc doc-lib)
find_tests(render render-lib)
Expand Down
2 changes: 1 addition & 1 deletion src/app/CMakeLists.txt
Expand Up @@ -459,7 +459,7 @@ target_link_libraries(app-lib
script-lib
she
ui-lib
undo-lib
undo
${TINYXML_LIBRARY}
${JPEG_LIBRARIES}
${GIF_LIBRARIES}
Expand Down
1 change: 1 addition & 0 deletions src/undo
Submodule undo added at f39b18
5 changes: 0 additions & 5 deletions src/undo/CMakeLists.txt

This file was deleted.

20 changes: 0 additions & 20 deletions src/undo/LICENSE.txt

This file was deleted.

4 changes: 0 additions & 4 deletions src/undo/README.md

This file was deleted.

23 changes: 0 additions & 23 deletions src/undo/undo_command.h

This file was deleted.

153 changes: 0 additions & 153 deletions src/undo/undo_history.cpp

This file was deleted.

47 changes: 0 additions & 47 deletions src/undo/undo_history.h

This file was deleted.

45 changes: 0 additions & 45 deletions src/undo/undo_state.h

This file was deleted.

0 comments on commit 5ea955d

Please sign in to comment.