From 220a3458c2f2f890c8be9313a72fabe03f548dc1 Mon Sep 17 00:00:00 2001
From: kervala <none@none>
Date: Thu, 1 Jul 2010 15:51:27 +0200
Subject: [PATCH] Changed: USE_JPEG is only used when building NLMISC now

---
 code/nel/samples/3d/cegui/globals.h                   | 2 --
 code/nel/samples/3d/cegui/main.cpp                    | 4 ----
 code/nel/src/3d/zone_lighter.cpp                      | 9 ---------
 code/nel/src/cegui/neltexture.cpp                     | 1 -
 code/nel/tools/3d/object_viewer/snapshot_tool_dlg.cpp | 2 --
 code/nel/tools/3d/object_viewer/std_afx.h             | 2 --
 code/ryzom/client/src/bug_report/bug_reportDlg.cpp    | 2 --
 code/ryzom/client/src/stdpch.h                        | 2 --
 8 files changed, 24 deletions(-)

diff --git a/code/nel/samples/3d/cegui/globals.h b/code/nel/samples/3d/cegui/globals.h
index 6c00950bc..e56434d3a 100644
--- a/code/nel/samples/3d/cegui/globals.h
+++ b/code/nel/samples/3d/cegui/globals.h
@@ -23,8 +23,6 @@
 
 // global includes
 
-//#define USE_JPEG
-
 #include <nel/misc/types_nl.h>
 
 #include <math.h>
diff --git a/code/nel/samples/3d/cegui/main.cpp b/code/nel/samples/3d/cegui/main.cpp
index 81658bfb9..cda9f121e 100644
--- a/code/nel/samples/3d/cegui/main.cpp
+++ b/code/nel/samples/3d/cegui/main.cpp
@@ -21,10 +21,6 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifdef NL_OS_WINDOWS
-#define USE_JPEG
-#endif
-
 #include "globals.h"
 #include "resource.h"
 
diff --git a/code/nel/src/3d/zone_lighter.cpp b/code/nel/src/3d/zone_lighter.cpp
index 802f83847..57cba49a8 100644
--- a/code/nel/src/3d/zone_lighter.cpp
+++ b/code/nel/src/3d/zone_lighter.cpp
@@ -16,11 +16,6 @@
 
 #include "std3d.h"
 
-// FIXME: shouldn't this be configured outside?
-#ifndef USE_JPEG
-#define USE_JPEG
-#endif
-
 #include "nel/3d/zone_lighter.h"
 #include "nel/3d/landscape.h"
 #include "nel/3d/patchuv_locator.h"
@@ -32,10 +27,6 @@
 #include "nel/3d/water_shape.h"
 #include "nel/3d/texture_file.h"
 
-
-
-
-
 #include "nel/misc/common.h"
 #include "nel/misc/thread.h"
 #include "nel/misc/path.h"
diff --git a/code/nel/src/cegui/neltexture.cpp b/code/nel/src/cegui/neltexture.cpp
index 1f7648472..75a43d4fb 100644
--- a/code/nel/src/cegui/neltexture.cpp
+++ b/code/nel/src/cegui/neltexture.cpp
@@ -31,7 +31,6 @@
 
 	This file contains code that is specific to NeL (http://www.nevrax.org)
 *************************************************************************/
-#define USE_JPEG
 
 // NeL Renderer includes
 #include <nel/cegui/neltexture.h>
diff --git a/code/nel/tools/3d/object_viewer/snapshot_tool_dlg.cpp b/code/nel/tools/3d/object_viewer/snapshot_tool_dlg.cpp
index a8022b945..8d4612da1 100644
--- a/code/nel/tools/3d/object_viewer/snapshot_tool_dlg.cpp
+++ b/code/nel/tools/3d/object_viewer/snapshot_tool_dlg.cpp
@@ -14,8 +14,6 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#define USE_JPEG
-
 #include "std_afx.h"
 
 #include "object_viewer.h"
diff --git a/code/nel/tools/3d/object_viewer/std_afx.h b/code/nel/tools/3d/object_viewer/std_afx.h
index 050b3b58e..9e5931022 100644
--- a/code/nel/tools/3d/object_viewer/std_afx.h
+++ b/code/nel/tools/3d/object_viewer/std_afx.h
@@ -53,8 +53,6 @@
 #include <map>
 #include <algorithm>
 
-#define USE_JPEG
-
 #include "nel/misc/common.h"
 #include "nel/misc/stream.h"
 #include "nel/misc/vector.h"
diff --git a/code/ryzom/client/src/bug_report/bug_reportDlg.cpp b/code/ryzom/client/src/bug_report/bug_reportDlg.cpp
index 6d49f1b24..fadd4172c 100644
--- a/code/ryzom/client/src/bug_report/bug_reportDlg.cpp
+++ b/code/ryzom/client/src/bug_report/bug_reportDlg.cpp
@@ -28,8 +28,6 @@
 #undef min
 #undef max
 
-#define USE_JPEG
-
 #include "nel/misc/system_info.h"
 #include "nel/misc/debug.h"
 #include "nel/misc/config_file.h"
diff --git a/code/ryzom/client/src/stdpch.h b/code/ryzom/client/src/stdpch.h
index 9e17cea2c..2af740efb 100644
--- a/code/ryzom/client/src/stdpch.h
+++ b/code/ryzom/client/src/stdpch.h
@@ -33,8 +33,6 @@
 #include <deque>
 #include <fstream>
 
-#define USE_JPEG
-
 #include <nel/misc/common.h>
 #include <nel/misc/debug.h>