From 3bac1f9c6c02cbe30f4fbed37366482fcc687e03 Mon Sep 17 00:00:00 2001 From: tobigun Date: Mon, 11 May 2009 19:59:01 +0000 Subject: - Package flags (FLAGS / LIBRARY_FLAGS) - -k"-U sdl_main" for Mac OS X defined as SDL package LIBRARY_FLAG - plugins moved to game/plugins - BUILD_PLUGINS option added to disable plugin creation (if linking of libraries fails) - PASCAL_FLAGS_... added git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/experimental@1722 b956fd51-792f-4845-bead-9b4dfca2ff2c --- cmake/plugins/5000Points/CMakeLists.txt | 2 +- cmake/plugins/Blind/CMakeLists.txt | 2 +- cmake/plugins/CMakeLists.txt | 11 ++++++++++- cmake/plugins/Dont_Get_Worse/CMakeLists.txt | 2 ++ cmake/plugins/Duell/CMakeLists.txt | 2 +- cmake/plugins/Team_Duell/CMakeLists.txt | 2 ++ 6 files changed, 17 insertions(+), 4 deletions(-) (limited to 'cmake/plugins') diff --git a/cmake/plugins/5000Points/CMakeLists.txt b/cmake/plugins/5000Points/CMakeLists.txt index 2d0c7008..ecc89b00 100644 --- a/cmake/plugins/5000Points/CMakeLists.txt +++ b/cmake/plugins/5000Points/CMakeLists.txt @@ -1,4 +1,4 @@ # $URL$ # $Id$ -pascal_add_module(until5000 Until5000.dpr) +pascal_add_module(until5000 Until5000.dpr OUTPUT_DIR ${USDX_PLUGIN_DIR} EXCLUDE_FROM_ALL) add_dependencies(plugins until5000) diff --git a/cmake/plugins/Blind/CMakeLists.txt b/cmake/plugins/Blind/CMakeLists.txt index f80c346b..350ba13e 100644 --- a/cmake/plugins/Blind/CMakeLists.txt +++ b/cmake/plugins/Blind/CMakeLists.txt @@ -1,4 +1,4 @@ # $URL$ # $Id$ -pascal_add_module(blind Blind.dpr) +pascal_add_module(blind Blind.dpr OUTPUT_DIR ${USDX_PLUGIN_DIR} EXCLUDE_FROM_ALL) add_dependencies(plugins blind) diff --git a/cmake/plugins/CMakeLists.txt b/cmake/plugins/CMakeLists.txt index 21f4ba5b..d7cd8ae6 100644 --- a/cmake/plugins/CMakeLists.txt +++ b/cmake/plugins/CMakeLists.txt @@ -1,7 +1,16 @@ # $URL$ # $Id$ -add_custom_target(plugins ALL) +# create an option to exclude plugins target from ALL target +option(BUILD_PLUGINS "Build UltraStar Deluxe party-mode plugins." ON) +set(plugins_tgt_all) +if(BUILD_PLUGINS) + set(plugins_tgt_all ALL) +endif(BUILD_PLUGINS) +# create a plugins target +add_custom_target(plugins ${plugins_tgt_all}) + +# add plugins to target add_subdirectory(5000Points) add_subdirectory(Blind) add_subdirectory(Duell) diff --git a/cmake/plugins/Dont_Get_Worse/CMakeLists.txt b/cmake/plugins/Dont_Get_Worse/CMakeLists.txt index 66e6f353..5a3f6c24 100644 --- a/cmake/plugins/Dont_Get_Worse/CMakeLists.txt +++ b/cmake/plugins/Dont_Get_Worse/CMakeLists.txt @@ -1,6 +1,8 @@ # $URL$ # $Id$ pascal_add_module(hold_the_line Hold_The_Line.dpr + OUTPUT_DIR ${USDX_PLUGIN_DIR} PACKAGES sdl opengl + EXCLUDE_FROM_ALL ) add_dependencies(plugins hold_the_line) diff --git a/cmake/plugins/Duell/CMakeLists.txt b/cmake/plugins/Duell/CMakeLists.txt index ea6924ef..d1a40730 100644 --- a/cmake/plugins/Duell/CMakeLists.txt +++ b/cmake/plugins/Duell/CMakeLists.txt @@ -1,4 +1,4 @@ # $URL$ # $Id$ -pascal_add_module(duell Duell.dpr) +pascal_add_module(duell Duell.dpr OUTPUT_DIR ${USDX_PLUGIN_DIR} EXCLUDE_FROM_ALL) add_dependencies(plugins duell) diff --git a/cmake/plugins/Team_Duell/CMakeLists.txt b/cmake/plugins/Team_Duell/CMakeLists.txt index 411d0f79..7201f471 100644 --- a/cmake/plugins/Team_Duell/CMakeLists.txt +++ b/cmake/plugins/Team_Duell/CMakeLists.txt @@ -1,6 +1,8 @@ # $URL$ # $Id$ pascal_add_module(team_duell TeamDuell.dpr + OUTPUT_DIR ${USDX_PLUGIN_DIR} PACKAGES sdl opengl + EXCLUDE_FROM_ALL ) add_dependencies(plugins team_duell) -- cgit v1.2.3