From d975c3e2eb5536db190abe2f2a6889d6cc1be1cd Mon Sep 17 00:00:00 2001 From: jpd002 Date: Sat, 5 Apr 2008 03:38:53 +0000 Subject: [PATCH] Added precompiled headers for Visual Studio project. Fixes to include path (due to changes with the layout stuff) Fixed STREAK_SEEK_* ambiguity git-svn-id: http://svn.purei.org/purei/trunk@288 b36208d7-6611-0410-8bec-b1987f11c4a2 --- Purei.vcproj | 32 +++++++++++++++++++++++-- Source/CodeGen.cpp | 4 ++-- Source/ELF.cpp | 10 ++++---- Source/ISO9660/DirectoryRecord.cpp | 10 ++++---- Source/ISO9660/File.cpp | 6 ++--- Source/ISO9660/ISO9660.cpp | 2 +- Source/ISO9660/PathTable.cpp | 2 +- Source/ISO9660/PathTableRecord.cpp | 2 +- Source/ISO9660/VolumeDescriptor.cpp | 6 ++--- Source/win32ui/AboutWnd.cpp | Bin 7330 -> 7358 bytes Source/win32ui/AboutWnd.h | 2 +- Source/win32ui/CdromSelectionWnd.cpp | 4 ++-- Source/win32ui/CdromSelectionWnd.h | 2 +- Source/win32ui/ELFHeaderView.cpp | 2 +- Source/win32ui/ELFHeaderView.h | 2 +- Source/win32ui/ELFProgramView.cpp | 2 +- Source/win32ui/ELFProgramView.h | 2 +- Source/win32ui/ELFSectionView.cpp | 2 +- Source/win32ui/ELFSectionView.h | 2 +- Source/win32ui/FunctionsView.cpp | 4 ++-- Source/win32ui/FunctionsView.h | 2 +- Source/win32ui/OptionWnd.h | 2 +- Source/win32ui/RendererSettingsWnd.cpp | 4 ++-- Source/win32ui/RendererSettingsWnd.h | 2 +- Source/win32ui/StdAfx.cpp | 1 + Source/win32ui/StdAfx.h | 18 ++++++++++++++ Source/win32ui/SysInfoWnd.cpp | 1 + Source/win32ui/SysInfoWnd.h | 2 +- Source/win32ui/VFSManagerWnd.cpp | 4 ++-- Source/win32ui/VFSManagerWnd.h | 2 +- 30 files changed, 92 insertions(+), 44 deletions(-) create mode 100644 Source/win32ui/StdAfx.cpp create mode 100644 Source/win32ui/StdAfx.h diff --git a/Purei.vcproj b/Purei.vcproj index 789fd65e..1d78be05 100644 --- a/Purei.vcproj +++ b/Purei.vcproj @@ -46,9 +46,11 @@ MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" - UsePrecompiledHeader="0" + UsePrecompiledHeader="2" + PrecompiledHeaderThrough="$(ProjectDir)Source\win32ui\StdAfx.h" WarningLevel="3" DebugInformationFormat="4" + ForcedIncludeFiles="$(ProjectDir)Source\win32ui\StdAfx.h" /> + + + + + + + + + + diff --git a/Source/CodeGen.cpp b/Source/CodeGen.cpp index 402ccb2b..b8b6c1a0 100644 --- a/Source/CodeGen.cpp +++ b/Source/CodeGen.cpp @@ -2954,9 +2954,9 @@ void CCodeGen::StreamWriteAt(unsigned int position, uint8 value) { if(m_stream == NULL) return; uint64 currentPosition = m_stream->Tell(); - m_stream->Seek(position, STREAM_SEEK_SET); + m_stream->Seek(position, Framework::STREAM_SEEK_SET); m_stream->Write(&value, 1); - m_stream->Seek(currentPosition, STREAM_SEEK_SET); + m_stream->Seek(currentPosition, Framework::STREAM_SEEK_SET); // m_pBlock->StreamWriteAt(position, value); } diff --git a/Source/ELF.cpp b/Source/ELF.cpp index 4042f758..9a52f36a 100644 --- a/Source/ELF.cpp +++ b/Source/ELF.cpp @@ -10,14 +10,14 @@ CELF::CELF(CStream* pS) { unsigned int nCount, i; - pS->Seek(0, STREAM_SEEK_END); + pS->Seek(0, Framework::STREAM_SEEK_END); m_nLenght = (unsigned int)pS->Tell(); m_pData = new char[m_nLenght]; - pS->Seek(0, STREAM_SEEK_SET); + pS->Seek(0, Framework::STREAM_SEEK_SET); pS->Read(m_pData, m_nLenght); - pS->Seek(0, STREAM_SEEK_SET); + pS->Seek(0, Framework::STREAM_SEEK_SET); pS->Read(&m_Header, sizeof(ELFHEADER)); if(m_Header.nId[0] != 0x7F || m_Header.nId[1] != 'E' || m_Header.nId[2] != 'L' || m_Header.nId[3] != 'F') @@ -33,7 +33,7 @@ CELF::CELF(CStream* pS) nCount = m_Header.nProgHeaderCount; m_pProgram = new ELFPROGRAMHEADER[nCount]; - pS->Seek(m_Header.nProgHeaderStart, STREAM_SEEK_SET); + pS->Seek(m_Header.nProgHeaderStart, Framework::STREAM_SEEK_SET); for(i = 0; i < nCount; i++) { pS->Read(&m_pProgram[i], sizeof(ELFPROGRAMHEADER)); @@ -42,7 +42,7 @@ CELF::CELF(CStream* pS) nCount = m_Header.nSectHeaderCount; m_pSection = new ELFSECTIONHEADER[nCount]; - pS->Seek(m_Header.nSectHeaderStart, STREAM_SEEK_SET); + pS->Seek(m_Header.nSectHeaderStart, Framework::STREAM_SEEK_SET); for(i = 0; i < nCount; i++) { pS->Read(&m_pSection[i], sizeof(ELFSECTIONHEADER)); diff --git a/Source/ISO9660/DirectoryRecord.cpp b/Source/ISO9660/DirectoryRecord.cpp index 1f3d1d7e..3ec5585e 100644 --- a/Source/ISO9660/DirectoryRecord.cpp +++ b/Source/ISO9660/DirectoryRecord.cpp @@ -16,12 +16,12 @@ CDirectoryRecord::CDirectoryRecord(CStream* pStream) pStream->Read(&m_nLength, 1); pStream->Read(&m_nExLength, 1); pStream->Read(&m_nPosition, 4); - pStream->Seek(4, STREAM_SEEK_CUR); + pStream->Seek(4, Framework::STREAM_SEEK_CUR); pStream->Read(&m_nDataLength, 4); - pStream->Seek(4, STREAM_SEEK_CUR); - pStream->Seek(7, STREAM_SEEK_CUR); + pStream->Seek(4, Framework::STREAM_SEEK_CUR); + pStream->Seek(7, Framework::STREAM_SEEK_CUR); pStream->Read(&m_nFlags, 1); - pStream->Seek(6, STREAM_SEEK_CUR); + pStream->Seek(6, Framework::STREAM_SEEK_CUR); pStream->Read(&nNameSize, 1); pStream->Read(m_sName, nNameSize); m_sName[nNameSize] = 0x00; @@ -29,7 +29,7 @@ CDirectoryRecord::CDirectoryRecord(CStream* pStream) nSkip = m_nLength - (0x21 + nNameSize); if(nSkip > 0) { - pStream->Seek(nSkip, STREAM_SEEK_CUR); + pStream->Seek(nSkip, Framework::STREAM_SEEK_CUR); } } diff --git a/Source/ISO9660/File.cpp b/Source/ISO9660/File.cpp index 2b04111a..e24fcecb 100644 --- a/Source/ISO9660/File.cpp +++ b/Source/ISO9660/File.cpp @@ -23,13 +23,13 @@ void CFile::Seek(int64 nAmount, STREAM_SEEK_DIRECTION nWhence) { switch(nWhence) { - case STREAM_SEEK_SET: + case Framework::STREAM_SEEK_SET: m_nPosition = nAmount; break; - case STREAM_SEEK_CUR: + case Framework::STREAM_SEEK_CUR: m_nPosition += nAmount; break; - case STREAM_SEEK_END: + case Framework::STREAM_SEEK_END: m_nPosition = m_nEnd + 1; break; } diff --git a/Source/ISO9660/ISO9660.cpp b/Source/ISO9660/ISO9660.cpp index 49ea5b5d..3ea5c2e5 100644 --- a/Source/ISO9660/ISO9660.cpp +++ b/Source/ISO9660/ISO9660.cpp @@ -26,7 +26,7 @@ CISO9660::~CISO9660() void CISO9660::ReadBlock(uint32 nAddress, void* pData) { //Caching mechanism? - m_pStream->Seek(nAddress * BLOCKSIZE, STREAM_SEEK_SET); + m_pStream->Seek(nAddress * BLOCKSIZE, Framework::STREAM_SEEK_SET); m_pStream->Read(pData, BLOCKSIZE); } diff --git a/Source/ISO9660/PathTable.cpp b/Source/ISO9660/PathTable.cpp index 612e2efd..294c6c9c 100644 --- a/Source/ISO9660/PathTable.cpp +++ b/Source/ISO9660/PathTable.cpp @@ -9,7 +9,7 @@ using namespace std; CPathTable::CPathTable(CStream* pStream, uint32 nAddress) { - pStream->Seek(nAddress * 0x800, STREAM_SEEK_SET); + pStream->Seek(nAddress * 0x800, Framework::STREAM_SEEK_SET); while(1) { diff --git a/Source/ISO9660/PathTableRecord.cpp b/Source/ISO9660/PathTableRecord.cpp index fd035d62..670f6d9d 100644 --- a/Source/ISO9660/PathTableRecord.cpp +++ b/Source/ISO9660/PathTableRecord.cpp @@ -22,7 +22,7 @@ CPathTableRecord::CPathTableRecord(CStream* pStream) if(m_nNameLength & 1) { - pStream->Seek(1, STREAM_SEEK_CUR); + pStream->Seek(1, Framework::STREAM_SEEK_CUR); } } diff --git a/Source/ISO9660/VolumeDescriptor.cpp b/Source/ISO9660/VolumeDescriptor.cpp index 8d544022..25458554 100644 --- a/Source/ISO9660/VolumeDescriptor.cpp +++ b/Source/ISO9660/VolumeDescriptor.cpp @@ -9,7 +9,7 @@ using namespace std; CVolumeDescriptor::CVolumeDescriptor(CStream* stream) { //Starts at LBA 16 - stream->Seek(0x8000, STREAM_SEEK_SET); + stream->Seek(0x8000, Framework::STREAM_SEEK_SET); stream->Read(&m_nType, 1); if(m_nType != 0x01) @@ -25,12 +25,12 @@ CVolumeDescriptor::CVolumeDescriptor(CStream* stream) throw runtime_error("Invalid ISO9660 Volume Descriptor."); } - stream->Seek(34, STREAM_SEEK_CUR); + stream->Seek(34, Framework::STREAM_SEEK_CUR); stream->Read(m_sVolumeId, 32); m_sVolumeId[32] = 0x00; - stream->Seek(68, STREAM_SEEK_CUR); + stream->Seek(68, Framework::STREAM_SEEK_CUR); stream->Read(&m_nLPathTableAddress, 4); stream->Read(&m_nMPathTableAddress, 4); diff --git a/Source/win32ui/AboutWnd.cpp b/Source/win32ui/AboutWnd.cpp index c3863217dd7ed45124667f6f2a546a0aa3c62dc1..dc7285abb2d817853da89b8375812fc495d14878 100644 GIT binary patch delta 48 scmZ2vxzBQg6eDjALn1>ZLq0<(LkWZa #include "ELFHeaderView.h" #include "PtrMacro.h" -#include "LayoutStretch.h" +#include "layout/LayoutStretch.h" #include "win32/Static.h" #include "win32/LayoutWindow.h" #include diff --git a/Source/win32ui/ELFHeaderView.h b/Source/win32ui/ELFHeaderView.h index 553110ac..2441471c 100644 --- a/Source/win32ui/ELFHeaderView.h +++ b/Source/win32ui/ELFHeaderView.h @@ -3,7 +3,7 @@ #include "win32/Window.h" #include "win32/Edit.h" -#include "GridLayout.h" +#include "layout/GridLayout.h" #include "../ELF.h" class CELFHeaderView : public Framework::Win32::CWindow diff --git a/Source/win32ui/ELFProgramView.cpp b/Source/win32ui/ELFProgramView.cpp index 59453325..aa7e3fbe 100644 --- a/Source/win32ui/ELFProgramView.cpp +++ b/Source/win32ui/ELFProgramView.cpp @@ -1,7 +1,7 @@ #include #include "ELFProgramView.h" #include "PtrMacro.h" -#include "LayoutStretch.h" +#include "layout/LayoutStretch.h" #include "win32/Static.h" #include "win32/LayoutWindow.h" diff --git a/Source/win32ui/ELFProgramView.h b/Source/win32ui/ELFProgramView.h index fa813dc0..ff3a6836 100644 --- a/Source/win32ui/ELFProgramView.h +++ b/Source/win32ui/ELFProgramView.h @@ -3,7 +3,7 @@ #include "win32/Window.h" #include "win32/Edit.h" -#include "GridLayout.h" +#include "layout/GridLayout.h" #include "Types.h" #include "../ELF.h" diff --git a/Source/win32ui/ELFSectionView.cpp b/Source/win32ui/ELFSectionView.cpp index 1d271b05..c7d2d262 100644 --- a/Source/win32ui/ELFSectionView.cpp +++ b/Source/win32ui/ELFSectionView.cpp @@ -1,7 +1,7 @@ #include #include "ELFSectionView.h" #include "PtrMacro.h" -#include "GridLayout.h" +#include "layout/GridLayout.h" #include "win32/Static.h" #include "win32/LayoutWindow.h" diff --git a/Source/win32ui/ELFSectionView.h b/Source/win32ui/ELFSectionView.h index ba34871c..46571971 100644 --- a/Source/win32ui/ELFSectionView.h +++ b/Source/win32ui/ELFSectionView.h @@ -3,7 +3,7 @@ #include "win32/Window.h" #include "win32/Edit.h" -#include "VerticalLayout.h" +#include "layout/VerticalLayout.h" #include "Types.h" #include "MemoryViewPtr.h" #include "../ELF.h" diff --git a/Source/win32ui/FunctionsView.cpp b/Source/win32ui/FunctionsView.cpp index 56a77abf..4a0d43d7 100644 --- a/Source/win32ui/FunctionsView.cpp +++ b/Source/win32ui/FunctionsView.cpp @@ -1,11 +1,11 @@ #include #include "FunctionsView.h" -#include "HorizontalLayout.h" +#include "layout/HorizontalLayout.h" +#include "layout/LayoutStretch.h" #include "win32/LayoutWindow.h" #include "win32/InputBox.h" #include "string_cast.h" #include "lexical_cast_ex.h" -#include "LayoutStretch.h" #include "PtrMacro.h" #define CLSNAME _T("FunctionsView") diff --git a/Source/win32ui/FunctionsView.h b/Source/win32ui/FunctionsView.h index 45e5b8ca..062e5e87 100644 --- a/Source/win32ui/FunctionsView.h +++ b/Source/win32ui/FunctionsView.h @@ -5,7 +5,7 @@ #include "win32/MDIChild.h" #include "win32/ListView.h" #include "win32/Button.h" -#include "VerticalLayout.h" +#include "layout/VerticalLayout.h" #include "../MIPS.h" #include "../ELF.h" diff --git a/Source/win32ui/OptionWnd.h b/Source/win32ui/OptionWnd.h index da9ce005..6bbd1a5c 100644 --- a/Source/win32ui/OptionWnd.h +++ b/Source/win32ui/OptionWnd.h @@ -4,7 +4,7 @@ #include "win32/Window.h" #include "win32/TreeView.h" #include "win32/Static.h" -#include "HorizontalLayout.h" +#include "layout/HorizontalLayout.h" template class COptionWnd : public T { diff --git a/Source/win32ui/RendererSettingsWnd.cpp b/Source/win32ui/RendererSettingsWnd.cpp index d8a6bcc7..6a892a1d 100644 --- a/Source/win32ui/RendererSettingsWnd.cpp +++ b/Source/win32ui/RendererSettingsWnd.cpp @@ -1,7 +1,7 @@ #include "PtrMacro.h" #include "RendererSettingsWnd.h" -#include "HorizontalLayout.h" -#include "LayoutStretch.h" +#include "layout/HorizontalLayout.h" +#include "layout/LayoutStretch.h" #include "win32/LayoutWindow.h" #include "win32/Static.h" #include "../Config.h" diff --git a/Source/win32ui/RendererSettingsWnd.h b/Source/win32ui/RendererSettingsWnd.h index 1689f564..f267f39d 100644 --- a/Source/win32ui/RendererSettingsWnd.h +++ b/Source/win32ui/RendererSettingsWnd.h @@ -2,7 +2,7 @@ #define _RENDERERSETTINGSWND_H_ #include "ModalWindow.h" -#include "VerticalLayout.h" +#include "layout/VerticalLayout.h" #include "win32/ListView.h" #include "win32/Button.h" #include "../GSH_OpenGL.h" diff --git a/Source/win32ui/StdAfx.cpp b/Source/win32ui/StdAfx.cpp new file mode 100644 index 00000000..9b13c1ca --- /dev/null +++ b/Source/win32ui/StdAfx.cpp @@ -0,0 +1 @@ +#include "StdAfx.h" diff --git a/Source/win32ui/StdAfx.h b/Source/win32ui/StdAfx.h new file mode 100644 index 00000000..4884c848 --- /dev/null +++ b/Source/win32ui/StdAfx.h @@ -0,0 +1,18 @@ +#ifndef _STDAFX_H_ +#define _STDAFX_H_ + +#include + +#include +#include +#include +#include +#include + +#include +#include +#include + +#include "Types.h" + +#endif diff --git a/Source/win32ui/SysInfoWnd.cpp b/Source/win32ui/SysInfoWnd.cpp index a623a595..fc1f5a2b 100644 --- a/Source/win32ui/SysInfoWnd.cpp +++ b/Source/win32ui/SysInfoWnd.cpp @@ -1,6 +1,7 @@ #include #include #include +#include "Types.h" #include "string_cast.h" #include "SysInfoWnd.h" #include "PtrMacro.h" diff --git a/Source/win32ui/SysInfoWnd.h b/Source/win32ui/SysInfoWnd.h index 467ae00b..57d908a0 100644 --- a/Source/win32ui/SysInfoWnd.h +++ b/Source/win32ui/SysInfoWnd.h @@ -4,7 +4,7 @@ #include "win32/Window.h" #include "win32/Static.h" #include "win32/ListBox.h" -#include "VerticalLayout.h" +#include "layout/VerticalLayout.h" class CSysInfoWnd : public Framework::Win32::CWindow { diff --git a/Source/win32ui/VFSManagerWnd.cpp b/Source/win32ui/VFSManagerWnd.cpp index b1f64d54..1cc687fe 100644 --- a/Source/win32ui/VFSManagerWnd.cpp +++ b/Source/win32ui/VFSManagerWnd.cpp @@ -1,8 +1,8 @@ #include #include #include "VFSManagerWnd.h" -#include "LayoutStretch.h" -#include "HorizontalLayout.h" +#include "layout/LayoutStretch.h" +#include "layout/HorizontalLayout.h" #include "win32/LayoutWindow.h" #include "win32/Static.h" #include "PtrMacro.h" diff --git a/Source/win32ui/VFSManagerWnd.h b/Source/win32ui/VFSManagerWnd.h index aea6656f..ab057922 100644 --- a/Source/win32ui/VFSManagerWnd.h +++ b/Source/win32ui/VFSManagerWnd.h @@ -5,7 +5,7 @@ #include "win32/Button.h" #include "win32/ListView.h" #include "List.h" -#include "VerticalLayout.h" +#include "layout/VerticalLayout.h" #include "Str.h" class CVFSManagerWnd : public CModalWindow