# VC2005, GCC compatibility

Used new library include paths.
Renamed ia32.asm to ia32_asm.asm, so we don't need Premake modifications
to avoid object-file conflicts with ia32.cpp.

This was SVN commit r3784.

source/i18n/ScriptInterface.h

@@ -18,7 +18,7 @@ and 'variables' (dependent on the type passed with "translate(...) <<").
 ERROR_SUBGROUP(I18n, Script);
 ERROR_TYPE(I18n_Script, SetupFailed);
 
-#ifdef XP_WIN // the Windows JS libraries are using '_W64 long' to avoid MSVC warnings
+#ifdef OS_WIN // the Windows JS libraries are using '_W64 long' to avoid MSVC warnings
 typedef _W64 long jsval;
 #else
 typedef long jsval;

source/lib/res/graphics/tex_png.cpp

@@ -29,7 +29,7 @@
 # define WINAPI __stdcall
 # define WINAPIV __cdecl
 #endif	// OS_WIN
-#include "libpng13/png.h"
+#include "png.h"
 
 #include "lib/byte_order.h"
 #include "lib/res/res.h"

source/lib/res/sound/snd_mgr.cpp

@@ -68,7 +68,9 @@
 // that looks unnecessary and wastes 100..400 ms on startup.
 // we hold a reference to prevent the actual unload. everything works ATM;
 // hopefully, OpenAL doesn't rely on them actually being unloaded.
-#define WIN_LOADLIBRARY_HACK 1
+#if OS_WIN
+# define WIN_LOADLIBRARY_HACK 1
+#endif
 
 
 // components:

source/lib/sysdep/ia32_asm.asm

@@ -1,5 +1,5 @@
 ; =========================================================================
-; File        : ia32.asm
+; File        : ia32_asm.asm
 ; Project     : 0 A.D.
 ; Description : optimized assembly code for IA-32. not provided as
 ;             : inline assembly because that's compiler-specific.

source/lib/sysdep/unix/dir_watch_fam.cpp

@@ -49,7 +49,8 @@ LibError dir_cancel_watch(const intptr_t watch)
 
 	FAMRequest req;
 	req.reqnum = (int)watch;
-	return FAMCancelMonitor(&fc, &req);
+	RETURN_ERR(FAMCancelMonitor(&fc, &req));
+	return ERR_OK;
 }
 
 int dir_get_changed_file(char* fn)

source/lib/sysdep/unix/x.cpp

@@ -25,7 +25,7 @@
 
 #include "lib.h"
 #include "debug.h"
-#include "detect.h"
+#include "sysdep/gfx.h"
 
 #include <algorithm>
 

source/ps/Vector2D.h

@@ -28,6 +28,10 @@ public:
 	{
 		return( CVector3D( x, 0, y ) );
 	}
+	inline bool operator==( const CVector2D& rhs ) const
+	{
+		return( x == rhs.x && y == rhs.y );
+	}
 	static inline float dot( const CVector2D& u, const CVector2D& v )
 	{
 		return( u.x * v.x + u.y * v.y );

source/scripting/SpiderMonkey.h

@@ -23,10 +23,10 @@
 # define XP_UNIX
 #endif
 
-#include <jsapi.h>
-#include <jsatom.h>
+#include <js/jsapi.h>
+#include <js/jsatom.h>
 #ifndef NDEBUG
-# include <jsdbgapi.h>
+# include <js/jsdbgapi.h>
 #endif
 
 // include any further required headers here