m/grafX2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add MSVC project for SDL2 build + SDL2 unicode text input for win32

Browse Source
This commit is contained in:
Thomas Bernard 2019-01-25 12:53:47 +01:00
parent 16080ed4b4
commit 8459266c47
No known key found for this signature in database
GPG Key ID: 0FF11B67A5C0863C
6 changed files with 635 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
project/msvc/grafx2-sdl2.sln Normal file
View File

@ -0,0 +1,29 @@

Microsoft Visual Studio Solution File, Format Version 11.00
# Visual C++ Express 2010
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "grafx2-sdl2", "grafx2-sdl2.vcxproj", "{2C23F950-9403-4871-848E-7E98BE9BD565}"
ProjectSection(ProjectDependencies) = postProject
{056D84A3-08C5-4A2A-A24B-D2E6D00D9552} = {056D84A3-08C5-4A2A-A24B-D2E6D00D9552}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "generateversion", "generateversion.vcxproj", "{056D84A3-08C5-4A2A-A24B-D2E6D00D9552}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Release|Win32 = Release|Win32
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{2C23F950-9403-4871-848E-7E98BE9BD565}.Debug|Win32.ActiveCfg = Debug|Win32
{2C23F950-9403-4871-848E-7E98BE9BD565}.Debug|Win32.Build.0 = Debug|Win32
{2C23F950-9403-4871-848E-7E98BE9BD565}.Release|Win32.ActiveCfg = Release|Win32
{2C23F950-9403-4871-848E-7E98BE9BD565}.Release|Win32.Build.0 = Release|Win32
{056D84A3-08C5-4A2A-A24B-D2E6D00D9552}.Debug|Win32.ActiveCfg = Debug|Win32
{056D84A3-08C5-4A2A-A24B-D2E6D00D9552}.Debug|Win32.Build.0 = Debug|Win32
{056D84A3-08C5-4A2A-A24B-D2E6D00D9552}.Release|Win32.ActiveCfg = Release|Win32
{056D84A3-08C5-4A2A-A24B-D2E6D00D9552}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal

217
project/msvc/grafx2-sdl2.vcxproj Normal file
View File

