From 145651ed5467b01c93daa5d145a4da85e4670538 Mon Sep 17 00:00:00 2001 From: Sit Melai Date: Sun, 22 Jan 2017 00:18:47 +0100 Subject: [PATCH] =?UTF-8?q?Ajouter=20quelques=20r=C3=A9pertoire=20build=20?= =?UTF-8?q?=C3=A0=20.gitignore=20et=20d'autres=20petits=20ajouts/tests.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 9 ++------- code/nel/include/nel/3d/animated_material.h | 2 +- code/studio/CMakeLists.txt | 6 +++--- 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index eda61148c..b6076973f 100644 --- a/.gitignore +++ b/.gitignore @@ -162,13 +162,8 @@ build/* install/* build_vc* code/nel/tools/build_gamedata/configuration/buildsite.py -code/build_mac -code/build_linux32 -code/build_linux64 -code/build_windows32 -code/build_windows64 -code/build_server -code/build_nel_tools +code/build* + # Linux nel compile code/nel/build/nel-config diff --git a/code/nel/include/nel/3d/animated_material.h b/code/nel/include/nel/3d/animated_material.h index eeee2501c..2513d36d6 100644 --- a/code/nel/include/nel/3d/animated_material.h +++ b/code/nel/include/nel/3d/animated_material.h @@ -75,7 +75,7 @@ public: CTrackDefaultFloat DefaultUTrans; // u translation CTrackDefaultFloat DefaultVTrans; // v translation CTrackDefaultFloat DefaultUScale; // u scale - CTrackDefaultFloat DefaultVScale; // u scale + CTrackDefaultFloat DefaultVScale; // v scale CTrackDefaultFloat DefaultWRot; // v scale diff --git a/code/studio/CMakeLists.txt b/code/studio/CMakeLists.txt index b4f1a903f..ea28c8170 100644 --- a/code/studio/CMakeLists.txt +++ b/code/studio/CMakeLists.txt @@ -29,9 +29,9 @@ ELSE() ADD_DEFINITIONS(-DHAVE_OVQT_CONFIG_H) ENDIF() -IF(UNIX AND WITH_STATIC) - MESSAGE(FATAL_ERROR "Studio does not work with static NeL builds on Unix atm.") -ENDIF() +#IF(UNIX AND WITH_STATIC) +# MESSAGE(FATAL_ERROR "Studio does not work with static NeL builds on Unix atm.") +#ENDIF() ADD_SUBDIRECTORY(src)