From d9a74261ddd3658ad33400e115bbabab3f5bca84 Mon Sep 17 00:00:00 2001
From: kervala <kervala@localhost>
Date: Fri, 3 Sep 2010 22:18:31 +0200
Subject: [PATCH] Fixed: sheets_packer compilation

---
 code/ryzom/tools/sheets_packer/CMakeLists.txt    | 2 +-
 code/ryzom/tools/sheets_packer/sheets_packer.cpp | 6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/code/ryzom/tools/sheets_packer/CMakeLists.txt b/code/ryzom/tools/sheets_packer/CMakeLists.txt
index ec520d869..a89887d15 100644
--- a/code/ryzom/tools/sheets_packer/CMakeLists.txt
+++ b/code/ryzom/tools/sheets_packer/CMakeLists.txt
@@ -6,7 +6,7 @@ ADD_EXECUTABLE(sheets_packer	${SRC}
 				${CMAKE_SOURCE_DIR}/ryzom/client/src/sheet_manager.cpp
 				${CMAKE_SOURCE_DIR}/ryzom/client/src/sheet_manager.h)
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/client/src)
+INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/ryzom/client/src)
 TARGET_LINK_LIBRARIES(sheets_packer	
 					ryzom_clientsheets
 					ryzom_gameshare
diff --git a/code/ryzom/tools/sheets_packer/sheets_packer.cpp b/code/ryzom/tools/sheets_packer/sheets_packer.cpp
index 83fc43173..abb0530ad 100644
--- a/code/ryzom/tools/sheets_packer/sheets_packer.cpp
+++ b/code/ryzom/tools/sheets_packer/sheets_packer.cpp
@@ -58,11 +58,7 @@ static uint32 Version = 1;	// Client Version.
 // MAIN :
 // Entry for the Apllication.
 //---------------------------------------------------
-#if defined(_WINDOWS)
-int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR cmdline, int nCmdShow)
-#else
 int main(int argc, char **argv)
-#endif
 {
 	/////////////////////////////////
 	// Initialize the application. //
@@ -113,4 +109,4 @@ int main(int argc, char **argv)
 
 	// EXIT of the Application.
 	return EXIT_SUCCESS;
-}// main/WinMain //
+}// main //