test test

RetroAchievements · Apr 13, 2015 · 39cc40b · 39cc40b
1 parent 1d4bebe
commit 39cc40b
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -258,3 +258,6 @@
 /bizhawk/output/N64/SaveRAM/*.bak
 /bizhawk/output/N64/State/*.State
 /bizhawk/output/N64/State/*.bak
+/RA_Integration/RA_BuildVer.h
+/RA_Integration/Diffs.txt
+/RA_Integration/LiveTag.txt
diff --git a/RA_Integration/MakeBuildVer.bat b/RA_Integration/MakeBuildVer.bat
@@ -3,15 +3,14 @@
 REM git describe --tags --long > LiveTag.txt
 git describe --tags --match "RAIntegration.*" > LiveTag.txt
 @set /p ACTIVE_TAG=<LiveTag.txt
-@set VERSION_NUM=%ACTIVE_TAG:~7,3%
+@set VERSION_NUM=%ACTIVE_TAG:~14,3%
 
 git diff HEAD > Diffs.txt
 @set /p RAW_DIFFS_FOUND=<Diffs.txt
 
 setlocal
-REM set file=
 @for /F "usebackq" %%A in ('"Diffs.txt"') do set DIFF_FILE_SIZE=%%~zA
 @if %DIFF_FILE_SIZE% GTR 0 set ACTIVE_TAG=Unstaged Changes
 
-@echo Tag: %ACTIVE_TAG% (%VERSION_NUM%)
-@echo #define RA_INTEGRATION_VERSION "0.%VERSION_NUM%" > ./RABuildVer.h
+@echo RAIntegration Tag: %ACTIVE_TAG% (%VERSION_NUM%)
+@echo #define RA_INTEGRATION_VERSION "0.%VERSION_NUM%" > ./RA_BuildVer.h
diff --git a/RA_Integration/RA_Core.cpp b/RA_Integration/RA_Core.cpp
@@ -3,6 +3,7 @@
 #include "RA_Achievement.h"
 #include "RA_AchievementSet.h"
 #include "RA_AchievementOverlay.h"
+#include "RA_BuildVer.h"
 #include "RA_CodeNotes.h"
 #include "RA_Defs.h"
 #include "RA_httpthread.h"

diff --git a/RA_Integration/RA_Defs.h b/RA_Integration/RA_Defs.h
@@ -19,7 +19,7 @@
 #else
 
 //NB. These must NOT be accessible from the emulator!
-#define RA_INTEGRATION_VERSION	"0.053"
+//#define RA_INTEGRATION_VERSION	"0.053"
 
 //	RA-Only
 #include "rapidjson/include/rapidjson/document.h"

diff --git a/RA_Integration/RA_Integration.vcxproj b/RA_Integration/RA_Integration.vcxproj
@@ -70,6 +70,9 @@
       <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
       <SubSystem>Windows</SubSystem>
     </Link>
+    <PreBuildEvent>
+      <Command>MakeBuildVer.bat</Command>
+    </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
@@ -91,6 +94,9 @@
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
+    <PreBuildEvent>
+      <Command>MakeBuildVer.bat</Command>
+    </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="md5.c" />