diff --git a/Durazno/Durazno.h b/Durazno/Durazno.h index b2e8713..7c7bea3 100644 --- a/Durazno/Durazno.h +++ b/Durazno/Durazno.h @@ -21,6 +21,6 @@ #include #include -#include "..\..\Common\TypeDefs.h" +#include "TypeDefs.h" DWORD DuraznoGetState(DWORD dwUserIndex, XINPUT_STATE* pState); \ No newline at end of file diff --git a/Durazno/Durazno.rc b/Durazno/Durazno.rc index b34cd2c..1fd5916 100644 Binary files a/Durazno/Durazno.rc and b/Durazno/Durazno.rc differ diff --git a/Durazno/Durazno_vs11.vcxproj b/Durazno/Durazno_vs11.vcxproj index 6da567c..c0a16b4 100644 --- a/Durazno/Durazno_vs11.vcxproj +++ b/Durazno/Durazno_vs11.vcxproj @@ -65,7 +65,8 @@ Durazno.def - "$(SolutionDir)..\Common\svnrev" *.* + + xcopy "$(ProjectDir)Readme.txt" "$(TargetDir)" /Y @@ -89,7 +90,8 @@ Durazno.def - "$(SolutionDir)..\Common\svnrev" *.* + + xcopy "$(ProjectDir)Readme.txt" "$(TargetDir)" /Y diff --git a/Durazno/FileIO.cpp b/Durazno/FileIO.cpp index e534255..7e0bddb 100644 --- a/Durazno/FileIO.cpp +++ b/Durazno/FileIO.cpp @@ -18,7 +18,7 @@ #include #include -#include "..\..\Common\TypeDefs.h" +#include "TypeDefs.h" #include "Settings.h" #include diff --git a/Durazno/Settings.cpp b/Durazno/Settings.cpp index 87bd19d..bf7043b 100644 --- a/Durazno/Settings.cpp +++ b/Durazno/Settings.cpp @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -#include "..\..\Common\TypeDefs.h" +#include "TypeDefs.h" #include "Settings.h" _Settings::_Settings() diff --git a/Durazno/TypeDefs.h b/Durazno/TypeDefs.h new file mode 100644 index 0000000..117dd39 --- /dev/null +++ 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 . + */ + +#pragma once + +#ifndef KROSSX_TYPEDEFS +#define KROSSX_TYPEDEFS + +#include + +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 index d901a67..a81a986 100644 --- a/DuraznoGUI/DuraznoGUI.csproj +++ b/DuraznoGUI/DuraznoGUI.csproj @@ -64,7 +64,6 @@ Remap_Sel_Button.xaml - XboxButton.xaml @@ -128,8 +127,8 @@ - cd ..\DuraznoGUI -"$(SolutionDir)..\Common\svnrev" *.* -cDuraznoGUI.SvnRevision -pProperties\AssemblyInfo.cs + +