Commit b28331f7 authored by Gargaj's avatar Gargaj
Browse files

Merge branch 'dx11'

parents 22d07808 820dc96f

Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Bonzomatic_W32_DX11", "Bonzomatic_W32_DX11.vcxproj", "{7BEE21A3-EF57-41AA-99E6-2BD3091A6926}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Release|Win32 = Release|Win32
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{7BEE21A3-EF57-41AA-99E6-2BD3091A6926}.Debug|Win32.ActiveCfg = Debug|Win32
{7BEE21A3-EF57-41AA-99E6-2BD3091A6926}.Debug|Win32.Build.0 = Debug|Win32
{7BEE21A3-EF57-41AA-99E6-2BD3091A6926}.Release|Win32.ActiveCfg = Release|Win32
{7BEE21A3-EF57-41AA-99E6-2BD3091A6926}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal
<?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>{7BEE21A3-EF57-41AA-99E6-2BD3091A6926}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<RootNamespace>Bonzomatic_W32_DX11</RootNamespace>
</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>
<IncludePath>external;external\scintilla\include;external\scintilla\lexlib;external\scintilla\src;external\glee;external\sdl\include;external\bass;$(IncludePath)</IncludePath>
<LibraryPath>external\bass\;external\sdl\lib\;$(LibraryPath)</LibraryPath>
<OutDir>$(SolutionDir)\</OutDir>
<IntDir>$(ProjectName)_$(Configuration)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
<IncludePath>external;external\scintilla\include;external\scintilla\lexlib;external\scintilla\src;external\glee;external\sdl\include;external\bass;$(IncludePath)</IncludePath>
<LibraryPath>external\bass\;external\sdl\lib\;$(LibraryPath)</LibraryPath>
<OutDir>$(SolutionDir)\</OutDir>
<IntDir>$(ProjectName)_$(Configuration)\</IntDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>SCI_LEXER;SCI_NAMESPACE;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>bass.lib;d3d11.lib;d3dcompiler.lib;dxguid.lib;DXGI.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>SCI_LEXER;SCI_NAMESPACE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<AdditionalDependencies>bass.lib;d3d11.lib;d3dcompiler.lib;dxguid.lib;DXGI.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="external\jsonxx\jsonxx.cc" />
<ClCompile Include="external\scintilla\lexers\LexA68k.cxx" />
<ClCompile Include="external\scintilla\lexers\LexAbaqus.cxx" />
<ClCompile Include="external\scintilla\lexers\LexAda.cxx" />
<ClCompile Include="external\scintilla\lexers\LexAPDL.cxx" />
<ClCompile Include="external\scintilla\lexers\LexAsm.cxx" />
<ClCompile Include="external\scintilla\lexers\LexAsn1.cxx" />
<ClCompile Include="external\scintilla\lexers\LexASY.cxx" />
<ClCompile Include="external\scintilla\lexers\LexAU3.cxx" />
<ClCompile Include="external\scintilla\lexers\LexAVE.cxx" />
<ClCompile Include="external\scintilla\lexers\LexAVS.cxx" />
<ClCompile Include="external\scintilla\lexers\LexBaan.cxx" />
<ClCompile Include="external\scintilla\lexers\LexBash.cxx" />
<ClCompile Include="external\scintilla\lexers\LexBasic.cxx" />
<ClCompile Include="external\scintilla\lexers\LexBibTeX.cxx" />
<ClCompile Include="external\scintilla\lexers\LexBullant.cxx" />
<ClCompile Include="external\scintilla\lexers\LexCaml.cxx" />
<ClCompile Include="external\scintilla\lexers\LexCLW.cxx" />
<ClCompile Include="external\scintilla\lexers\LexCmake.cxx" />
<ClCompile Include="external\scintilla\lexers\LexCOBOL.cxx" />
<ClCompile Include="external\scintilla\lexers\LexCoffeeScript.cxx" />
<ClCompile Include="external\scintilla\lexers\LexConf.cxx" />
<ClCompile Include="external\scintilla\lexers\LexCPP.cxx" />
<ClCompile Include="external\scintilla\lexers\LexCrontab.cxx" />
<ClCompile Include="external\scintilla\lexers\LexCsound.cxx" />
<ClCompile Include="external\scintilla\lexers\LexCSS.cxx" />
<ClCompile Include="external\scintilla\lexers\LexD.cxx" />
<ClCompile Include="external\scintilla\lexers\LexDMAP.cxx" />
<ClCompile Include="external\scintilla\lexers\LexDMIS.cxx" />
<ClCompile Include="external\scintilla\lexers\LexECL.cxx" />
<ClCompile Include="external\scintilla\lexers\LexEiffel.cxx" />
<ClCompile Include="external\scintilla\lexers\LexErlang.cxx" />
<ClCompile Include="external\scintilla\lexers\LexEScript.cxx" />
<ClCompile Include="external\scintilla\lexers\LexFlagship.cxx" />
<ClCompile Include="external\scintilla\lexers\LexForth.cxx" />
<ClCompile Include="external\scintilla\lexers\LexFortran.cxx" />
<ClCompile Include="external\scintilla\lexers\LexGAP.cxx" />
<ClCompile Include="external\scintilla\lexers\LexGui4Cli.cxx" />
<ClCompile Include="external\scintilla\lexers\LexHaskell.cxx" />
<ClCompile Include="external\scintilla\lexers\LexHTML.cxx" />
<ClCompile Include="external\scintilla\lexers\LexInno.cxx" />
<ClCompile Include="external\scintilla\lexers\LexKix.cxx" />
<ClCompile Include="external\scintilla\lexers\LexKVIrc.cxx" />
<ClCompile Include="external\scintilla\lexers\LexLaTeX.cxx" />
<ClCompile Include="external\scintilla\lexers\LexLisp.cxx" />
<ClCompile Include="external\scintilla\lexers\LexLout.cxx" />
<ClCompile Include="external\scintilla\lexers\LexLua.cxx" />
<ClCompile Include="external\scintilla\lexers\LexMagik.cxx" />
<ClCompile Include="external\scintilla\lexers\LexMarkdown.cxx" />
<ClCompile Include="external\scintilla\lexers\LexMatlab.cxx" />
<ClCompile Include="external\scintilla\lexers\LexMetapost.cxx" />
<ClCompile Include="external\scintilla\lexers\LexMMIXAL.cxx" />
<ClCompile Include="external\scintilla\lexers\LexModula.cxx" />
<ClCompile Include="external\scintilla\lexers\LexMPT.cxx" />
<ClCompile Include="external\scintilla\lexers\LexMSSQL.cxx" />
<ClCompile Include="external\scintilla\lexers\LexMySQL.cxx" />
<ClCompile Include="external\scintilla\lexers\LexNimrod.cxx" />
<ClCompile Include="external\scintilla\lexers\LexNsis.cxx" />
<ClCompile Include="external\scintilla\lexers\LexOpal.cxx" />
<ClCompile Include="external\scintilla\lexers\LexOScript.cxx" />
<ClCompile Include="external\scintilla\lexers\LexOthers.cxx" />
<ClCompile Include="external\scintilla\lexers\LexPascal.cxx" />
<ClCompile Include="external\scintilla\lexers\LexPB.cxx" />
<ClCompile Include="external\scintilla\lexers\LexPerl.cxx" />
<ClCompile Include="external\scintilla\lexers\LexPLM.cxx" />
<ClCompile Include="external\scintilla\lexers\LexPO.cxx" />
<ClCompile Include="external\scintilla\lexers\LexPOV.cxx" />
<ClCompile Include="external\scintilla\lexers\LexPowerPro.cxx" />
<ClCompile Include="external\scintilla\lexers\LexPowerShell.cxx" />
<ClCompile Include="external\scintilla\lexers\LexProgress.cxx" />
<ClCompile Include="external\scintilla\lexers\LexPS.cxx" />
<ClCompile Include="external\scintilla\lexers\LexPython.cxx" />
<ClCompile Include="external\scintilla\lexers\LexR.cxx" />
<ClCompile Include="external\scintilla\lexers\LexRebol.cxx" />
<ClCompile Include="external\scintilla\lexers\LexRegistry.cxx" />
<ClCompile Include="external\scintilla\lexers\LexRuby.cxx" />
<ClCompile Include="external\scintilla\lexers\LexRust.cxx" />
<ClCompile Include="external\scintilla\lexers\LexScriptol.cxx" />
<ClCompile Include="external\scintilla\lexers\LexSmalltalk.cxx" />
<ClCompile Include="external\scintilla\lexers\LexSML.cxx" />
<ClCompile Include="external\scintilla\lexers\LexSorcus.cxx" />
<ClCompile Include="external\scintilla\lexers\LexSpecman.cxx" />
<ClCompile Include="external\scintilla\lexers\LexSpice.cxx" />
<ClCompile Include="external\scintilla\lexers\LexSQL.cxx" />
<ClCompile Include="external\scintilla\lexers\LexSTTXT.cxx" />
<ClCompile Include="external\scintilla\lexers\LexTACL.cxx" />
<ClCompile Include="external\scintilla\lexers\LexTADS3.cxx" />
<ClCompile Include="external\scintilla\lexers\LexTAL.cxx" />
<ClCompile Include="external\scintilla\lexers\LexTCL.cxx" />
<ClCompile Include="external\scintilla\lexers\LexTCMD.cxx" />
<ClCompile Include="external\scintilla\lexers\LexTeX.cxx" />
<ClCompile Include="external\scintilla\lexers\LexTxt2tags.cxx" />
<ClCompile Include="external\scintilla\lexers\LexVB.cxx" />
<ClCompile Include="external\scintilla\lexers\LexVerilog.cxx" />
<ClCompile Include="external\scintilla\lexers\LexVHDL.cxx" />
<ClCompile Include="external\scintilla\lexers\LexVisualProlog.cxx" />
<ClCompile Include="external\scintilla\lexers\LexYAML.cxx" />
<ClCompile Include="external\scintilla\lexlib\Accessor.cxx" />
<ClCompile Include="external\scintilla\lexlib\CharacterCategory.cxx" />
<ClCompile Include="external\scintilla\lexlib\CharacterSet.cxx" />
<ClCompile Include="external\scintilla\lexlib\LexerBase.cxx" />
<ClCompile Include="external\scintilla\lexlib\LexerModule.cxx" />
<ClCompile Include="external\scintilla\lexlib\LexerNoExceptions.cxx" />
<ClCompile Include="external\scintilla\lexlib\LexerSimple.cxx" />
<ClCompile Include="external\scintilla\lexlib\PropSetSimple.cxx" />
<ClCompile Include="external\scintilla\lexlib\StyleContext.cxx" />
<ClCompile Include="external\scintilla\lexlib\WordList.cxx" />
<ClCompile Include="external\scintilla\src\AutoComplete.cxx" />
<ClCompile Include="external\scintilla\src\CallTip.cxx" />
<ClCompile Include="external\scintilla\src\CaseConvert.cxx" />
<ClCompile Include="external\scintilla\src\CaseFolder.cxx" />
<ClCompile Include="external\scintilla\src\Catalogue.cxx" />
<ClCompile Include="external\scintilla\src\CellBuffer.cxx" />
<ClCompile Include="external\scintilla\src\CharClassify.cxx" />
<ClCompile Include="external\scintilla\src\ContractionState.cxx" />
<ClCompile Include="external\scintilla\src\Decoration.cxx" />
<ClCompile Include="external\scintilla\src\Document.cxx" />
<ClCompile Include="external\scintilla\src\EditModel.cxx" />
<ClCompile Include="external\scintilla\src\Editor.cxx" />
<ClCompile Include="external\scintilla\src\EditView.cxx" />
<ClCompile Include="external\scintilla\src\ExternalLexer.cxx" />
<ClCompile Include="external\scintilla\src\Indicator.cxx" />
<ClCompile Include="external\scintilla\src\KeyMap.cxx" />
<ClCompile Include="external\scintilla\src\LineMarker.cxx" />
<ClCompile Include="external\scintilla\src\MarginView.cxx" />
<ClCompile Include="external\scintilla\src\PerLine.cxx" />
<ClCompile Include="external\scintilla\src\PositionCache.cxx" />
<ClCompile Include="external\scintilla\src\RESearch.cxx" />
<ClCompile Include="external\scintilla\src\RunStyles.cxx" />
<ClCompile Include="external\scintilla\src\ScintillaBase.cxx" />
<ClCompile Include="external\scintilla\src\Selection.cxx" />
<ClCompile Include="external\scintilla\src\Style.cxx" />
<ClCompile Include="external\scintilla\src\UniConversion.cxx" />
<ClCompile Include="external\scintilla\src\ViewStyle.cxx" />
<ClCompile Include="external\scintilla\src\XPM.cxx" />
<ClCompile Include="external\stb_image.c" />
<ClCompile Include="main.cpp" />
<ClCompile Include="Platform.cpp" />
<ClCompile Include="platform_w32_dx11\Renderer.cpp" />
<ClCompile Include="platform_w32_common\Clipboard.cpp" />
<ClCompile Include="platform_w32_common\FFT.cpp" />
<ClCompile Include="platform_w32_common\Platform_DynamicLoad.cpp" />
<ClCompile Include="platform_w32_common\SetupDialog.cpp" />
<ClCompile Include="platform_w32_common\Timer.cpp" />
<ClCompile Include="ShaderEditor.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="Clipboard.h" />
<ClInclude Include="external\jsonxx\jsonxx.h" />
<ClInclude Include="external\scintilla\include\ILexer.h" />
<ClInclude Include="external\scintilla\include\Platform.h" />
<ClInclude Include="external\scintilla\include\SciLexer.h" />
<ClInclude Include="external\scintilla\include\Scintilla.h" />
<ClInclude Include="external\scintilla\include\ScintillaWidget.h" />
<ClInclude Include="external\scintilla\lexlib\Accessor.h" />
<ClInclude Include="external\scintilla\lexlib\CharacterCategory.h" />
<ClInclude Include="external\scintilla\lexlib\CharacterSet.h" />
<ClInclude Include="external\scintilla\lexlib\LexAccessor.h" />
<ClInclude Include="external\scintilla\lexlib\LexerBase.h" />
<ClInclude Include="external\scintilla\lexlib\LexerModule.h" />
<ClInclude Include="external\scintilla\lexlib\LexerNoExceptions.h" />
<ClInclude Include="external\scintilla\lexlib\LexerSimple.h" />
<ClInclude Include="external\scintilla\lexlib\OptionSet.h" />
<ClInclude Include="external\scintilla\lexlib\PropSetSimple.h" />
<ClInclude Include="external\scintilla\lexlib\SparseState.h" />
<ClInclude Include="external\scintilla\lexlib\StringCopy.h" />
<ClInclude Include="external\scintilla\lexlib\StyleContext.h" />
<ClInclude Include="external\scintilla\lexlib\SubStyles.h" />
<ClInclude Include="external\scintilla\lexlib\WordList.h" />
<ClInclude Include="external\scintilla\src\AutoComplete.h" />
<ClInclude Include="external\scintilla\src\CallTip.h" />
<ClInclude Include="external\scintilla\src\CaseConvert.h" />
<ClInclude Include="external\scintilla\src\CaseFolder.h" />
<ClInclude Include="external\scintilla\src\Catalogue.h" />
<ClInclude Include="external\scintilla\src\CellBuffer.h" />
<ClInclude Include="external\scintilla\src\CharClassify.h" />
<ClInclude Include="external\scintilla\src\ContractionState.h" />
<ClInclude Include="external\scintilla\src\Decoration.h" />
<ClInclude Include="external\scintilla\src\Document.h" />
<ClInclude Include="external\scintilla\src\EditModel.h" />
<ClInclude Include="external\scintilla\src\Editor.h" />
<ClInclude Include="external\scintilla\src\EditView.h" />
<ClInclude Include="external\scintilla\src\ExternalLexer.h" />
<ClInclude Include="external\scintilla\src\FontQuality.h" />
<ClInclude Include="external\scintilla\src\Indicator.h" />
<ClInclude Include="external\scintilla\src\KeyMap.h" />
<ClInclude Include="external\scintilla\src\LineMarker.h" />
<ClInclude Include="external\scintilla\src\MarginView.h" />
<ClInclude Include="external\scintilla\src\Partitioning.h" />
<ClInclude Include="external\scintilla\src\PerLine.h" />
<ClInclude Include="external\scintilla\src\PositionCache.h" />
<ClInclude Include="external\scintilla\src\RESearch.h" />
<ClInclude Include="external\scintilla\src\RunStyles.h" />
<ClInclude Include="external\scintilla\src\ScintillaBase.h" />
<ClInclude Include="external\scintilla\src\Selection.h" />
<ClInclude Include="external\scintilla\src\SplitVector.h" />
<ClInclude Include="external\scintilla\src\Style.h" />
<ClInclude Include="external\scintilla\src\UnicodeFromUTF8.h" />
<ClInclude Include="external\scintilla\src\UniConversion.h" />
<ClInclude Include="external\scintilla\src\ViewStyle.h" />
<ClInclude Include="external\scintilla\src\XPM.h" />
<ClInclude Include="FFT.h" />
<ClInclude Include="MIDI.h" />
<ClInclude Include="platform_w32_common\resource.h" />
<ClInclude Include="Renderer.h" />
<ClInclude Include="ShaderEditor.h" />
<ClInclude Include="Timer.h" />
</ItemGroup>
<ItemGroup>
<None Include="external\scintilla\src\SciTE.properties" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="platform_w32_common\SetupDialog.rc" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
\ No newline at end of file
This diff is collapsed.
......@@ -36,7 +36,6 @@ Create a ```config.json``` with e.g. the following contents: (all fields are opt
Please use Visual C++ 2010 - nothing else is needed right now.
## Future features / todo / etc.
- DX11 version
- Option for tab sizes / spaces
- Texture preview?
......
This diff is collapsed.
......@@ -222,37 +222,6 @@ namespace Renderer
mouseEventBufferCount++;
} break;
case WM_ACTIVATE:
{
if((LOWORD(wParam) & WA_ACTIVE) || (LOWORD(wParam) & WA_CLICKACTIVE))
{
//nGotFocus = 1;
//bActive = true;
}
else
{
//nLostFocus = 1;
//bActive = false;
}
} break;
case WM_SIZE:
{
switch (wParam)
{
case SIZE_MINIMIZED:
{
//nLostFocus = 1;
} break;
case SIZE_MAXIMIZED:
case SIZE_RESTORED:
{
//nGotFocus = 1;
} break;
}
} break;
case WM_SYSCOMMAND:
{
switch (wParam)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment