9 files changed, 26 insertions, 160 deletions
diff --git a/plugins/FreeImage/Dist b/plugins/FreeImage/Docs/Dist
index fafca0060e..fafca0060e 100644
--- a/plugins/FreeImage/Dist
+++ b/plugins/FreeImage/Docs/Dist
diff --git a/plugins/FreeImage/license-fi.txt b/plugins/FreeImage/Docs/license-fi.txt
index 03b666c58a..03b666c58a 100644
--- a/plugins/FreeImage/license-fi.txt
+++ b/plugins/FreeImage/Docs/license-fi.txt
diff --git a/plugins/FreeImage/license-gpl.txt b/plugins/FreeImage/Docs/license-gpl.txt
index 7d1f8605f8..7d1f8605f8 100644
--- a/plugins/FreeImage/license-gpl.txt
+++ b/plugins/FreeImage/Docs/license-gpl.txt
diff --git a/plugins/FreeImage/Makefile.solaris b/plugins/FreeImage/Makefile.solaris
deleted file mode 100644
index a17c68eb30..0000000000
--- a/plugins/FreeImage/Makefile.solaris
+++ /dev/null
@@ -1,65 +0,0 @@
-# Solaris9 makefile for FreeImage. Tested on Solaris9 with tools from
-# Sunfreeware.com.
-
-# This file can be generated by ./gensrclist.sh
-include Makefile.srcs
-
-# General configuration variables:
-CC = gcc
-CPP = g++
-AR = ar
-
-INSTALLDIR = /usr/local
-
-# Converts cr/lf to just lf
-DOS2UNIX = dos2unix
-
-COMPILERFLAGS = -O3
-LIBRARIES = -lstdc++
-
-MODULES = $(SRCS:.c=.o)
-MODULES := $(MODULES:.cpp=.o)
-CFLAGS = $(COMPILERFLAGS) $(INCLUDE)
-CPPFLAGS = $(COMPILERFLAGS)  -Wno-ctor-dtor-privacy $(INCLUDE)
-
-TARGET  = freeimage
-STATICLIB = lib$(TARGET).a
-SHAREDLIB = lib$(TARGET)-$(VER_MAJOR).$(VER_MINOR).so
-LIBNAME = lib$(TARGET).so.$(VER_MAJOR)
-
-
-
-default: all
-
-all: dist
-
-dist: FreeImage
-	cp *.a Dist
-	cp *.so Dist
-	cp Source/FreeImage.h Dist
-
-dos2unix:
-	@$(DOS2UNIX) $(SRCS) $(INCLS)
-
-FreeImage: $(STATICLIB) $(SHAREDLIB)
-
-.c.o:
-	$(CC) $(CFLAGS) -c $< -o $@
-
-.cpp.o:
-	$(CPP) $(CPPFLAGS) -c $< -o $@
-
-$(STATICLIB): $(MODULES)
-	$(AR) r $@ $(MODULES)
-
-$(SHAREDLIB): $(MODULES)
-	$(CC) -s -G -Wl,-soname=$(LIBNAME) -o $@ $(MODULES) $(LIBRARIES)
-
-install:
-	install -m 644 -o root -g root Source/FreeImage.h $(INSTALLDIR)/include
-	install -m 644 -o root -g root $(STATICLIB) $(INSTALLDIR)/lib
-	install -m 755 -o root -g root $(SHAREDLIB) $(INSTALLDIR)/lib
-	ln -sf $(SHAREDLIB) $(INSTALLDIR)/lib/$(LIBNAME)
-
-clean:
-	rm -rf core Dist/*.* u2dtmp* $(MODULES) $(STATICLIB) $(SHAREDLIB) $(LIBNAME)
diff --git a/plugins/FreeImage/Miranda/main.cpp b/plugins/FreeImage/Miranda/main.cpp
index 7cfad31ce8..32b5e7a0e6 100644
--- a/plugins/FreeImage/Miranda/main.cpp
+++ b/plugins/FreeImage/Miranda/main.cpp
@@ -49,22 +49,17 @@ PLUGINLINK *pluginLink = NULL;
 
 static const PLUGININFOEX pluginInfoEx = {
 	sizeof(PLUGININFOEX),
-	"Miranda Image services",
+	__PLUGIN_NAME,
 	__VERSION_DWORD,
-	"Generic image services for Miranda IM.",
-	"Nightwish, The FreeImage project (http://freeimage.sourceforge.net/)",
-	"",
-	"Copyright 2000-2012 Miranda-IM project, uses the FreeImage distribution",
-	"http://www.miranda-im.org",
+	__DESCRIPTION,
+	__AUTHOR,
+	__AUTHOREMAIL,
+	__COPYRIGHT,
+	__AUTHORWEB,
 	UNICODE_AWARE,
 	0,
-	#if defined(_UNICODE)
-		// {7C070F7C-459E-46b7-8E6D-BC6EFAA22F78}
-		{ 0x7c070f7c, 0x459e, 0x46b7, { 0x8e, 0x6d, 0xbc, 0x6e, 0xfa, 0xa2, 0x2f, 0x78 } }
-	#else
-		// {287F31D5-147C-48bb-B428-D7C260272535}
-		{ 0x287f31d5, 0x147c, 0x48bb, { 0xb4, 0x28, 0xd7, 0xc2, 0x60, 0x27, 0x25, 0x35 } }
-	#endif
+	// {7C070F7C-459E-46b7-8E6D-BC6EFAA22F78}
+	{ 0x7c070f7c, 0x459e, 0x46b7, { 0x8e, 0x6d, 0xbc, 0x6e, 0xfa, 0xa2, 0x2f, 0x78 } }
 };
 
 /*
diff --git a/plugins/FreeImage/Miranda/version.h b/plugins/FreeImage/Miranda/version.h
index 38dd9a43cd..5504fc0c44 100644
--- a/plugins/FreeImage/Miranda/version.h
+++ b/plugins/FreeImage/Miranda/version.h
@@ -3,3 +3,11 @@
 #define __FILEVERSION_STRING        MIRANDA_VERSION_FILEVERSION
 #define __VERSION_STRING            MIRANDA_VERSION_STRING
 #define __VERSION_DWORD             MIRANDA_VERSION_DWORD
+#define __PLUGIN_NAME				"AdvaImg"
+#define __INTERNAL_NAME				"AdvaImg"
+#define __FILENAME					"AdvaImg.dll"
+#define __DESCRIPTION 				"Generic image services for Miranda IM."
+#define __AUTHOR					"Nightwish, The FreeImage project (http://freeimage.sourceforge.net/)"
+#define __AUTHOREMAIL				""
+#define __AUTHORWEB					"http://www.miranda-im.org"
+#define __COPYRIGHT					"� 2000-2012 Miranda-IM project, uses the FreeImage distribution"
diff --git a/plugins/FreeImage/README.solaris b/plugins/FreeImage/README.solaris
deleted file mode 100644
index bf6431c219..0000000000
--- a/plugins/FreeImage/README.solaris
+++ /dev/null
@@ -1,67 +0,0 @@
-Release Notes
---------------
-Hey folks, 
-
-I just went through the process of building and using the freeimage library
-on Solaris 9.  Things don't work out of the box so I thought I would share my
-experiences in case someone else wants to do the same.
-
-I'm using Solaris 9, and I have installed all the development libraries, make,
-and the gcc 3.3.2 found on sunfreeware.com.
-
-You have to use the make from sunfreeware because the Solaris 9 make program
-chokes hard on FreeImages makefiles.
-
-First thing I had to do was modify the main FreeImage makefile:
-
-1. go to the $(SHAREDLIB): line and replace the $(CC) line with the following.
-(there are 2 corrections)
-
-$(CC) -s -G -Wl,-soname=$(LIBNAME) -o $@ $(MODULES) $(LIBRARIES)
-
-The two changes are -G instead of -shared, and the = sign instead of a comma
-after the -soname.
-
-2. change INSTALLDIR = /usr/lib to INSTALLDIR = /usr/local/lib
-
-This is because the sunfreeware tools assume the libs being built will reside
-in /usr/local/lib and thus set the default linker search paths to that.  Another
-solution for this would be to use the -R and -L linker options, but I chose
-the easy way :)
-
-That's it!  You can now use freeimage.   
-
-Also, if you have an autoconf/automake project that links against FreeImage,
-you can use the following in your configure.in, it works rather well for me:
-
-AC_CHECK_LIB(freeimage-3.5.0, FreeImage_Initialise, [],
-                                 [AC_MSG_ERROR([libfreeimage-3.5.0.so required and missing. See
-http://freeimage.sourceforge.net.]) ])
-
-the AC_CHECK_LIB macro will not only find the library, it will automatically
-link against it as well so you dont have to add it to your Makefile.am.
-
-I hope this helps someone!
-
----
-ogtharox at users.sourceforge.net
-
-
-Installation
-------------
-Note: You will need to have root privileges in order to install the library in the /usr/local/lib directory.
-The installation process is as simple as this : 
-1) Enter the FreeImage directory
-2) Build the distribution : 
-make -f Makefile.solaris
-make -f Makefile.solaris install
-3) Clean all files produced during the build process
-make -f Makefile.solaris clean
-
-Release Notes for Solaris/Sparc
---------------------------------
-Under Solaris/Sparc, you will need to modify the following line : 
-COMPILERFLAGS = -O3
-modified into
-COMPILERFLAGS = -O3 -DBYTE_ORDER=BIG_ENDIAN -D__BIG_ENDIAN__
-
diff --git a/plugins/FreeImage/Todo.txt b/plugins/FreeImage/Todo.txt
deleted file mode 100644
index e69de29bb2..0000000000
--- a/plugins/FreeImage/Todo.txt
+++ /dev/null
diff --git a/plugins/FreeImage/version.rc b/plugins/FreeImage/version.rc
index 2edf19d791..fc98ccc25a 100644
--- a/plugins/FreeImage/version.rc
+++ b/plugins/FreeImage/version.rc
@@ -1,7 +1,7 @@
 // Microsoft Visual C++ generated resource script.
 //
 #include "Miranda\version.h"
-#include "winres.h"
+#include "afxres.h"
 
 #define APSTUDIO_READONLY_SYMBOLS
 /////////////////////////////////////////////////////////////////////////////
@@ -66,30 +66,25 @@ LANGUAGE LANG_GERMAN, SUBLANG_GERMAN_AUSTRIAN
 VS_VERSION_INFO VERSIONINFO
  FILEVERSION __FILEVERSION_STRING
  PRODUCTVERSION __FILEVERSION_STRING
- FILEFLAGSMASK 0x37L
+ FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
- FILEFLAGS 0x21L
+ FILEFLAGS 0x1L
 #else
- FILEFLAGS 0x20L
+ FILEFLAGS 0x0L
 #endif
  FILEOS 0x4L
- FILETYPE 0x2L
+ FILETYPE 0x0L
  FILESUBTYPE 0x0L
 BEGIN
     BLOCK "StringFileInfo"
     BEGIN
         BLOCK "000004b0"
         BEGIN
-            VALUE "Comments", "Provides generic image services for Miranda IM"
-            VALUE "CompanyName", "Miranda IM and FreeImage"
-            VALUE "FileDescription", "Provides generic image services for Miranda IM"
-            VALUE "FileVersion", __FILEVERSION_STRING
-            VALUE "InternalName", "fe_imgsrvc"
-            VALUE "LegalCopyright", "Copyright (C) 2012, Nightwish, based on the FreeImage project (http://freeimage.sourceforge.net/)"
-            VALUE "LegalTrademarks", "Licensed under the Gnu General Public License V2 or any later version"
-            VALUE "OriginalFilename", "advaimg.dll"
-            VALUE "ProductName", "Miranda IM Image services"
-            VALUE "ProductVersion", __FILEVERSION_STRING
+            VALUE "FileDescription", __DESCRIPTION
+            VALUE "InternalName", __PLUGIN_NAME
+            VALUE "LegalCopyright", __COPYRIGHT
+            VALUE "OriginalFilename", __FILENAME
+            VALUE "ProductName", __PLUGIN_NAME
         END
     END
     BLOCK "VarFileInfo"