@ -0,0 +1,217 @@
<?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>{2C23F950-9403-4871-848E-7E98BE9BD565}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<RootNamespace>grafx2</RootNamespace>
<ProjectName>grafx2-sdl2</ProjectName>
</PropertyGroup>
<Import Project="$(SolutionDir)\libraries.props" />
<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)..\..\bin\</OutDir>
<TargetName>$(ProjectName)$(Configuration)</TargetName>
<IntDir>$(Configuration)-sdl2\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
<OutDir>$(SolutionDir)..\..\bin\</OutDir>
<IntDir>$(Configuration)-sdl2\</IntDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>USE_SDL2;NOTTF;__ENABLE_LUA__;__no_pnglib__;__no_tifflib__;_CRT_SECURE_NO_WARNINGS;_USE_MATH_DEFINES;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(SDL2ImageIncDir);$(SDL2IncDir);$(LuaIncDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<DisableSpecificWarnings>4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>SDL2.lib;SDL2main.lib;SDL2_image.lib;lua53.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(SDL2LibDir);$(SDL2ImageLibDir);$(LuaLibDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<PrecompiledHeader>
</PrecompiledHeader>
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>USE_SDL2;NOTTF;__ENABLE_LUA__;__no_pnglib__;__no_tifflib__;_CRT_SECURE_NO_WARNINGS;_USE_MATH_DEFINES;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(SDL2ImageIncDir);$(SDL2IncDir);$(LuaIncDir);;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<DisableSpecificWarnings>4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<AdditionalDependencies>SDL2.lib;SDL2main.lib;SDL2_image.lib;lua53.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(SDL2LibDir);$(SDL2ImageLibDir);$(LuaLibDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClInclude Include="..\..\src\bitcount.h" />
<ClInclude Include="..\..\src\brush.h" />
<ClInclude Include="..\..\src\buttons.h" />
<ClInclude Include="..\..\src\colorred.h" />
<ClInclude Include="..\..\src\const.h" />
<ClInclude Include="..\..\src\engine.h" />
<ClInclude Include="..\..\src\errors.h" />
<ClInclude Include="..\..\src\factory.h" />
<ClInclude Include="..\..\src\filesel.h" />
<ClInclude Include="..\..\src\gfx2log.h" />
<ClInclude Include="..\..\src\gfx2surface.h" />
<ClInclude Include="..\..\src\global.h" />
<ClInclude Include="..\..\src\graph.h" />
<ClInclude Include="..\..\src\haiku.h" />
<ClInclude Include="..\..\src\help.h" />
<ClInclude Include="..\..\src\helpfile.h" />
<ClInclude Include="..\..\src\hotkeys.h" />
<ClInclude Include="..\..\src\init.h" />
<ClInclude Include="..\..\src\input.h" />
<ClInclude Include="..\..\src\io.h" />
<ClInclude Include="..\..\src\keyboard.h" />
<ClInclude Include="..\..\src\keycodes.h" />
<ClInclude Include="..\..\src\layers.h" />
<ClInclude Include="..\..\src\libraw2crtc.h" />
<ClInclude Include="..\..\src\loadsave.h" />
<ClInclude Include="..\..\src\misc.h" />
<ClInclude Include="..\..\src\mountlist.h" />
<ClInclude Include="..\..\src\oldies.h" />
<ClInclude Include="..\..\src\operatio.h" />
<ClInclude Include="..\..\src\op_c.h" />
<ClInclude Include="..\..\src\pages.h" />
<ClInclude Include="..\..\src\palette.h" />
<ClInclude Include="..\..\src\pxdouble.h" />
<ClInclude Include="..\..\src\pxquad.h" />
<ClInclude Include="..\..\src\pxsimple.h" />
<ClInclude Include="..\..\src\pxtall.h" />
<ClInclude Include="..\..\src\pxtall2.h" />
<ClInclude Include="..\..\src\pxtall3.h" />
<ClInclude Include="..\..\src\pxtriple.h" />
<ClInclude Include="..\..\src\pxwide.h" />
<ClInclude Include="..\..\src\pxwide2.h" />
<ClInclude Include="..\..\src\readini.h" />
<ClInclude Include="..\..\src\readline.h" />
<ClInclude Include="..\..\src\realpath.h" />
<ClInclude Include="..\..\src\recoil.h" />
<ClInclude Include="..\..\src\saveini.h" />
<ClInclude Include="..\..\src\SDLMain.h" />
<ClInclude Include="..\..\src\sdlscreen.h" />
<ClInclude Include="..\..\src\setup.h" />
<ClInclude Include="..\..\src\SFont.h" />
<ClInclude Include="..\..\src\shade.h" />
<ClInclude Include="..\..\src\special.h" />
<ClInclude Include="..\..\src\struct.h" />
<ClInclude Include="..\..\src\text.h" />
<ClInclude Include="..\..\src\tiles.h" />
<ClInclude Include="..\..\src\transform.h" />
<ClInclude Include="..\..\src\unicode.h" />
<ClInclude Include="..\..\src\windows.h" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="..\..\src\gfx2.rc" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\src\brush.c" />
<ClCompile Include="..\..\src\brush_ops.c" />
<ClCompile Include="..\..\src\buttons.c" />
<ClCompile Include="..\..\src\buttons_effects.c" />
<ClCompile Include="..\..\src\colorred.c" />
<ClCompile Include="..\..\src\engine.c" />
<ClCompile Include="..\..\src\factory.c" />
<ClCompile Include="..\..\src\fileformats.c" />
<ClCompile Include="..\..\src\filesel.c" />
<ClCompile Include="..\..\src\gfx2log.c" />
<ClCompile Include="..\..\src\gfx2surface.c" />
<ClCompile Include="..\..\src\graph.c" />
<ClCompile Include="..\..\src\help.c" />
<ClCompile Include="..\..\src\hotkeys.c" />
<ClCompile Include="..\..\src\init.c" />
<ClCompile Include="..\..\src\input.c" />
<ClCompile Include="..\..\src\io.c" />
<ClCompile Include="..\..\src\keyboard.c" />
<ClCompile Include="..\..\src\layers.c" />
<ClCompile Include="..\..\src\libraw2crtc.c" />
<ClCompile Include="..\..\src\loadrecoil.c" />
<ClCompile Include="..\..\src\loadsave.c" />
<ClCompile Include="..\..\src\main.c" />
<ClCompile Include="..\..\src\misc.c" />
<ClCompile Include="..\..\src\miscfileformats.c" />
<ClCompile Include="..\..\src\mountlist.c" />
<ClCompile Include="..\..\src\oldies.c" />
<ClCompile Include="..\..\src\operatio.c" />
<ClCompile Include="..\..\src\op_c.c" />
<ClCompile Include="..\..\src\pages.c" />
<ClCompile Include="..\..\src\palette.c" />
<ClCompile Include="..\..\src\pversion.c" />
<ClCompile Include="..\..\src\pxdouble.c" />
<ClCompile Include="..\..\src\pxquad.c" />
<ClCompile Include="..\..\src\pxsimple.c" />
<ClCompile Include="..\..\src\pxtall.c" />
<ClCompile Include="..\..\src\pxtall2.c" />
<ClCompile Include="..\..\src\pxtall3.c" />
<ClCompile Include="..\..\src\pxtriple.c" />
<ClCompile Include="..\..\src\pxwide.c" />
<ClCompile Include="..\..\src\pxwide2.c" />
<ClCompile Include="..\..\src\readini.c" />
<ClCompile Include="..\..\src\readline.c" />
<ClCompile Include="..\..\src\realpath.c" />
<ClCompile Include="..\..\src\recoil.c" />
<ClCompile Include="..\..\src\saveini.c" />
<ClCompile Include="..\..\src\sdlscreen.c" />
<ClCompile Include="..\..\src\setup.c" />
<ClCompile Include="..\..\src\SFont.c" />
<ClCompile Include="..\..\src\shade.c" />
<ClCompile Include="..\..\src\special.c" />
<ClCompile Include="..\..\src\text.c" />
<ClCompile Include="..\..\src\tifformat.c" />
<ClCompile Include="..\..\src\tiles.c" />
<ClCompile Include="..\..\src\transform.c" />
<ClCompile Include="..\..\src\unicode.c" />
<ClCompile Include="..\..\src\version.c" />
<ClCompile Include="..\..\src\windows.c" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>

374
project/msvc/grafx2-sdl2.vcxproj.filters Normal file
View File

@ -0,0 +1,374 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="Fichiers sources">
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
<Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
</Filter>
<Filter Include="Fichiers d%27en-tête">
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
<Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
</Filter>
<Filter Include="Fichiers de ressources">
<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>
<ClInclude Include="..\..\src\brush.h">
<Filter>Fichiers d%27en-tête</Filter>
</ClInclude>
<ClInclude Include="..\..\src\buttons.h">
<Filter>Fichiers d%27en-tête</Filter>
</ClInclude>
<ClInclude Include="..\..\src\colorred.h">
<Filter>Fichiers d%27en-tête</Filter>
</ClInclude>
<ClInclude Include="..\..\src\const.h">
<Filter>Fichiers d%27en-tête</Filter>
</ClInclude>
<ClInclude Include="..\..\src\engine.h">
<Filter>Fichiers d%27en-tête</Filter>
</ClInclude>
<ClInclude Include="..\..\src\errors.h">
<Filter>Fichiers d%27en-tête</Filter>
</ClInclude>
<ClInclude Include="..\..\src\factory.h">
<Filter>Fichiers d%27en-tête</Filter>
</ClInclude>
<ClInclude Include="..\..\src\filesel.h">
<Filter>Fichiers d%27en-tête</Filter>
</ClInclude>
<ClInclude Include="..\..\src\global.h">
<Filter>Fichiers d%27en-tête</Filter>
</ClInclude>
<ClInclude Include="..\..\src\graph.h">
<Filter>Fichiers d%27en-tête</Filter>
</ClInclude>
<ClInclude Include="..\..\src\haiku.h">
<Filter>Fichiers d%27en-tête</Filter>
</ClInclude>
<ClInclude Include="..\..\src\help.h">
<Filter>Fichiers d%27en-tête</Filter>
</ClInclude>
<ClInclude Include="..\..\src\helpfile.h">
<Filter>Fichiers d%27en-tête</Filter>
</ClInclude>
<ClInclude Include="..\..\src\hotkeys.h">
<Filter>Fichiers d%27en-tête</Filter>
</ClInclude>
<ClInclude Include="..\..\src\init.h">
<Filter>Fichiers d%27en-tête</Filter>
</ClInclude>
<ClInclude Include="..\..\src\input.h">
<Filter>Fichiers d%27en-tête</Filter>
</ClInclude>
<ClInclude Include="..\..\src\io.h">
<Filter>Fichiers d%27en-tête</Filter>
</ClInclude>
<ClInclude Include="..\..\src\keyboard.h">
<Filter>Fichiers d%27en-tête</Filter>
</ClInclude>
<ClInclude Include="..\..\src\layers.h">
<Filter>Fichiers d%27en-tête</Filter>
</ClInclude>
<ClInclude Include="..\..\src\libraw2crtc.h">
<Filter>Fichiers d%27en-tête</Filter>
</ClInclude>
<ClInclude Include="..\..\src\loadsave.h">
<Filter>Fichiers d%27en-tête</Filter>
</ClInclude>
<ClInclude Include="..\..\src\misc.h">
<Filter>Fichiers d%27en-tête</Filter>
</ClInclude>
<ClInclude Include="..\..\src\mountlist.h">
<Filter>Fichiers d%27en-tête</Filter>
</ClInclude>
<ClInclude Include="..\..\src\oldies.h">
<Filter>Fichiers d%27en-tête</Filter>
</ClInclude>
<ClInclude Include="..\..\src\op_c.h">
<Filter>Fichiers d%27en-tête</Filter>
</ClInclude>
<ClInclude Include="..\..\src\operatio.h">
<Filter>Fichiers d%27en-tête</Filter>
</ClInclude>
<ClInclude Include="..\..\src\pages.h">
<Filter>Fichiers d%27en-tête</Filter>
</ClInclude>
<ClInclude Include="..\..\src\palette.h">
<Filter>Fichiers d%27en-tête</Filter>
</ClInclude>
<ClInclude Include="..\..\src\pxdouble.h">
<Filter>Fichiers d%27en-tête</Filter>
</ClInclude>
<ClInclude Include="..\..\src\pxquad.h">
<Filter>Fichiers d%27en-tête</Filter>
</ClInclude>
<ClInclude Include="..\..\src\pxsimple.h">
<Filter>Fichiers d%27en-tête</Filter>
</ClInclude>
<ClInclude Include="..\..\src\pxtall.h">
<Filter>Fichiers d%27en-tête</Filter>
</ClInclude>
<ClInclude Include="..\..\src\pxtall2.h">
<Filter>Fichiers d%27en-tête</Filter>
</ClInclude>
<ClInclude Include="..\..\src\pxtall3.h">
<Filter>Fichiers d%27en-tête</Filter>
</ClInclude>
<ClInclude Include="..\..\src\pxtriple.h">
<Filter>Fichiers d%27en-tête</Filter>
</ClInclude>
<ClInclude Include="..\..\src\pxwide.h">
<Filter>Fichiers d%27en-tête</Filter>
</ClInclude>
<ClInclude Include="..\..\src\pxwide2.h">
<Filter>Fichiers d%27en-tête</Filter>
</ClInclude>
<ClInclude Include="..\..\src\readini.h">
<Filter>Fichiers d%27en-tête</Filter>
</ClInclude>
<ClInclude Include="..\..\src\readline.h">
<Filter>Fichiers d%27en-tête</Filter>
</ClInclude>
<ClInclude Include="..\..\src\realpath.h">
<Filter>Fichiers d%27en-tête</Filter>
</ClInclude>
<ClInclude Include="..\..\src\saveini.h">
<Filter>Fichiers d%27en-tête</Filter>
</ClInclude>
<ClInclude Include="..\..\src\SDLMain.h">
<Filter>Fichiers d%27en-tête</Filter>
</ClInclude>
<ClInclude Include="..\..\src\sdlscreen.h">
<Filter>Fichiers d%27en-tête</Filter>
</ClInclude>
<ClInclude Include="..\..\src\setup.h">
<Filter>Fichiers d%27en-tête</Filter>
</ClInclude>
<ClInclude Include="..\..\src\SFont.h">
<Filter>Fichiers d%27en-tête</Filter>
</ClInclude>
<ClInclude Include="..\..\src\shade.h">
<Filter>Fichiers d%27en-tête</Filter>
</ClInclude>
<ClInclude Include="..\..\src\special.h">
<Filter>Fichiers d%27en-tête</Filter>
</ClInclude>
<ClInclude Include="..\..\src\struct.h">
<Filter>Fichiers d%27en-tête</Filter>
</ClInclude>
<ClInclude Include="..\..\src\text.h">
<Filter>Fichiers d%27en-tête</Filter>
</ClInclude>
<ClInclude Include="..\..\src\tiles.h">
<Filter>Fichiers d%27en-tête</Filter>
</ClInclude>
<ClInclude Include="..\..\src\transform.h">
<Filter>Fichiers d%27en-tête</Filter>
</ClInclude>
<ClInclude Include="..\..\src\windows.h">
<Filter>Fichiers d%27en-tête</Filter>
</ClInclude>
<ClInclude Include="..\..\src\unicode.h">
<Filter>Fichiers d%27en-tête</Filter>
</ClInclude>
<ClInclude Include="..\..\src\recoil.h">
<Filter>Fichiers d%27en-tête</Filter>
</ClInclude>
<ClInclude Include="..\..\src\gfx2surface.h">
<Filter>Fichiers d%27en-tête</Filter>
</ClInclude>
<ClInclude Include="..\..\src\keycodes.h">
<Filter>Fichiers d%27en-tête</Filter>
</ClInclude>
<ClInclude Include="..\..\src\gfx2log.h">
<Filter>Fichiers d%27en-tête</Filter>
</ClInclude>
<ClInclude Include="..\..\src\bitcount.h">
<Filter>Fichiers d%27en-tête</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="..\..\src\gfx2.rc">
<Filter>Fichiers de ressources</Filter>
</ResourceCompile>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\src\brush.c">
<Filter>Fichiers sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\brush_ops.c">
<Filter>Fichiers sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\buttons.c">
<Filter>Fichiers sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\buttons_effects.c">
<Filter>Fichiers sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\colorred.c">
<Filter>Fichiers sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\engine.c">
<Filter>Fichiers sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\factory.c">
<Filter>Fichiers sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\fileformats.c">
<Filter>Fichiers sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\filesel.c">
<Filter>Fichiers sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\graph.c">
<Filter>Fichiers sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\help.c">
<Filter>Fichiers sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\hotkeys.c">
<Filter>Fichiers sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\init.c">
<Filter>Fichiers sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\input.c">
<Filter>Fichiers sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\io.c">
<Filter>Fichiers sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\keyboard.c">
<Filter>Fichiers sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\layers.c">
<Filter>Fichiers sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\libraw2crtc.c">
<Filter>Fichiers sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\loadsave.c">
<Filter>Fichiers sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\main.c">
<Filter>Fichiers sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\misc.c">
<Filter>Fichiers sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\miscfileformats.c">
<Filter>Fichiers sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\mountlist.c">
<Filter>Fichiers sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\oldies.c">
<Filter>Fichiers sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\op_c.c">
<Filter>Fichiers sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\operatio.c">
<Filter>Fichiers sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\pages.c">
<Filter>Fichiers sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\palette.c">
<Filter>Fichiers sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\pversion.c">
<Filter>Fichiers sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\pxdouble.c">
<Filter>Fichiers sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\pxquad.c">
<Filter>Fichiers sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\pxsimple.c">
<Filter>Fichiers sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\pxtall.c">
<Filter>Fichiers sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\pxtall2.c">
<Filter>Fichiers sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\pxtall3.c">
<Filter>Fichiers sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\pxtriple.c">
<Filter>Fichiers sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\pxwide.c">
<Filter>Fichiers sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\pxwide2.c">
<Filter>Fichiers sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\readini.c">
<Filter>Fichiers sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\readline.c">
<Filter>Fichiers sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\realpath.c">
<Filter>Fichiers sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\saveini.c">
<Filter>Fichiers sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\sdlscreen.c">
<Filter>Fichiers sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\setup.c">
<Filter>Fichiers sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\SFont.c">
<Filter>Fichiers sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\shade.c">
<Filter>Fichiers sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\special.c">
<Filter>Fichiers sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\text.c">
<Filter>Fichiers sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\tiles.c">
<Filter>Fichiers sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\transform.c">
<Filter>Fichiers sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\windows.c">
<Filter>Fichiers sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\unicode.c">
<Filter>Fichiers sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\version.c">
<Filter>Fichiers sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\loadrecoil.c">
<Filter>Fichiers sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\recoil.c">
<Filter>Fichiers sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\gfx2surface.c">
<Filter>Fichiers sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\gfx2log.c">
<Filter>Fichiers sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\tifformat.c">
<Filter>Fichiers sources</Filter>
</ClCompile>
</ItemGroup>
</Project>

4
project/msvc/libraries.props
View File

@ -6,6 +6,10 @@
<SDLLibDir>..\..\..\..\SDL-1.2.15\lib\x86</SDLLibDir>
<SDLImageIncDir>..\..\..\..\SDL_image-1.2.12\include</SDLImageIncDir>
<SDLImageLibDir>..\..\..\..\SDL_image-1.2.12\lib\x86</SDLImageLibDir>
<SDL2IncDir>..\..\..\..\SDL2-2.0.9\include</SDL2IncDir>
<SDL2LibDir>..\..\..\..\SDL2-2.0.9\lib\x86</SDL2LibDir>
<SDL2ImageIncDir>..\..\..\..\SDL2_image-2.0.4\include</SDL2ImageIncDir>
<SDL2ImageLibDir>..\..\..\..\SDL2_image-2.0.4\lib\x86</SDL2ImageLibDir>
<LuaIncDir>..\..\..\..\lua\include</LuaIncDir>
<LuaLibDir>..\..\..\..\lua</LuaLibDir>
<PNGIncDir>..\..\..\..\lpng1634</PNGIncDir>

11
src/readline.c
View File

@ -972,8 +972,17 @@ byte Readline_ex_unicode(word x_pos, word y_pos, char * str, word * str_unicode,
Warning("Unicode conversion of input text failed");
unicode_text[0] = 0;
}
#elif defined(WIN32)
// use MultiByteToWideChar(CP_UTF8, ...) under WIN32
// Note : For UTF-8, dwFlags must be set to either 0 or
// MB_ERR_INVALID_CHARS.
i = MultiByteToWideChar(CP_UTF8, 0, Key_Text, -1, (LPWSTR)unicode_text, sizeof(unicode_text)/sizeof(word));
if (i == 0)
{
GFX2_Log(GFX2_ERROR, "MultiByteToWideChar(CP_UTF8, \"%s\", ...) failed with error #%u\n", Key_Text, GetLastError());
unicode_text[0] = 0;
}
#else
/// @todo use MultiByteToWideChar(CP_UTF8, ...) under WIN32
int j;
for (i = 0, j = 0; i < (int)sizeof(Key_Text) && j < (int)sizeof(unicode_text) && Key_Text[i] != '\0'; i++)
{

2
src/sdlscreen.c
View File

@ -220,7 +220,7 @@ static void GFX2_UpdateRect(int x, int y, int width, int height)
SDL_LockTexture(Texture_SDL, &source_rect, (void **)(&pixels), &pitch );
for (line = 0; line < source_rect.h; line++)
{
memcpy(pixels + line * pitch, RGBcopy->pixels + source_rect.x * 4 + (source_rect.y+line)* RGBcopy->pitch, source_rect.w * 4 );
memcpy(pixels + line * pitch, (const byte *)RGBcopy->pixels + source_rect.x * 4 + (source_rect.y+line)* RGBcopy->pitch, source_rect.w * 4 );
}
SDL_UnlockTexture(Texture_SDL);
//SDL_RenderCopy(Renderer_SDL, Texture_SDL, &source_rect, &source_rect);