Merge pull request #165 from Arkshine/feature/add-version-lib-and-missing-rc

Update versioning system and add missing module RC file (bug 6222)

compiler/amxxpc/amx.cpp

@@ -41,7 +41,7 @@
 #include <string.h>
 #include "osdefs.h"
 #if defined LINUX || defined __FreeBSD__ || defined __OpenBSD__ || defined __APPLE__
-  #include <sclinux.h>
+  #include "sclinux.h"
   #if !defined AMX_NODYNALOAD
     #include <dlfcn.h>
   #endif

compiler/amxxpc/amx.h

@@ -23,7 +23,7 @@
   #define __FreeBSD__
 #endif
 #if defined LINUX || defined __FreeBSD__ || defined __OpenBSD__ || defined __APPLE__
-  #include <sclinux.h>
+  #include "sclinux.h"
 #endif
 
 #ifndef AMX_H_INCLUDED

compiler/amxxpc/amxxpc.cpp

@@ -82,7 +82,7 @@ int main(int argc, char **argv)
 		exit(0);
 	}
 
-	pc_printf("AMX Mod X Compiler %s\n", SVN_VERSION);
+	pc_printf("AMX Mod X Compiler %s\n", AMXX_VERSION);
 	pc_printf("Copyright (c) 1997-2006 ITB CompuPhase\n");
         pc_printf("Copyright (c) 2004-2013 AMX Mod X Team\n\n");
 	

compiler/amxxpc/amxxpc.h

@@ -10,9 +10,7 @@
 #ifndef _AMXXSC_INCLUDE_H
 #define _AMXXSC_INCLUDE_H
 
-#ifndef SVN_VERSION
 #include <amxmodx_version.h>
-#endif
 
 #define MAGIC_HEADER2		0x414D5858
 #define	MAGIC_VERSION		0x0300

compiler/amxxpc/amxxpc1.rc

@@ -1,13 +1,12 @@
 // Microsoft Visual C++ generated resource script.
 //
-#include "resource1.h"
-
 #define APSTUDIO_READONLY_SYMBOLS
 /////////////////////////////////////////////////////////////////////////////
 //
 // Generated from the TEXTINCLUDE 2 resource.
 //
-#include "windows.h"
+#include <winresrc.h>
+#include <amxmodx_version.h>
 
 /////////////////////////////////////////////////////////////////////////////
 #undef APSTUDIO_READONLY_SYMBOLS
@@ -21,6 +20,44 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 #pragma code_page(1252)
 #endif //_WIN32
 
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION AMXX_VERSION_FILE
+ PRODUCTVERSION AMXX_VERSION_FILE
+ FILEFLAGSMASK 0x17L
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x4L
+ FILETYPE 0x2L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "000004b0"
+        BEGIN
+            VALUE "Comments", "AMXXPC"
+            VALUE "FileDescription", "AMXXPC"
+            VALUE "FileVersion", AMXX_VERSION
+            VALUE "InternalName", "amxxpc"
+            VALUE "LegalCopyright", "Copyright (c) AMX Mod X Dev Team"
+            VALUE "OriginalFilename", "amxxpc.exe"
+            VALUE "ProductName", "AMXXPC"
+            VALUE "ProductVersion", AMXX_VERSION
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x0, 1200
+    END
+END
+
 #ifdef APSTUDIO_INVOKED
 /////////////////////////////////////////////////////////////////////////////
 //

compiler/libpc300/amx.h

@@ -32,7 +32,7 @@
   #define __FreeBSD__
 #endif
 #if defined LINUX || defined __FreeBSD__ || defined __OpenBSD__ || defined __APPLE__
-  #include <sclinux.h>
+  #include "sclinux.h"
 #endif
 
 #ifndef AMX_H_INCLUDED