aleajactaest/khanat-code-old
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-code-old.git synced 2024-09-20 03:30:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Ajouter quelques répertoire build à .gitignore et d'autres petits ajouts/tests.

Browse source
This commit is contained in:
Sit Melai 2017-01-22 00:18:47 +01:00
parent 2a394c4cd5
commit 145651ed54
3 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
.gitignore vendored
View file

@ -162,13 +162,8 @@ build/*
install/* install/*
build_vc* build_vc*
code/nel/tools/build_gamedata/configuration/buildsite.py code/nel/tools/build_gamedata/configuration/buildsite.py
code/build_mac code/build*
code/build_linux32
code/build_linux64
code/build_windows32
code/build_windows64
code/build_server
code/build_nel_tools
# Linux nel compile # Linux nel compile
code/nel/build/nel-config code/nel/build/nel-config

2
code/nel/include/nel/3d/animated_material.h
View file

@ -75,7 +75,7 @@ public:
CTrackDefaultFloat DefaultUTrans; // u translation CTrackDefaultFloat DefaultUTrans; // u translation
CTrackDefaultFloat DefaultVTrans; // v translation CTrackDefaultFloat DefaultVTrans; // v translation
CTrackDefaultFloat DefaultUScale; // u scale CTrackDefaultFloat DefaultUScale; // u scale
CTrackDefaultFloat DefaultVScale; // u scale CTrackDefaultFloat DefaultVScale; // v scale
CTrackDefaultFloat DefaultWRot; // v scale CTrackDefaultFloat DefaultWRot; // v scale

6
code/studio/CMakeLists.txt
View file

@ -29,9 +29,9 @@ ELSE()
ADD_DEFINITIONS(-DHAVE_OVQT_CONFIG_H) ADD_DEFINITIONS(-DHAVE_OVQT_CONFIG_H)
ENDIF() ENDIF()
IF(UNIX AND WITH_STATIC) #IF(UNIX AND WITH_STATIC)
MESSAGE(FATAL_ERROR "Studio does not work with static NeL builds on Unix atm.") # MESSAGE(FATAL_ERROR "Studio does not work with static NeL builds on Unix atm.")
ENDIF() #ENDIF()
ADD_SUBDIRECTORY(src) ADD_SUBDIRECTORY(src)