From 28f661b72ba1e7fc2e2ceb5a56415531e9aba78e Mon Sep 17 00:00:00 2001 From: kervala Date: Thu, 2 Sep 2010 12:48:33 +0200 Subject: [PATCH] Changed: Updated tools CMake projects --- code/nel/tools/3d/CMakeLists.txt | 41 +++++++++++-------- .../tools/3d/hls_bank_maker/CMakeLists.txt | 11 +++++ code/nel/tools/3d/ig_add/CMakeLists.txt | 2 +- code/nel/tools/3d/ig_elevation/CMakeLists.txt | 2 +- .../3d/lightmap_optimizer/CMakeLists.txt | 2 +- code/nel/tools/CMakeLists.txt | 15 ++++--- code/nel/tools/logic/CMakeLists.txt | 7 ++-- code/nel/tools/memory/CMakeLists.txt | 1 + code/nel/tools/memory/memlog/CMakeLists.txt | 9 ++++ code/nel/tools/memory/memlog/StdAfx.cpp | 8 ---- code/nel/tools/memory/memlog/StdAfx.h | 19 --------- code/nel/tools/memory/memlog/memlog.cpp | 17 +++++++- code/nel/tools/sound/CMakeLists.txt | 1 + 13 files changed, 76 insertions(+), 59 deletions(-) create mode 100644 code/nel/tools/3d/hls_bank_maker/CMakeLists.txt create mode 100644 code/nel/tools/memory/CMakeLists.txt create mode 100644 code/nel/tools/memory/memlog/CMakeLists.txt delete mode 100644 code/nel/tools/memory/memlog/StdAfx.cpp delete mode 100644 code/nel/tools/memory/memlog/StdAfx.h create mode 100644 code/nel/tools/sound/CMakeLists.txt diff --git a/code/nel/tools/3d/CMakeLists.txt b/code/nel/tools/3d/CMakeLists.txt index 99598307d..550293ad3 100644 --- a/code/nel/tools/3d/CMakeLists.txt +++ b/code/nel/tools/3d/CMakeLists.txt @@ -1,4 +1,5 @@ -SUBDIRS( build_coarse_mesh +SUBDIRS( + build_coarse_mesh build_far_bank build_smallbank ig_lighter @@ -22,31 +23,35 @@ SUBDIRS( build_coarse_mesh zone_check_bind zone_dump zviewer) -IF(WIN32) - ADD_SUBDIRECTORY(object_viewer) - ADD_SUBDIRECTORY(object_viewer_exe) - ADD_SUBDIRECTORY(tile_edit) + +IF(WIN32) + ADD_SUBDIRECTORY(ig_elevation) + ADD_SUBDIRECTORY(lightmap_optimizer) + + IF(MFC_FOUND) + ADD_SUBDIRECTORY(object_viewer) + ADD_SUBDIRECTORY(object_viewer_exe) + ADD_SUBDIRECTORY(tile_edit) + ENDIF(MFC_FOUND) + + IF(WITH_MAXPLUGIN) + IF(MAXSDK_FOUND) + ADD_SUBDIRECTORY(plugin_max) + ADD_SUBDIRECTORY(ligo) + ENDIF(MAXSDK_FOUND) + ENDIF(WITH_MAXPLUGIN) + ENDIF(WIN32) IF(WITH_QT) ADD_SUBDIRECTORY(tile_edit_qt) ENDIF(WITH_QT) -IF(WITH_MAXPLUGIN) - IF(MAXSDK_FOUND) - ADD_SUBDIRECTORY(plugin_max) - ADD_SUBDIRECTORY(ligo) - ENDIF(MAXSDK_FOUND) -ENDIF(WITH_MAXPLUGIN) - IF(SQUISH_FOUND) ADD_SUBDIRECTORY(panoply_maker) ADD_SUBDIRECTORY(tga_2_dds) + ADD_SUBDIRECTORY(hls_bank_maker) ENDIF(SQUISH_FOUND) -# These use WIndows-specific things that need to be fixed. -#ig_elevation -#lightmap_optimizer -#object_viewer_exe -#hls_bank_maker -#plugin_max +#crash_log_analyser +#shapes_exporter diff --git a/code/nel/tools/3d/hls_bank_maker/CMakeLists.txt b/code/nel/tools/3d/hls_bank_maker/CMakeLists.txt new file mode 100644 index 000000000..ffc3ef01a --- /dev/null +++ b/code/nel/tools/3d/hls_bank_maker/CMakeLists.txt @@ -0,0 +1,11 @@ +FILE(GLOB SRC *.cpp *.h ../panoply_maker/hls_bank_texture_info.cpp ../panoply_maker/hls_bank_texture_info.h ../s3tc_compressor_lib/*.cpp ../s3tc_compressor_lib/*.h) + +ADD_EXECUTABLE(hls_bank_maker ${SRC}) + +INCLUDE_DIRECTORIES(${SQUISH_INCLUDE_DIR}) + +TARGET_LINK_LIBRARIES(hls_bank_maker ${PLATFORM_LINKFLAGS} ${SQUISH_LIBRARY} nelmisc nel3d) +NL_DEFAULT_PROPS(hls_bank_maker "Tools, 3D: hls_bank_maker") +NL_ADD_RUNTIME_FLAGS(hls_bank_maker) + +INSTALL(TARGETS hls_bank_maker RUNTIME DESTINATION bin COMPONENT tools3d) diff --git a/code/nel/tools/3d/ig_add/CMakeLists.txt b/code/nel/tools/3d/ig_add/CMakeLists.txt index a5556d78c..cda86000f 100644 --- a/code/nel/tools/3d/ig_add/CMakeLists.txt +++ b/code/nel/tools/3d/ig_add/CMakeLists.txt @@ -2,7 +2,7 @@ FILE(GLOB SRC *.cpp *.h) ADD_EXECUTABLE(ig_add ${SRC}) -TARGET_LINK_LIBRARIES(ig_add ${PLATFORM_LINKFLAGS} nel3d) +TARGET_LINK_LIBRARIES(ig_add ${PLATFORM_LINKFLAGS} nel3d nelmisc) NL_DEFAULT_PROPS(ig_add "Tools, 3D: ig_add") NL_ADD_RUNTIME_FLAGS(ig_add) diff --git a/code/nel/tools/3d/ig_elevation/CMakeLists.txt b/code/nel/tools/3d/ig_elevation/CMakeLists.txt index 5f6c4a7c4..2e428cc7a 100644 --- a/code/nel/tools/3d/ig_elevation/CMakeLists.txt +++ b/code/nel/tools/3d/ig_elevation/CMakeLists.txt @@ -4,7 +4,7 @@ ADD_EXECUTABLE(ig_elevation ${SRC}) INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) -TARGET_LINK_LIBRARIES(ig_elevation ${PLATFORM_LINKFLAGS} nelmisc nel3d) +TARGET_LINK_LIBRARIES(ig_elevation ${PLATFORM_LINKFLAGS} nelmisc nel3d nelligo) NL_DEFAULT_PROPS(ig_elevation "Tools, 3D: ig_elevation") NL_ADD_RUNTIME_FLAGS(ig_elevation) diff --git a/code/nel/tools/3d/lightmap_optimizer/CMakeLists.txt b/code/nel/tools/3d/lightmap_optimizer/CMakeLists.txt index 3a15f394b..7104d05f8 100644 --- a/code/nel/tools/3d/lightmap_optimizer/CMakeLists.txt +++ b/code/nel/tools/3d/lightmap_optimizer/CMakeLists.txt @@ -2,7 +2,7 @@ FILE(GLOB SRC *.cpp *.h) ADD_EXECUTABLE(lightmap_optimizer ${SRC}) -TARGET_LINK_LIBRARIES(lightmap_optimizer ${PLATFORM_LINKFLAGS} nelmisc) +TARGET_LINK_LIBRARIES(lightmap_optimizer ${PLATFORM_LINKFLAGS} nel3d nelmisc) NL_DEFAULT_PROPS(lightmap_optimizer "Tools, 3D: lightmap_optimizer") NL_ADD_RUNTIME_FLAGS(lightmap_optimizer) diff --git a/code/nel/tools/CMakeLists.txt b/code/nel/tools/CMakeLists.txt index 6385953c0..5cb92eca4 100644 --- a/code/nel/tools/CMakeLists.txt +++ b/code/nel/tools/CMakeLists.txt @@ -1,22 +1,27 @@ -SUBDIRS(misc) +SUBDIRS(misc memory) IF(WITH_3D) - SUBDIRS(3d) + ADD_SUBDIRECTORY(3d) ENDIF(WITH_3D) IF(WITH_PACS) - SUBDIRS(pacs) + ADD_SUBDIRECTORY(pacs) ENDIF(WITH_PACS) IF(WITH_LOGIC) - SUBDIRS(logic) + ADD_SUBDIRECTORY(logic) ENDIF(WITH_LOGIC) IF(WITH_GEORGES) - SUBDIRS(georges) + ADD_SUBDIRECTORY(georges) ENDIF(WITH_GEORGES) +IF(WITH_SOUND) + ADD_SUBDIRECTORY(sound) +ENDIF(WITH_SOUND) + IF(WITH_TESTS) ADD_SUBDIRECTORY(nel_unit_test) ENDIF(WITH_TESTS) +#build_gamedata diff --git a/code/nel/tools/logic/CMakeLists.txt b/code/nel/tools/logic/CMakeLists.txt index 4b920eb14..0ac435351 100644 --- a/code/nel/tools/logic/CMakeLists.txt +++ b/code/nel/tools/logic/CMakeLists.txt @@ -1,4 +1,3 @@ -IF(WIN32) - SUBDIRS( logic_editor_dll - logic_editor_exe) -ENDIF(WIN32) +IF(MFC_FOUND) + SUBDIRS(logic_editor_dll logic_editor_exe) +ENDIF(MFC_FOUND) diff --git a/code/nel/tools/memory/CMakeLists.txt b/code/nel/tools/memory/CMakeLists.txt new file mode 100644 index 000000000..e5ce29869 --- /dev/null +++ b/code/nel/tools/memory/CMakeLists.txt @@ -0,0 +1 @@ +SUBDIRS(memlog) diff --git a/code/nel/tools/memory/memlog/CMakeLists.txt b/code/nel/tools/memory/memlog/CMakeLists.txt new file mode 100644 index 000000000..7b9c1fc24 --- /dev/null +++ b/code/nel/tools/memory/memlog/CMakeLists.txt @@ -0,0 +1,9 @@ +FILE(GLOB SRC *.cpp *.h) + +ADD_EXECUTABLE(memlog ${SRC}) + +TARGET_LINK_LIBRARIES(memlog ${PLATFORM_LINKFLAGS} nelmisc) +NL_DEFAULT_PROPS(memlog "Tools, Memory: memlog") +NL_ADD_RUNTIME_FLAGS(memlog) + +INSTALL(TARGETS memlog RUNTIME DESTINATION bin COMPONENT toolsmisc) diff --git a/code/nel/tools/memory/memlog/StdAfx.cpp b/code/nel/tools/memory/memlog/StdAfx.cpp deleted file mode 100644 index 41dd9a36c..000000000 --- a/code/nel/tools/memory/memlog/StdAfx.cpp +++ /dev/null @@ -1,8 +0,0 @@ -// stdafx.cpp : source file that includes just the standard includes -// memlog.pch will be the pre-compiled header -// stdafx.obj will contain the pre-compiled type information - -#include "stdafx.h" - -// TODO: reference any additional headers you need in STDAFX.H -// and not in this file diff --git a/code/nel/tools/memory/memlog/StdAfx.h b/code/nel/tools/memory/memlog/StdAfx.h deleted file mode 100644 index dcf951b4e..000000000 --- a/code/nel/tools/memory/memlog/StdAfx.h +++ /dev/null @@ -1,19 +0,0 @@ -// stdafx.h : include file for standard system include files, -// or project specific include files that are used frequently, but -// are changed infrequently -// - -#if !defined(AFX_STDAFX_H__39F9814B_8C9D_4AA7_958F_111437B98069__INCLUDED_) -#define AFX_STDAFX_H__39F9814B_8C9D_4AA7_958F_111437B98069__INCLUDED_ - -#if _MSC_VER > 1000 -#pragma once -#endif // _MSC_VER > 1000 - - -// TODO: reference additional headers your program requires here - -//{{AFX_INSERT_LOCATION}} -// Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_STDAFX_H__39F9814B_8C9D_4AA7_958F_111437B98069__INCLUDED_) diff --git a/code/nel/tools/memory/memlog/memlog.cpp b/code/nel/tools/memory/memlog/memlog.cpp index dff34ad6d..53a843718 100644 --- a/code/nel/tools/memory/memlog/memlog.cpp +++ b/code/nel/tools/memory/memlog/memlog.cpp @@ -1,7 +1,20 @@ -// memlog.cpp : Defines the entry point for the console application. +// NeL - MMORPG Framework +// Copyright (C) 2010 Winch Gate Property Limited // +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . -#include "stdafx.h" +#include #include #include diff --git a/code/nel/tools/sound/CMakeLists.txt b/code/nel/tools/sound/CMakeLists.txt new file mode 100644 index 000000000..d3f5a12fa --- /dev/null +++ b/code/nel/tools/sound/CMakeLists.txt @@ -0,0 +1 @@ +