From 7a95148eef9c03f3ff9db5f5a5aeccdc7f2b7340 Mon Sep 17 00:00:00 2001 From: kervala Date: Thu, 16 Sep 2010 15:15:39 +0200 Subject: [PATCH] Fixed: shapes_exporter compilation --- code/nel/tools/3d/CMakeLists.txt | 1 + code/nel/tools/3d/shapes_exporter/CMakeLists.txt | 4 ++-- code/nel/tools/3d/shapes_exporter/main.cpp | 5 +++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/code/nel/tools/3d/CMakeLists.txt b/code/nel/tools/3d/CMakeLists.txt index 550293ad3..412ef130c 100644 --- a/code/nel/tools/3d/CMakeLists.txt +++ b/code/nel/tools/3d/CMakeLists.txt @@ -18,6 +18,7 @@ SUBDIRS( get_neighbors ig_add ig_info + shapes_exporter tga_cut tga_resize zone_check_bind diff --git a/code/nel/tools/3d/shapes_exporter/CMakeLists.txt b/code/nel/tools/3d/shapes_exporter/CMakeLists.txt index 26e3c9004..312c13e67 100644 --- a/code/nel/tools/3d/shapes_exporter/CMakeLists.txt +++ b/code/nel/tools/3d/shapes_exporter/CMakeLists.txt @@ -3,7 +3,7 @@ FILE(GLOB SRC *.cpp *.h) ADD_EXECUTABLE(shapes_exporter WIN32 ${SRC}) TARGET_LINK_LIBRARIES(shapes_exporter ${PLATFORM_LINKFLAGS} nelmisc nel3d) -NL_DEFAULT_PROPS(shapes_exporter "Tools, 3D: Shapes Exporter") +NL_DEFAULT_PROPS(shapes_exporter "NeL, Tools, 3D: Shapes Exporter") NL_ADD_RUNTIME_FLAGS(shapes_exporter) -INSTALL(TARGETS shapes_exporter RUNTIME DESTINATION ${NL_BIN_PREFIX} COMPONENT tools3d) +INSTALL(TARGETS shapes_exporter RUNTIME DESTINATION bin COMPONENT tools3d) diff --git a/code/nel/tools/3d/shapes_exporter/main.cpp b/code/nel/tools/3d/shapes_exporter/main.cpp index 6532d26d4..ec42049d6 100644 --- a/code/nel/tools/3d/shapes_exporter/main.cpp +++ b/code/nel/tools/3d/shapes_exporter/main.cpp @@ -19,6 +19,11 @@ #include #include "shapes_exporter.h" +#ifdef NL_OS_WINDOWS +# define NOMINMAX +# include +#endif // NL_OS_WINDOWS + using namespace NLMISC; using namespace NL3D;