Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Fix Windows compilation of lightmap_optimizer

Browse source
This commit is contained in:
kaetemi 2014-05-23 01:57:19 +02:00
parent f5dac14fd1
commit 0a41e6b3c4
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
code/nel/tools/3d/lightmap_optimizer/main.cpp
View file

@ -33,12 +33,13 @@
#include "nel/3d/register_3d.h" #include "nel/3d/register_3d.h"
#ifdef NL_OS_WINDOWS #ifdef NL_OS_WINDOWS
#include <windows.h> # include <windows.h>
#else #else
#include <dirent.h> /* for directories functions */ # define strnicmp NLMISC::strnicmp
#include <sys/types.h> # include <dirent.h> /* for directories functions */
#include <sys/stat.h> # include <sys/types.h>
#include <unistd.h> /* getcwd, chdir -- replacement for getCurDiretory & setCurDirectory on windows */ # include <sys/stat.h>
# include <unistd.h> /* getcwd, chdir -- replacement for getCurDiretory & setCurDirectory on windows */
#endif #endif
@ -72,7 +73,8 @@ void dir (const std::string &sFilter, std::vector<std::string> &sAllFiles, bool
char sCurDir[MAX_PATH]; char sCurDir[MAX_PATH];
sAllFiles.clear (); sAllFiles.clear ();
GetCurrentDirectory (MAX_PATH, sCurDir); GetCurrentDirectory (MAX_PATH, sCurDir);
hFind = FindFirstFile ("*"+sFilter.c_str(), &findData); std::string sFilterAsx = std::string("*") + sFilter;
hFind = FindFirstFile (sFilterAsx.c_str(), &findData);
while (hFind != INVALID_HANDLE_VALUE) while (hFind != INVALID_HANDLE_VALUE)
{ {
DWORD res = GetFileAttributes(findData.cFileName); DWORD res = GetFileAttributes(findData.cFileName);
@ -626,7 +628,7 @@ int main(int nNbArg, char **ppArgs)
outString(string("ERROR: lightmaps ")+sTmp2+"*.tga not all the same size\n"); outString(string("ERROR: lightmaps ")+sTmp2+"*.tga not all the same size\n");
for (k = 0; k < (sint32)AllLightmapNames.size(); ++k) for (k = 0; k < (sint32)AllLightmapNames.size(); ++k)
{ {
if (NLMISC::strnicmp(AllLightmapNames[k].c_str(), sTmp2.c_str(), sTmp2.size()) == 0) if (strnicmp(AllLightmapNames[k].c_str(), sTmp2.c_str(), sTmp2.size()) == 0)
{ {
for (j = k+1; j < (sint32)AllLightmapNames.size(); ++j) for (j = k+1; j < (sint32)AllLightmapNames.size(); ++j)
{ {