Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Move all CMake of lib-src to cmake-proxies
Previously lib-src that we controlled had their cmake files with them. This is clearer. Also added place holders for help and locale. Also enabled libvorbis and soundtouch and disabled portburn.
- Loading branch information
1 parent
94a7319
commit 47e8265
Showing
5 changed files
with
41 additions
and
23 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
15 changes: 8 additions & 7 deletions
15
lib-src/FileDialog/CMakeLists.txt → cmake-proxies/FileDialog/CMakeLists.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,23 +1,24 @@ | ||
#directory lib-src/FileDialog | ||
|
||
set( TARGET FileDialog ) | ||
set( TARGET_SOURCE ${LIB_SRC_DIRECTORY}${TARGET} ) | ||
project( ${TARGET} ) | ||
|
||
set( SOURCES | ||
${LIB_SRC_DIRECTORY}FileDialog/FileDialog.cpp | ||
#${LIB_SRC_DIRECTORY}FileDialog/gtk/FileDialogPrivate.cpp #not on windows. | ||
${LIB_SRC_DIRECTORY}FileDialog/win/FileDialogPrivate.cpp | ||
) | ||
|
||
|
||
project (FileDialog) | ||
add_library( FileDialog STATIC ${SOURCES}) | ||
find_package(wxWidgets REQUIRED COMPONENTS net core base) | ||
include( ${wxWidgets_USE_FILE} ) | ||
target_include_directories( FileDialog PRIVATE | ||
target_include_directories( ${TARGET} PRIVATE | ||
#${wxWidgets_INCLUDE_DIRS} | ||
${top_dir}/FileDialog | ||
${top_dir}/FileDialog/win | ||
${TARGET_SOURCE} | ||
${TARGET_SOURCE}/win | ||
) | ||
add_definitions( -DWXUSINGDLL -DWIN32 -D_LIB | ||
#${wxWidgets_DEFINITIONS} | ||
) | ||
target_link_libraries(FileDialog ${wxWidgets_LIBRARIES}) | ||
target_link_libraries(${TARGET} ${wxWidgets_LIBRARIES}) | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
#directory cmake-proxies/mod-script-pipe | ||
set( TARGET mod-script-pipe ) | ||
set( TARGET_SOURCE ${LIB_SRC_DIRECTORY}${TARGET} ) | ||
project( ${TARGET} ) | ||
find_package(wxWidgets REQUIRED COMPONENTS net core base) | ||
include(${wxWidgets_USE_FILE}) | ||
|
||
set( SOURCES | ||
${TARGET_SOURCE}/PipeServer.cpp | ||
${TARGET_SOURCE}/ScripterCallback.cpp | ||
) | ||
# This defines the #define on both Windows and Linux. | ||
add_definitions( -DBUILDING_SCRIPT_PIPE ) | ||
add_library( ${TARGET} MODULE ${SOURCES}) | ||
|
||
target_include_directories( ${TARGET} PRIVATE | ||
${top_dir}/win | ||
) | ||
|
||
target_link_libraries( ${TARGET} ${wxWidgets_LIBRARIES}) |
This file was deleted.
Oops, something went wrong.