Win32 Solution added

master
egon.rath 2010-04-22 08:44:10 +00:00
parent 290c2f494c
commit f831ae2bd9
9 changed files with 207 additions and 2 deletions

View File

@ -99,7 +99,11 @@ void Engine::checkResize()
Engine::Engine()
{
m_Device = createDevice( EDT_OPENGL, dimension2d<u32>( 1024, 768 ), 32, false, false, false, 0 );
#if WIN32
m_Device = createDevice( EDT_DIRECT3D9, dimension2d<u32>( 1024, 768 ), 32, false, false, false, 0 );
#else
m_Device = createDevice( EDT_OPENGL, dimension2d<u32>( 1024, 768 ), 32, false, false, false, 0 );
#endif
m_Device->setResizable( true );
m_EventHandler = new EventHandler( m_Device );
@ -108,7 +112,9 @@ Engine::Engine()
m_Driver = m_Device->getVideoDriver();
m_Scene = m_Device->getSceneManager();
m_Device->setWindowCaption( L"Blitz3D Viewer" );
wstringstream windowTitle;
windowTitle << L"Blitz3D Viewer [" << m_Driver->getName() << L"]";
m_Device->setWindowCaption( windowTitle.str().c_str() );
setupScene();

View File

@ -6,6 +6,7 @@ class UserInterface;
class View;
#include <string>
#include <sstream>
#include <iostream>
#include <irrlicht.h>
@ -16,6 +17,7 @@ class View;
using std::cout;
using std::endl;
using std::wstring;
using std::wstringstream;
using namespace irr;
using namespace irr::core;

View File

@ -15,6 +15,7 @@ EventHandler::~EventHandler()
bool EventHandler::addEventReceiver( EventReceiverType type, IEventReceiver *receiver )
{
m_EventReceivers->insert( make_pair( type, receiver ));
return true;
}
// IEventReceiver

View File

@ -1,9 +1,15 @@
#include "Engine.h"
#ifdef WIN32
#include <Windows.h>
int WINAPI WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow )
#else
int main( int argc, char **argv )
#endif
{
Engine *engine = new Engine();
engine->run();
delete engine;
}

20
win32/b3view.sln Normal file
View File

@ -0,0 +1,20 @@

Microsoft Visual Studio Solution File, Format Version 11.00
# Visual C++ Express 2010
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "b3view", "b3view.vcxproj", "{639364D9-A57B-4B61-90D8-7974B3FA3435}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Release|Win32 = Release|Win32
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{639364D9-A57B-4B61-90D8-7974B3FA3435}.Debug|Win32.ActiveCfg = Debug|Win32
{639364D9-A57B-4B61-90D8-7974B3FA3435}.Debug|Win32.Build.0 = Debug|Win32
{639364D9-A57B-4B61-90D8-7974B3FA3435}.Release|Win32.ActiveCfg = Release|Win32
{639364D9-A57B-4B61-90D8-7974B3FA3435}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal

BIN
win32/b3view.suo Normal file

Binary file not shown.

107
win32/b3view.vcxproj Normal file
View File

@ -0,0 +1,107 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{639364D9-A57B-4B61-90D8-7974B3FA3435}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<RootNamespace>win32</RootNamespace>
<ProjectName>b3view</ProjectName>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental>
<OutDir>$(SolutionDir)\..\win32_build\</OutDir>
<IntDir>$(SolutionDir)\..\win32_build\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
<OutDir>$(SolutionDir)\..\win32_build\</OutDir>
<IntDir>$(SolutionDir)\..\win32_build\</IntDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>D:\Prj\irrlicht-1.7.1\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalLibraryDirectories>D:\Prj\irrlicht-1.7.1\lib\Win32-visualstudio;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalDependencies>Irrlicht.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<PrecompiledHeader>
</PrecompiledHeader>
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>D:\Prj\irrlicht-1.7.1\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<AdditionalLibraryDirectories>D:\Prj\irrlicht-1.7.1\lib\Win32-visualstudio;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalDependencies>Irrlicht.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\Debug.cpp" />
<ClCompile Include="..\Engine.cpp" />
<ClCompile Include="..\EventHandler.cpp" />
<ClCompile Include="..\main.cpp" />
<ClCompile Include="..\UserInterface.cpp" />
<ClCompile Include="..\Utils.cpp" />
<ClCompile Include="..\View.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\Debug.h" />
<ClInclude Include="..\Engine.h" />
<ClInclude Include="..\EventHandler.h" />
<ClInclude Include="..\UserInterface.h" />
<ClInclude Include="..\Utils.h" />
<ClInclude Include="..\View.h" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>

View File

@ -0,0 +1,60 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="Source Files">
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
<Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
</Filter>
<Filter Include="Header Files">
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
<Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
</Filter>
<Filter Include="Resource Files">
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\Debug.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\Engine.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\EventHandler.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\main.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\UserInterface.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\Utils.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\View.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\Debug.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\Engine.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\EventHandler.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\UserInterface.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\Utils.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\View.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
</Project>

View File

@ -0,0 +1,3 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
</Project>