Compilation Fix

KrossX · Oct 30, 2013 · 7f5c2e8 · 7f5c2e8
1 parent b558cbb
commit 7f5c2e8
Show file tree

Hide file tree

Showing 8 changed files with 82 additions and 9 deletions.
diff --git a/Durazno/Durazno.h b/Durazno/Durazno.h
@@ -21,6 +21,6 @@
 #include <XInput.h>
 #include <stdio.h>
 
-#include "..\..\Common\TypeDefs.h"
+#include "TypeDefs.h"
 
 DWORD DuraznoGetState(DWORD dwUserIndex, XINPUT_STATE* pState);
diff --git a/Durazno/Durazno.rc b/Durazno/Durazno.rc
diff --git a/Durazno/Durazno_vs11.vcxproj b/Durazno/Durazno_vs11.vcxproj
@@ -65,7 +65,8 @@
       <ModuleDefinitionFile>Durazno.def</ModuleDefinitionFile>
     </Link>
     <PreBuildEvent>
-      <Command>"$(SolutionDir)..\Common\svnrev" *.*</Command>
+      <Command>
+      </Command>
     </PreBuildEvent>
     <PostBuildEvent>
       <Command>xcopy "$(ProjectDir)Readme.txt" "$(TargetDir)" /Y</Command>
@@ -89,7 +90,8 @@
       <ModuleDefinitionFile>Durazno.def</ModuleDefinitionFile>
     </Link>
     <PreBuildEvent>
-      <Command>"$(SolutionDir)..\Common\svnrev" *.*</Command>
+      <Command>
+      </Command>
     </PreBuildEvent>
     <PostBuildEvent>
       <Command>xcopy "$(ProjectDir)Readme.txt" "$(TargetDir)" /Y</Command>

diff --git a/Durazno/FileIO.cpp b/Durazno/FileIO.cpp
@@ -18,7 +18,7 @@
 #include <Windows.h>
 #include <stdio.h>
 
-#include "..\..\Common\TypeDefs.h"
+#include "TypeDefs.h"
 #include "Settings.h"
 
 #include <string>

diff --git a/Durazno/Settings.cpp b/Durazno/Settings.cpp
@@ -15,7 +15,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "..\..\Common\TypeDefs.h"
+#include "TypeDefs.h"
 #include "Settings.h"
 
 _Settings::_Settings()

diff --git a/Durazno/TypeDefs.h b/Durazno/TypeDefs.h
@@ -0,0 +1,72 @@
+/*  From some old project of mine
+ *  Copyright (C) 2011 KrossX
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#ifndef KROSSX_TYPEDEFS
+#define KROSSX_TYPEDEFS
+
+#include <stdint.h>
+
+typedef int8_t    s8;
+typedef uint8_t   u8;
+typedef int16_t  s16;
+typedef uint16_t u16;
+typedef int32_t  s32;
+typedef uint32_t u32;
+typedef int64_t  s64;
+typedef uint64_t u64;
+
+typedef	intptr_t sPointer;
+typedef uintptr_t uPointer;
+
+typedef float  f32;
+typedef double f64;
+
+union Word
+{
+	f32 float32;
+	u32 bits32;
+	u16 bits16[2];
+	u8  bits8[4];
+};
+
+union DWord
+{
+	u64 bits64;
+	f64 float64;
+	f32 float32[2];
+	u32 bits32[2];
+	u16 bits16[4];
+	u8  bits8[8];
+
+	Word word[2];
+};
+
+union QWord
+{
+	u64 bits64[2];
+	f64 float64[2];
+	f32 float32[4];
+	u32 bits32[4];
+	u16 bits16[8];
+	u8  bits8[16];
+
+	Word word[4];
+	DWord dword[2];
+};
+#endif // KROSSX_TYPEDEFS
diff --git a/DuraznoGUI/DuraznoGUI.csproj b/DuraznoGUI/DuraznoGUI.csproj
@@ -64,7 +64,6 @@
     <Compile Include="Remap_Sel_Button.xaml.cs">
       <DependentUpon>Remap_Sel_Button.xaml</DependentUpon>
     </Compile>
-    <Compile Include="SvnRevision.cs" />
     <Compile Include="XboxButton.xaml.cs">
       <DependentUpon>XboxButton.xaml</DependentUpon>
     </Compile>
@@ -128,8 +127,8 @@
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\Expression\Blend\.NETFramework\v4.0\Microsoft.Expression.Blend.WPF.targets" />
   <PropertyGroup>
-    <PreBuildEvent>cd ..\DuraznoGUI
-"$(SolutionDir)..\Common\svnrev" *.* -cDuraznoGUI.SvnRevision -pProperties\AssemblyInfo.cs</PreBuildEvent>
+    <PreBuildEvent>
+    </PreBuildEvent>
   </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

diff --git a/DuraznoGUI/MainWindow.xaml.cs b/DuraznoGUI/MainWindow.xaml.cs
@@ -69,7 +69,7 @@ public MainWindow()
 		{
 			InitializeComponent();
 
-			if (Version_Label != null) Version_Label.Content = "v0.5 r" + SvnRevision.SVN_REV;
+			if (Version_Label != null) Version_Label.Content = "v0.6";
 
 			INIstuff = new INIsettings(this, 2); // Set INI version here