From cfe8f1870fe7599f5e099d24db8883322adbb833 Mon Sep 17 00:00:00 2001
From: kervala <none@none>
Date: Thu, 26 Aug 2010 09:56:30 +0200
Subject: [PATCH] Changed: #1074 sheets_packer using default static relative
 paths

---
 code/ryzom/tools/sheets_packer/sheets_packer_cfg.cpp | 3 ---
 code/ryzom/tools/sheets_packer/stdpch.h              | 4 +---
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/code/ryzom/tools/sheets_packer/sheets_packer_cfg.cpp b/code/ryzom/tools/sheets_packer/sheets_packer_cfg.cpp
index 92d87592f..340753f4a 100644
--- a/code/ryzom/tools/sheets_packer/sheets_packer_cfg.cpp
+++ b/code/ryzom/tools/sheets_packer/sheets_packer_cfg.cpp
@@ -148,9 +148,6 @@ const std::string ConfigFileName = "sheets_packer.cfg";
 CClientConfig::CClientConfig()
 {
 	SaveConfig			= false;
-	DataPath.push_back("../../client/data/");					// Default Path for the Data.
-	DataPath.push_back("../../common/data_leveldesign/");		// Default Path for the Level Design Directory.
-	DataPath.push_back("../../common/data_common/");				// Default Path for the Level Design Directory.
 	UpdatePackedSheet	= true;						// Update packed sheet if needed
 	SceneName			= "";
 	IdFilePath			= "";
diff --git a/code/ryzom/tools/sheets_packer/stdpch.h b/code/ryzom/tools/sheets_packer/stdpch.h
index 81db6e40c..d0135ae17 100644
--- a/code/ryzom/tools/sheets_packer/stdpch.h
+++ b/code/ryzom/tools/sheets_packer/stdpch.h
@@ -1,4 +1,3 @@
-
 #include <nel/misc/types_nl.h>
 
 #include <stdlib.h>
@@ -35,7 +34,6 @@
 //#include <nel/3d/u_driver.h>
 
 #ifdef NL_OS_WINDOWS
+#define NOMINMAX
 #include	<windows.h>
-#undef min
-#undef max
 #endif // NL_OS_WINDOWS