[commit] r2393 - trunk/GME/Gme

[GMESRC Repository Notifications]

Author: volgy
Date: Fri Oct 25 12:49:44 2013
New Revision: 2393

Log:
Quick workaround for x64 builds (SVN integration is not supported)

Modified:
   trunk/GME/Gme/GME.vcxproj
   trunk/GME/Gme/SVNClient.cpp
   trunk/GME/Gme/SVNClient.h

Modified: trunk/GME/Gme/GME.vcxproj
==============================================================================
--- trunk/GME/Gme/GME.vcxproj	Thu Oct 24 15:37:08 2013	(r2392)
+++ trunk/GME/Gme/GME.vcxproj	Fri Oct 25 12:49:44 2013	(r2393)
@@ -160,7 +160,7 @@
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <AdditionalIncludeDirectories>../Common;../Interfaces;../Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../Common;../Interfaces;../Include;../Include/subversion;../Include/apr;../Include/apr-util;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -176,7 +176,7 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>gdiplus.lib;xerces-c_3.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\lib\$(Platform);..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\lib;..\lib\subv_$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -244,7 +244,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../Common;../Interfaces;../Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../Common;../Interfaces;../Include;../Include/subversion;../Include/apr;../Include/apr-util;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -259,7 +259,7 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>gdiplus.lib;xerces-c_3.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\lib\$(Platform);..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\lib;..\lib\subv_$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>

Modified: trunk/GME/Gme/SVNClient.cpp
==============================================================================
--- trunk/GME/Gme/SVNClient.cpp	Thu Oct 24 15:37:08 2013	(r2392)
+++ trunk/GME/Gme/SVNClient.cpp	Fri Oct 25 12:49:44 2013	(r2393)
@@ -1,5 +1,7 @@
 #include "StdAfx.h"
 
+#ifndef _WIN64
+
 #include "SVNClient.h"
 #include "svn_dso.h"
 #include "svn_utf.h"
@@ -665,4 +667,6 @@
 	}
 
 	return SVN_NO_ERROR;
-}
\ No newline at end of file
+}
+
+#endif // #ifndef _WIN64

Modified: trunk/GME/Gme/SVNClient.h
==============================================================================
--- trunk/GME/Gme/SVNClient.h	Thu Oct 24 15:37:08 2013	(r2392)
+++ trunk/GME/Gme/SVNClient.h	Fri Oct 25 12:49:44 2013	(r2393)
@@ -1,5 +1,7 @@
 #pragma once
 
+#ifndef _WIN64
+
 #include "svn_client.h"
 #include "svn_config.h"
 #include "svn_pools.h"
@@ -117,3 +119,43 @@
 	svn_wc_notify_action_t lastNotifyAction;
 };
 
+#else // #ifndef _WIN64
+// Dummy implementation for x64
+
+class CSVNClient;
+
+class CSVNFile
+{
+	friend class CSVNClient;
+
+private:
+	CSVNFile() {}
+
+public:
+
+	bool isVersioned() {return false;}
+	bool isTracked() {return false;}
+	bool isOwned() {return false;}
+	bool isLatest() {return true;}
+
+	bool update() {}
+	bool takeOwnership() {}
+	bool commit() {}
+};
+
+class CSVNClient
+{
+public:
+	CSVNClient() : dummyFile() {}
+
+	void initialize() {}
+
+	CSVNFile* embraceFile(const CString & filePath) {return &dummyFile;}
+	void forgetFile(CSVNFile* svnFile) {}
+
+private:
+	CSVNFile dummyFile;
+};
+
+#endif // #ifndef _WIN64
+