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
2025-03-05 01:38:42 +00:00 · 2008-04-05 03:38:53 +00:00 · 2008-04-05 03:38:53 +00:00 · d975c3e2eb
commit d975c3e2eb
parent 8c0131b120
30 changed files with 92 additions and 44 deletions
--- 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"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@ -122,9 +124,11 @@
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_MSVC;GLEW_STATIC"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderThrough="$(ProjectDir)Source\win32ui\StdAfx.h"
 				WarningLevel="3"
 				DebugInformationFormat="3"
+				ForcedIncludeFiles="$(ProjectDir)Source\win32ui\StdAfx.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@ -1380,6 +1384,30 @@
 				RelativePath=".\Source\win32ui\SettingsDialogProvider.h"
 				>
 			</File>
+			<File
+				RelativePath=".\Source\win32ui\StdAfx.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="1"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="1"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath=".\Source\win32ui\StdAfx.h"
+				>
+			</File>
 			<File
 				RelativePath=".\Source\win32ui\SysInfoWnd.cpp"
 				>
--- 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);
 }

--- 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));
--- 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);
    }
 }

--- 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;
 	}
--- 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);
 }

--- 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)
 	{
--- 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);
 	}
 }

--- 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);
--- a/Source/win32ui/AboutWnd.cpp
+++ b/Source/win32ui/AboutWnd.cpp
--- a/Source/win32ui/AboutWnd.h
+++ b/Source/win32ui/AboutWnd.h
@ -4,7 +4,7 @@
 #include "win32/Window.h"
 #include "win32/Static.h"
 #include "win32/Button.h"
-#include "VerticalLayout.h"
+#include "layout/VerticalLayout.h"

 class CAboutWnd : public Framework::Win32::CWindow
 {
--- a/Source/win32ui/CdromSelectionWnd.cpp
+++ b/Source/win32ui/CdromSelectionWnd.cpp
@ -1,6 +1,6 @@
 #include "CdromSelectionWnd.h"
-#include "HorizontalLayout.h"
-#include "LayoutStretch.h"
+#include "layout/HorizontalLayout.h"
+#include "layout/LayoutStretch.h"
 #include "win32/LayoutWindow.h"
 #include "win32/FileDialog.h"
 #include "../ISO9660/ISO9660.h"
--- a/Source/win32ui/CdromSelectionWnd.h
+++ b/Source/win32ui/CdromSelectionWnd.h
@ -5,7 +5,7 @@
 #include "win32/Button.h"
 #include "win32/Edit.h"
 #include "win32/ComboBox.h"
-#include "VerticalLayout.h"
+#include "layout/VerticalLayout.h"
 #include "Str.h"

 class CCdromSelectionWnd : public CModalWindow
--- a/Source/win32ui/ELFHeaderView.cpp
+++ b/Source/win32ui/ELFHeaderView.cpp
@ -1,7 +1,7 @@
 #include <stdio.h>
 #include "ELFHeaderView.h"
 #include "PtrMacro.h"
-#include "LayoutStretch.h"
+#include "layout/LayoutStretch.h"
 #include "win32/Static.h"
 #include "win32/LayoutWindow.h"
 #include <boost/lexical_cast.hpp>
--- 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
--- a/Source/win32ui/ELFProgramView.cpp
+++ b/Source/win32ui/ELFProgramView.cpp
@ -1,7 +1,7 @@
 #include <stdio.h>
 #include "ELFProgramView.h"
 #include "PtrMacro.h"
-#include "LayoutStretch.h"
+#include "layout/LayoutStretch.h"
 #include "win32/Static.h"
 #include "win32/LayoutWindow.h"

--- 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"

--- a/Source/win32ui/ELFSectionView.cpp
+++ b/Source/win32ui/ELFSectionView.cpp
@ -1,7 +1,7 @@
 #include <stdio.h>
 #include "ELFSectionView.h"
 #include "PtrMacro.h"
-#include "GridLayout.h"
+#include "layout/GridLayout.h"
 #include "win32/Static.h"
 #include "win32/LayoutWindow.h"

--- 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"
--- a/Source/win32ui/FunctionsView.cpp
+++ b/Source/win32ui/FunctionsView.cpp
@ -1,11 +1,11 @@
 #include <stdio.h>
 #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")
--- 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"

--- 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 <typename T> class COptionWnd : public T
 {
--- 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"
--- 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"
--- a/Source/win32ui/StdAfx.cpp
+++ b/Source/win32ui/StdAfx.cpp
@ -0,0 +1 @@
+#include "StdAfx.h"
--- a/Source/win32ui/StdAfx.h
+++ b/Source/win32ui/StdAfx.h
@ -0,0 +1,18 @@
+#ifndef _STDAFX_H_
+#define _STDAFX_H_
+
+#include <windows.h>
+
+#include <vector>
+#include <list>
+#include <map>
+#include <set>
+#include <functional>
+
+#include <boost/signal.hpp>
+#include <boost/lexical_cast.hpp>
+#include <boost/thread.hpp>
+
+#include "Types.h"
+
+#endif
--- a/Source/win32ui/SysInfoWnd.cpp
+++ b/Source/win32ui/SysInfoWnd.cpp
@ -1,6 +1,7 @@
 #include <windows.h>
 #include <tlhelp32.h>
 #include <boost/lexical_cast.hpp>
+#include "Types.h"
 #include "string_cast.h"
 #include "SysInfoWnd.h"
 #include "PtrMacro.h"
--- 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
 {
--- a/Source/win32ui/VFSManagerWnd.cpp
+++ b/Source/win32ui/VFSManagerWnd.cpp
@ -1,8 +1,8 @@
 #include <shlobj.h>
 #include <stdio.h>
 #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"
--- 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