Autotest
/
GGELUA
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

优化

This commit is contained in:
baidwwy 2021-04-06 01:07:46 +08:00
parent 97f33a2129
commit 2adf57b7a7
29 changed files with 176 additions and 680 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
Windows.sln
View File

@ -82,14 +82,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpng", "project\windows\d
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libFLAC", "project\windows\dep\libflac\libFLAC.vcxproj", "{4CEFBC84-C215-11DB-8314-0800200C9A66}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "native_midi", "project\windows\dep\native_midi\native_midi.vcxproj", "{EBDA67CA-4A23-4F22-BFBC-B8DBE0580D4F}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "timidity", "project\windows\dep\timidity\timidity.vcxproj", "{B162B6F1-E876-4D5F-A1F6-E3A6DC2F4A2C}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libogg", "project\windows\dep\libogg\libogg.vcxproj", "{15CBFEFF-7965-41F5-B4E2-21E8795C9159}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libvorbisfile", "project\windows\dep\libvorbisfile\libvorbisfile.vcxproj", "{CEBDE98B-A6AA-46E6-BC79-FAAF823DB9EC}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libvorbis", "project\windows\dep\libvorbis\libvorbis.vcxproj", "{3A214E06-B95E-4D61-A291-1F8DF2EC10FD}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmpg123", "project\windows\dep\libmpg123\libmpg123.vcxproj", "{67CAA87B-7CF1-4F93-BB67-21C513F40803}"
@ -344,22 +338,6 @@ Global
{4CEFBC84-C215-11DB-8314-0800200C9A66}.Release|Win32.Build.0 = Release|Win32
{4CEFBC84-C215-11DB-8314-0800200C9A66}.Release|x64.ActiveCfg = Release|x64
{4CEFBC84-C215-11DB-8314-0800200C9A66}.Release|x64.Build.0 = Release|x64
{EBDA67CA-4A23-4F22-BFBC-B8DBE0580D4F}.Debug|Win32.ActiveCfg = Debug|Win32
{EBDA67CA-4A23-4F22-BFBC-B8DBE0580D4F}.Debug|Win32.Build.0 = Debug|Win32
{EBDA67CA-4A23-4F22-BFBC-B8DBE0580D4F}.Debug|x64.ActiveCfg = Debug|x64
{EBDA67CA-4A23-4F22-BFBC-B8DBE0580D4F}.Debug|x64.Build.0 = Debug|x64
{EBDA67CA-4A23-4F22-BFBC-B8DBE0580D4F}.Release|Win32.ActiveCfg = Release|Win32
{EBDA67CA-4A23-4F22-BFBC-B8DBE0580D4F}.Release|Win32.Build.0 = Release|Win32
{EBDA67CA-4A23-4F22-BFBC-B8DBE0580D4F}.Release|x64.ActiveCfg = Release|x64
{EBDA67CA-4A23-4F22-BFBC-B8DBE0580D4F}.Release|x64.Build.0 = Release|x64
{B162B6F1-E876-4D5F-A1F6-E3A6DC2F4A2C}.Debug|Win32.ActiveCfg = Debug|Win32
{B162B6F1-E876-4D5F-A1F6-E3A6DC2F4A2C}.Debug|Win32.Build.0 = Debug|Win32
{B162B6F1-E876-4D5F-A1F6-E3A6DC2F4A2C}.Debug|x64.ActiveCfg = Debug|x64
{B162B6F1-E876-4D5F-A1F6-E3A6DC2F4A2C}.Debug|x64.Build.0 = Debug|x64
{B162B6F1-E876-4D5F-A1F6-E3A6DC2F4A2C}.Release|Win32.ActiveCfg = Release|Win32
{B162B6F1-E876-4D5F-A1F6-E3A6DC2F4A2C}.Release|Win32.Build.0 = Release|Win32
{B162B6F1-E876-4D5F-A1F6-E3A6DC2F4A2C}.Release|x64.ActiveCfg = Release|x64
{B162B6F1-E876-4D5F-A1F6-E3A6DC2F4A2C}.Release|x64.Build.0 = Release|x64
{15CBFEFF-7965-41F5-B4E2-21E8795C9159}.Debug|Win32.ActiveCfg = Debug|Win32
{15CBFEFF-7965-41F5-B4E2-21E8795C9159}.Debug|Win32.Build.0 = Debug|Win32
{15CBFEFF-7965-41F5-B4E2-21E8795C9159}.Debug|x64.ActiveCfg = Debug|x64
@ -368,14 +346,6 @@ Global
{15CBFEFF-7965-41F5-B4E2-21E8795C9159}.Release|Win32.Build.0 = Release|Win32
{15CBFEFF-7965-41F5-B4E2-21E8795C9159}.Release|x64.ActiveCfg = Release|x64
{15CBFEFF-7965-41F5-B4E2-21E8795C9159}.Release|x64.Build.0 = Release|x64
{CEBDE98B-A6AA-46E6-BC79-FAAF823DB9EC}.Debug|Win32.ActiveCfg = Debug|Win32
{CEBDE98B-A6AA-46E6-BC79-FAAF823DB9EC}.Debug|Win32.Build.0 = Debug|Win32
{CEBDE98B-A6AA-46E6-BC79-FAAF823DB9EC}.Debug|x64.ActiveCfg = Debug|x64
{CEBDE98B-A6AA-46E6-BC79-FAAF823DB9EC}.Debug|x64.Build.0 = Debug|x64
{CEBDE98B-A6AA-46E6-BC79-FAAF823DB9EC}.Release|Win32.ActiveCfg = Release|Win32
{CEBDE98B-A6AA-46E6-BC79-FAAF823DB9EC}.Release|Win32.Build.0 = Release|Win32
{CEBDE98B-A6AA-46E6-BC79-FAAF823DB9EC}.Release|x64.ActiveCfg = Release|x64
{CEBDE98B-A6AA-46E6-BC79-FAAF823DB9EC}.Release|x64.Build.0 = Release|x64
{3A214E06-B95E-4D61-A291-1F8DF2EC10FD}.Debug|Win32.ActiveCfg = Debug|Win32
{3A214E06-B95E-4D61-A291-1F8DF2EC10FD}.Debug|Win32.Build.0 = Debug|Win32
{3A214E06-B95E-4D61-A291-1F8DF2EC10FD}.Debug|x64.ActiveCfg = Debug|x64
@ -491,10 +461,7 @@ Global
{4C3F0F90-CB04-4AC3-B49A-AD8CE115AC2A} = {8B78C654-0550-43A0-B0B0-82304584AB3F}
{D6973076-9317-4EF2-A0B8-B7A18AC0713E} = {C9B5FF09-339F-46B2-BEE1-4704283CEFAC}
{4CEFBC84-C215-11DB-8314-0800200C9A66} = {43E7C20B-0BE5-4774-930A-B875BB50A587}
{EBDA67CA-4A23-4F22-BFBC-B8DBE0580D4F} = {43E7C20B-0BE5-4774-930A-B875BB50A587}
{B162B6F1-E876-4D5F-A1F6-E3A6DC2F4A2C} = {43E7C20B-0BE5-4774-930A-B875BB50A587}
{15CBFEFF-7965-41F5-B4E2-21E8795C9159} = {43E7C20B-0BE5-4774-930A-B875BB50A587}
{CEBDE98B-A6AA-46E6-BC79-FAAF823DB9EC} = {43E7C20B-0BE5-4774-930A-B875BB50A587}
{3A214E06-B95E-4D61-A291-1F8DF2EC10FD} = {43E7C20B-0BE5-4774-930A-B875BB50A587}
{67CAA87B-7CF1-4F93-BB67-21C513F40803} = {43E7C20B-0BE5-4774-930A-B875BB50A587}
{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B} = {4C3F0F90-CB04-4AC3-B49A-AD8CE115AC2A}

0
.vsconfig → project/.vsconfig
View File

11
project/windows/dep/SDL_mixer/SDL_mixer.vcxproj
View File

@ -234,6 +234,17 @@
<ClCompile Include="$(SolutionDir)dependent\SDL_mixer\src\codecs\music_opus.c" />
<ClCompile Include="$(SolutionDir)dependent\SDL_mixer\src\codecs\music_timidity.c" />
<ClCompile Include="$(SolutionDir)dependent\SDL_mixer\src\codecs\music_wav.c" />
<ClCompile Include="$(SolutionDir)dependent\SDL_mixer\src\codecs\native_midi\native_midi_common.c" />
<ClCompile Include="$(SolutionDir)dependent\SDL_mixer\src\codecs\native_midi\native_midi_win32.c" />
<ClCompile Include="$(SolutionDir)dependent\SDL_mixer\src\codecs\timidity\common.c" />
<ClCompile Include="$(SolutionDir)dependent\SDL_mixer\src\codecs\timidity\instrum.c" />
<ClCompile Include="$(SolutionDir)dependent\SDL_mixer\src\codecs\timidity\mix.c" />
<ClCompile Include="$(SolutionDir)dependent\SDL_mixer\src\codecs\timidity\output.c" />
<ClCompile Include="$(SolutionDir)dependent\SDL_mixer\src\codecs\timidity\playmidi.c" />
<ClCompile Include="$(SolutionDir)dependent\SDL_mixer\src\codecs\timidity\readmidi.c" />
<ClCompile Include="$(SolutionDir)dependent\SDL_mixer\src\codecs\timidity\resample.c" />
<ClCompile Include="$(SolutionDir)dependent\SDL_mixer\src\codecs\timidity\tables.c" />
<ClCompile Include="$(SolutionDir)dependent\SDL_mixer\src\codecs\timidity\timidity.c" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">

39
project/windows/dep/SDL_mixer/SDL_mixer.vcxproj.filters
View File

@ -69,6 +69,12 @@
<Extensions>
</Extensions>
</Filter>
<Filter Include="Source Files\native_midi">
<UniqueIdentifier>{83195635-05d6-42a4-9a67-0d7d9668e630}</UniqueIdentifier>
</Filter>
<Filter Include="Source Files\timidity">
<UniqueIdentifier>{f703105d-f40c-4b48-8d70-85fb9f4d2958}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="$(SolutionDir)dependent\SDL_mixer\src\utils.c">
@ -134,5 +140,38 @@
<ClCompile Include="$(SolutionDir)dependent\SDL_mixer\src\codecs\music_wav.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="$(SolutionDir)dependent\SDL_mixer\src\codecs\native_midi\native_midi_win32.c">
<Filter>Source Files\native_midi</Filter>
</ClCompile>
<ClCompile Include="$(SolutionDir)dependent\SDL_mixer\src\codecs\native_midi\native_midi_common.c">
<Filter>Source Files\native_midi</Filter>
</ClCompile>
<ClCompile Include="$(SolutionDir)dependent\SDL_mixer\src\codecs\timidity\common.c">
<Filter>Source Files\timidity</Filter>
</ClCompile>
<ClCompile Include="$(SolutionDir)dependent\SDL_mixer\src\codecs\timidity\instrum.c">
<Filter>Source Files\timidity</Filter>
</ClCompile>
<ClCompile Include="$(SolutionDir)dependent\SDL_mixer\src\codecs\timidity\mix.c">
<Filter>Source Files\timidity</Filter>
</ClCompile>
<ClCompile Include="$(SolutionDir)dependent\SDL_mixer\src\codecs\timidity\output.c">
<Filter>Source Files\timidity</Filter>
</ClCompile>
<ClCompile Include="$(SolutionDir)dependent\SDL_mixer\src\codecs\timidity\playmidi.c">
<Filter>Source Files\timidity</Filter>
</ClCompile>
<ClCompile Include="$(SolutionDir)dependent\SDL_mixer\src\codecs\timidity\readmidi.c">
<Filter>Source Files\timidity</Filter>
</ClCompile>
<ClCompile Include="$(SolutionDir)dependent\SDL_mixer\src\codecs\timidity\resample.c">
<Filter>Source Files\timidity</Filter>
</ClCompile>
<ClCompile Include="$(SolutionDir)dependent\SDL_mixer\src\codecs\timidity\tables.c">
<Filter>Source Files\timidity</Filter>
</ClCompile>
<ClCompile Include="$(SolutionDir)dependent\SDL_mixer\src\codecs\timidity\timidity.c">
<Filter>Source Files\timidity</Filter>
</ClCompile>
</ItemGroup>
</Project>

1
project/windows/dep/libvorbis/libvorbis.vcxproj
View File

@ -186,6 +186,7 @@
<ClCompile Include="$(SolutionDir)dependent\SDL_mixer\external\libvorbis-$(libvorbis_ver)\lib\synthesis.c" />
<ClCompile Include="$(SolutionDir)dependent\SDL_mixer\external\libvorbis-$(libvorbis_ver)\lib\vorbisenc.c" />
<ClCompile Include="$(SolutionDir)dependent\SDL_mixer\external\libvorbis-$(libvorbis_ver)\lib\window.c" />
<ClCompile Include="$(SolutionDir)dependent\SDL_mixer\external\libvorbis-1.3.6\lib\vorbisfile.c" />
</ItemGroup>
<ItemGroup>
<None Include="..\..\vorbis.def" />

156
project/windows/dep/libvorbisfile/libvorbisfile.vcxproj
View File

@ -1,156 +0,0 @@
<?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="Debug|x64">
<Configuration>Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|x64">
<Configuration>Release</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectName>libvorbisfile</ProjectName>
<ProjectGuid>{CEBDE98B-A6AA-46E6-BC79-FAAF823DB9EC}</ProjectGuid>
<RootNamespace>libvorbisfile</RootNamespace>
<Keyword>Win32Proj</Keyword>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v142</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v142</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v142</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v142</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
<Import Project="ver.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
<Import Project="ver.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
<Import Project="ver.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
<Import Project="ver.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.$(Platform)\$(Configuration)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.$(Platform)\$(Configuration)\</IntDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.$(Platform)\$(Configuration)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.$(Platform)\$(Configuration)\</IntDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.$(Platform)\$(Configuration)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.$(Platform)\$(Configuration)\</IntDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.$(Platform)\$(Configuration)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.$(Platform)\$(Configuration)\</IntDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>$(SolutionDir)dependent\SDL_mixer\external\libvorbis-$(libvorbis_ver)\include;$(SolutionDir)dependent\SDL_mixer\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBVORBISFILE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<CallingConvention>Cdecl</CallingConvention>
</ClCompile>
<Lib />
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<Midl>
<TargetEnvironment>X64</TargetEnvironment>
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>$(SolutionDir)dependent\SDL_mixer\external\libvorbis-$(libvorbis_ver)\include;$(SolutionDir)dependent\SDL_mixer\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBVORBISFILE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CallingConvention>Cdecl</CallingConvention>
</ClCompile>
<Lib />
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<AdditionalIncludeDirectories>$(SolutionDir)dependent\SDL_mixer\external\libvorbis-$(libvorbis_ver)\include;$(SolutionDir)dependent\SDL_mixer\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBVORBISFILE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CallingConvention>Cdecl</CallingConvention>
</ClCompile>
<Lib />
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<Midl>
<TargetEnvironment>X64</TargetEnvironment>
</Midl>
<ClCompile>
<AdditionalIncludeDirectories>$(SolutionDir)dependent\SDL_mixer\external\libvorbis-$(libvorbis_ver)\include;$(SolutionDir)dependent\SDL_mixer\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBVORBISFILE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CallingConvention>Cdecl</CallingConvention>
</ClCompile>
<Lib />
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="$(SolutionDir)dependent\SDL_mixer\external\libvorbis-$(libvorbis_ver)\lib\vorbisfile.c" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="$(SolutionDir)dependent\SDL_mixer\external\libvorbis-$(libvorbis_ver)\include\vorbis\vorbisfile.h" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>

4
project/windows/dep/libvorbisfile/libvorbisfile.vcxproj.user
View File

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

14
project/windows/dep/libvorbisfile/ver.props
View File

@ -1,14 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="PropertySheets" />
<PropertyGroup Label="UserMacros">
<libvorbis_ver>1.3.6</libvorbis_ver>
</PropertyGroup>
<PropertyGroup />
<ItemDefinitionGroup />
<ItemGroup>
<BuildMacro Include="libvorbis_ver">
<Value>$(libvorbis_ver)</Value>
</BuildMacro>
</ItemGroup>
</Project>

176
project/windows/dep/native_midi/native_midi.vcxproj
View File

@ -1,176 +0,0 @@
<?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="Debug|x64">
<Configuration>Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|x64">
<Configuration>Release</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectName>native_midi</ProjectName>
<ProjectGuid>{EBDA67CA-4A23-4F22-BFBC-B8DBE0580D4F}</ProjectGuid>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<PlatformToolset>v142</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<PlatformToolset>v142</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<PlatformToolset>v142</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<PlatformToolset>v142</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.$(Platform)\$(Configuration)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.$(Platform)\$(Configuration)\</IntDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.$(Platform)\$(Configuration)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.$(Platform)\$(Configuration)\</IntDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.$(Platform)\$(Configuration)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.$(Platform)\$(Configuration)\</IntDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.$(Platform)\$(Configuration)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.$(Platform)\$(Configuration)\</IntDir>
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<AdditionalIncludeDirectories>$(SolutionDir)dependent\SDL_mixer\include;$(SolutionDir)dependent\SDL_mixer\src\codecs\native_midi;$(SolutionDir)dependent\SDL\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<WarningLevel>Level3</WarningLevel>
<EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
</ClCompile>
<ResourceCompile>
<Culture>0x0409</Culture>
</ResourceCompile>
<Bscmake />
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>$(SolutionDir)dependent\SDL_mixer\include;$(SolutionDir)dependent\SDL_mixer\src\codecs\native_midi;$(SolutionDir)dependent\SDL\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>OldStyle</DebugInformationFormat>
<EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
</ClCompile>
<ResourceCompile>
<Culture>0x0409</Culture>
</ResourceCompile>
<Bscmake />
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<Midl>
<TargetEnvironment>X64</TargetEnvironment>
</Midl>
<ClCompile>
<AdditionalIncludeDirectories>$(SolutionDir)dependent\SDL_mixer\include;$(SolutionDir)dependent\SDL_mixer\src\codecs\native_midi;$(SolutionDir)dependent\SDL\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<WarningLevel>Level3</WarningLevel>
<EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
</ClCompile>
<ResourceCompile>
<Culture>0x0409</Culture>
</ResourceCompile>
<Bscmake />
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<Midl>
<TargetEnvironment>X64</TargetEnvironment>
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>$(SolutionDir)dependent\SDL_mixer\include;$(SolutionDir)dependent\SDL_mixer\src\codecs\native_midi;$(SolutionDir)dependent\SDL\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>OldStyle</DebugInformationFormat>
<EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
</ClCompile>
<ResourceCompile>
<Culture>0x0409</Culture>
</ResourceCompile>
<Bscmake />
</ItemDefinitionGroup>
<ItemGroup>
<ClInclude Include="$(SolutionDir)dependent\SDL_mixer\src\codecs\native_midi\native_midi.h" />
<ClInclude Include="$(SolutionDir)dependent\SDL_mixer\src\codecs\native_midi\native_midi_common.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="$(SolutionDir)dependent\SDL_mixer\src\codecs\native_midi\native_midi_common.c">
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ClCompile Include="$(SolutionDir)dependent\SDL_mixer\src\codecs\native_midi\native_midi_win32.c">
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>

3
project/windows/dep/native_midi/native_midi.vcxproj.user
View File

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

174
project/windows/dep/timidity/timidity.vcxproj
View File

@ -1,174 +0,0 @@
<?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="Debug|x64">
<Configuration>Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|x64">
<Configuration>Release</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
</ItemGroup>
<ItemGroup>
<ClCompile Include="$(SolutionDir)dependent\SDL_mixer\src\codecs\timidity\common.c" />
<ClCompile Include="$(SolutionDir)dependent\SDL_mixer\src\codecs\timidity\instrum.c" />
<ClCompile Include="$(SolutionDir)dependent\SDL_mixer\src\codecs\timidity\mix.c" />
<ClCompile Include="$(SolutionDir)dependent\SDL_mixer\src\codecs\timidity\output.c" />
<ClCompile Include="$(SolutionDir)dependent\SDL_mixer\src\codecs\timidity\playmidi.c" />
<ClCompile Include="$(SolutionDir)dependent\SDL_mixer\src\codecs\timidity\readmidi.c" />
<ClCompile Include="$(SolutionDir)dependent\SDL_mixer\src\codecs\timidity\resample.c" />
<ClCompile Include="$(SolutionDir)dependent\SDL_mixer\src\codecs\timidity\tables.c" />
<ClCompile Include="$(SolutionDir)dependent\SDL_mixer\src\codecs\timidity\timidity.c" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="$(SolutionDir)dependent\SDL_mixer\src\codecs\timidity\common.h" />
<ClInclude Include="$(SolutionDir)dependent\SDL_mixer\src\codecs\timidity\instrum.h" />
<ClInclude Include="$(SolutionDir)dependent\SDL_mixer\src\codecs\timidity\mix.h" />
<ClInclude Include="$(SolutionDir)dependent\SDL_mixer\src\codecs\timidity\options.h" />
<ClInclude Include="$(SolutionDir)dependent\SDL_mixer\src\codecs\timidity\output.h" />
<ClInclude Include="$(SolutionDir)dependent\SDL_mixer\src\codecs\timidity\playmidi.h" />
<ClInclude Include="$(SolutionDir)dependent\SDL_mixer\src\codecs\timidity\readmidi.h" />
<ClInclude Include="$(SolutionDir)dependent\SDL_mixer\src\codecs\timidity\resample.h" />
<ClInclude Include="$(SolutionDir)dependent\SDL_mixer\src\codecs\timidity\tables.h" />
<ClInclude Include="$(SolutionDir)dependent\SDL_mixer\src\codecs\timidity\timidity.h" />
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectName>timidity</ProjectName>
<ProjectGuid>{B162B6F1-E876-4D5F-A1F6-E3A6DC2F4A2C}</ProjectGuid>
<RootNamespace>timidity</RootNamespace>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<PlatformToolset>v142</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<PlatformToolset>v142</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<PlatformToolset>v142</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<PlatformToolset>v142</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.$(Platform)\$(Configuration)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.$(Platform)\$(Configuration)\</IntDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.$(Platform)\$(Configuration)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.$(Platform)\$(Configuration)\</IntDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.$(Platform)\$(Configuration)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.$(Platform)\$(Configuration)\</IntDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.$(Platform)\$(Configuration)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.$(Platform)\$(Configuration)\</IntDir>
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<AdditionalIncludeDirectories>$(SolutionDir)dependent\SDL_mixer\include;$(SolutionDir)dependent\SDL\include</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<WarningLevel>Level3</WarningLevel>
<EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
</ClCompile>
<ResourceCompile>
<Culture>0x0409</Culture>
</ResourceCompile>
<Bscmake />
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>$(SolutionDir)dependent\SDL_mixer\include;$(SolutionDir)dependent\SDL\include</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>OldStyle</DebugInformationFormat>
<EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
</ClCompile>
<ResourceCompile>
<Culture>0x0409</Culture>
</ResourceCompile>
<Bscmake />
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<Midl>
<TargetEnvironment>X64</TargetEnvironment>
</Midl>
<ClCompile>
<AdditionalIncludeDirectories>$(SolutionDir)dependent\SDL_mixer\include;$(SolutionDir)dependent\SDL\include</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<WarningLevel>Level3</WarningLevel>
<EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
</ClCompile>
<ResourceCompile>
<Culture>0x0409</Culture>
</ResourceCompile>
<Bscmake />
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<Midl>
<TargetEnvironment>X64</TargetEnvironment>
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>$(SolutionDir)dependent\SDL_mixer\include;$(SolutionDir)dependent\SDL\include</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>OldStyle</DebugInformationFormat>
<EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
</ClCompile>
<ResourceCompile>
<Culture>0x0409</Culture>
</ResourceCompile>
<Bscmake />
</ItemDefinitionGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>

3
project/windows/dep/timidity/timidity.vcxproj.user
View File

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

3
project/windows/dep/zlib/zlib.vcxproj
View File

@ -203,9 +203,6 @@
<ClCompile Include="$(SolutionDir)dependent\zlib\contrib\minizip\zip.c" />
<ClCompile Include="$(SolutionDir)dependent\zlib\zutil.c" />
</ItemGroup>
<ItemGroup>
<None Include="zlibvc.def" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>

13
project/windows/lib/gsdl2/gsdl2.vcxproj
View File

@ -85,18 +85,12 @@
<ProjectReference Include="..\..\dep\libpng\libpng.vcxproj">
<Project>{d6973076-9317-4ef2-a0b8-b7a18ac0713e}</Project>
</ProjectReference>
<ProjectReference Include="..\..\dep\libvorbisfile\libvorbisfile.vcxproj">
<Project>{cebde98b-a6aa-46e6-bc79-faaf823db9ec}</Project>
</ProjectReference>
<ProjectReference Include="..\..\dep\libvorbis\libvorbis.vcxproj">
<Project>{3a214e06-b95e-4d61-a291-1f8df2ec10fd}</Project>
</ProjectReference>
<ProjectReference Include="..\..\dep\libwebp\libwebp.vcxproj">
<Project>{ea1d1b51-f067-3c93-8f54-669095725f4b}</Project>
</ProjectReference>
<ProjectReference Include="..\..\dep\native_midi\native_midi.vcxproj">
<Project>{ebda67ca-4a23-4f22-bfbc-b8dbe0580d4f}</Project>
</ProjectReference>
<ProjectReference Include="..\..\dep\SDL\SDL.vcxproj">
<Project>{81ce8daf-ebb2-4761-8e45-b71abcca8c68}</Project>
</ProjectReference>
@ -109,9 +103,6 @@
<ProjectReference Include="..\..\dep\SDL_ttf\SDL_ttf.vcxproj">
<Project>{dddbd07d-dc76-4af6-8d02-3e2deb6ee255}</Project>
</ProjectReference>
<ProjectReference Include="..\..\dep\timidity\timidity.vcxproj">
<Project>{b162b6f1-e876-4d5f-a1f6-e3a6dc2f4a2c}</Project>
</ProjectReference>
<ProjectReference Include="..\..\dep\zlib\zlib.vcxproj">
<Project>{5fca3894-feb8-4c7f-b5fa-baff2e69f619}</Project>
</ProjectReference>
@ -203,6 +194,7 @@
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;LUASDL2_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<AdditionalIncludeDirectories>$(SolutionDir)source\lua;$(SolutionDir)dependent\SDL\include;$(SolutionDir)dependent\SDL_image;$(SolutionDir)dependent\SDL_mixer\include;$(SolutionDir)dependent\SDL_ttf;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<WarningLevel>Level3</WarningLevel>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
@ -219,6 +211,7 @@
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;LUASDL2_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<AdditionalIncludeDirectories>$(SolutionDir)source\lua;$(SolutionDir)dependent\SDL\include;$(SolutionDir)dependent\SDL_image;$(SolutionDir)dependent\SDL_mixer\include;$(SolutionDir)dependent\SDL_ttf;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<WarningLevel>Level3</WarningLevel>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
@ -233,6 +226,7 @@
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LUASDL2_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(SolutionDir)source\lua;$(SolutionDir)dependent\SDL\include;$(SolutionDir)dependent\SDL_image;$(SolutionDir)dependent\SDL_mixer\include;$(SolutionDir)dependent\SDL_ttf;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<WarningLevel>Level3</WarningLevel>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
@ -251,6 +245,7 @@
<PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;LUASDL2_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(SolutionDir)source\lua;$(SolutionDir)dependent\SDL\include;$(SolutionDir)dependent\SDL_image;$(SolutionDir)dependent\SDL_mixer\include;$(SolutionDir)dependent\SDL_ttf;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<WarningLevel>Level3</WarningLevel>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>

5
source/lib/ggelua/lfs.c
View File

@ -1180,7 +1180,7 @@ int luaopen_lfs(lua_State * L)
//set_info(L);
return 1;
}
#if defined(_WIN32)
void UTF8ToUnicode(const char* UTF8, WCHAR* UNI) {
int len = MultiByteToWideChar(CP_UTF8, 0, UTF8, -1, NULL, 0);
MultiByteToWideChar(CP_UTF8, 0, UTF8, -1, UNI, len);
@ -1282,4 +1282,5 @@ int utf8_utime(const char* _FileName, const struct utimbuf* _Time) {
memset(Path, 0, sizeof(Path));
UTF8ToUnicode(_FileName, Path);
return _wutime(Path, (struct _utimbuf*)_Time);
}
}
#endif

3
source/lib/ggelua/luaopen.h
View File

@ -2,7 +2,8 @@
#include "lua.h"
#include "lualib.h"
#include "lauxlib.h"
int luaopen_des56(lua_State* L);
int luaopen_zlib(lua_State* L);
int luaopen_md5(lua_State* L);
int luaopen_base64(lua_State* L);

2
source/lib/ggelua/luuid.c
View File

@ -16,7 +16,7 @@ luuid(lua_State* L) {
GUID guid = { 0 };
CoCreateGuid(&guid);
sprintf(buf, "%.8X%.4X%.4X%.8X%.8X", guid.Data1, guid.Data2, guid.Data3, ((unsigned int*)(guid.Data4))[0], ((unsigned int*)(guid.Data4))[1]);
#else
#else//TODO
// uuid_t guid;
// uuid_generate(guid);
// sprintf(buf,"%.8X%.8X%.8X%.8X",((unsigned int*)(guid))[0],((unsigned int*)(guid))[1],((unsigned int*)(guid))[2],((unsigned int*)(guid))[3]);

19
source/lib/ggelua/main.c
View File

@ -14,8 +14,8 @@
#endif
static int LUA_ANSI2UTF8(lua_State *L){
const char* str = luaL_checkstring(L,1);
#ifdef __WIN32__
const char* str = luaL_checkstring(L, 1);
luaL_Buffer b;
WCHAR* temp ;
char* p ;
@ -34,8 +34,8 @@ static int LUA_ANSI2UTF8(lua_State *L){
}
static int LUA_UTF82ANSI(lua_State *L){
const char* str = luaL_checkstring(L,1);
#ifdef __WIN32__
const char* str = luaL_checkstring(L, 1);
luaL_Buffer b;
WCHAR* temp ;
char* p ;
@ -54,6 +54,7 @@ static int LUA_UTF82ANSI(lua_State *L){
}
static int LUA_GetRunPath(lua_State *L) {
#ifdef __WIN32__
luaL_Buffer b;
char *p;
DWORD n;
@ -62,10 +63,12 @@ static int LUA_GetRunPath(lua_State *L) {
p[n] = 0;
luaL_pushresultsize(&b,strrchr(p, '\\')-p); /* close buffer */
LUA_ANSI2UTF8(L);
#endif
return 1;
}
static int LUA_GetCurPath(lua_State *L) {
#ifdef __WIN32__
luaL_Buffer b;
char* p;
DWORD n;
@ -73,15 +76,18 @@ static int LUA_GetCurPath(lua_State *L) {
n = GetCurrentDirectory(LUAL_BUFFERSIZE, p);
luaL_pushresultsize(&b,n); /* close buffer */
LUA_ANSI2UTF8(L);
#endif
return 1;
}
static int LUA_SetCurPath(lua_State *L) {
#ifdef __WIN32__
const char* str;
LUA_UTF82ANSI(L);
str = luaL_checkstring(L,-1);
lua_pushboolean(L,SetCurrentDirectory(str));
#endif
return 1;
}
@ -104,8 +110,11 @@ static int LUA_StateThread(void * entry){
// lua_seti(L, -2, i);
//}
//lua_setfield(L, -2, "arg");//gge.arg
#ifdef __WIN32__
lua_pushboolean(L, GetConsoleOutputCP()== 65001);
#else
lua_pushboolean(L, 0);
#endif
lua_setfield(L, -2, "isconsole");//gge.isconsole
lua_pushboolean(L, ggepack == NULL);
lua_setfield(L, -2, "isdebug");//gge.isdebug
@ -241,11 +250,11 @@ static const luaL_Reg lib_list[] = {
};
LUALIB_API int luaopen_ggelua(lua_State *L) {
LUAMOD_API int luaopen_ggelua(lua_State *L) {
lua_pushstring(L, "GGE 1.0");
lua_setglobal(L, "_GGEVERSION");
//ÄÚÖÃÄ£¿é
lua_getfield(L, LUA_REGISTRYINDEX, LUA_PRELOAD_TABLE);//PRELOAD
lua_getfield(L, LUA_REGISTRYINDEX, LUA_PRELOAD_TABLE);//package.preload
luaL_setfuncs(L, lib_list,0);
lua_pop(L, 1); // remove PRELOAD

81
source/lib/gsdl2/audio.c
View File

@ -37,8 +37,8 @@ static int LUA_GetCurrentAudioDriver(lua_State *L)
//TODO
static int LUA_OpenAudio(lua_State* L)
{
SDL_AudioSpec* desired;
SDL_AudioSpec* obtained;
//SDL_AudioSpec* desired;
//SDL_AudioSpec* obtained;
//SDL_OpenAudio(desired,obtained)
return 0;
}
@ -62,11 +62,11 @@ static int LUA_GetAudioDeviceName(lua_State *L)
//TODO
static int LUA_OpenAudioDevice(lua_State *L)
{
const char* device = luaL_checkstring(L, 1);
int iscapture = (int)luaL_checkinteger(L, 2);
SDL_AudioSpec* desired;
SDL_AudioSpec* obtained;
int allowed_changes;
//const char* device = luaL_checkstring(L, 1);
//int iscapture = (int)luaL_checkinteger(L, 2);
//SDL_AudioSpec* desired;
//SDL_AudioSpec* obtained;
//int allowed_changes;
//SDL_OpenAudioDevice();
return 1;
@ -103,10 +103,10 @@ static int LUA_PauseAudioDevice(lua_State *L)
//TODO
static int LUA_LoadWAV_RW(lua_State* L)
{
SDL_RWops* src = *(SDL_RWops**)luaL_checkudata(L, 1, "SDL_RWops");
SDL_AudioSpec spec;
Uint8* buffer;
Uint32 length;
//SDL_RWops* src = *(SDL_RWops**)luaL_checkudata(L, 1, "SDL_RWops");
//SDL_AudioSpec spec;
//Uint8* buffer;
//Uint32 length;
//SDL_LoadWAV_RW(src, SDL_FALSE, &spec, &buffer, &length)
@ -116,10 +116,10 @@ static int LUA_LoadWAV_RW(lua_State* L)
static int LUA_LoadWAV(lua_State *L)
{
const char *path = luaL_checkstring(L, 1);
SDL_AudioSpec spec;
Uint8 *buffer;
Uint32 length;
//const char *path = luaL_checkstring(L, 1);
//SDL_AudioSpec spec;
//Uint8 *buffer;
//Uint32 length;
//SDL_LoadWAV(path, &spec, &buffer, &length)
@ -128,20 +128,20 @@ static int LUA_LoadWAV(lua_State *L)
static int LUA_FreeWAV(lua_State *L)
{
Uint8 * audio_buf;
//Uint8 * audio_buf;
//SDL_FreeWAV();
return 0;
}
static int LUA_BuildAudioCVT(lua_State *L)
{
SDL_AudioCVT* cvt;
SDL_AudioFormat src_format;
Uint8 src_channels;
int src_rate;
SDL_AudioFormat dst_format;
Uint8 dst_channels;
int dst_rate;
//SDL_AudioCVT* cvt;
//SDL_AudioFormat src_format;
//Uint8 src_channels;
//int src_rate;
//SDL_AudioFormat dst_format;
//Uint8 dst_channels;
//int dst_rate;
// luaL_checktype(L, index, LUA_TTABLE);
//
@ -161,7 +161,7 @@ static int LUA_BuildAudioCVT(lua_State *L)
static int LUA_ConvertAudio(lua_State *L)
{
SDL_AudioCVT cvt;
//SDL_AudioCVT cvt;
//lua_pushboolean(L,SDL_ConvertAudio(&cvt)==0);
return 0;
@ -177,11 +177,11 @@ static int LUA_ConvertAudio(lua_State *L)
static int LUA_MixAudio(lua_State *L)
{
char* dst;
size_t len;
const char *src = luaL_checklstring(L, 1, &len);
int volume = (int)luaL_optinteger(L,2,SDL_MIX_MAXVOLUME);
//char* dst;
//size_t len;
//const char *src = luaL_checklstring(L, 1, &len);
//int volume = (int)luaL_optinteger(L,2,SDL_MIX_MAXVOLUME);
//
//SDL_MixAudio((Uint8 *)data, (const Uint8 *)src, len, volume);
return 1;
@ -189,13 +189,13 @@ static int LUA_MixAudio(lua_State *L)
static int LUA_MixAudioFormat(lua_State *L)
{
char* dst;
size_t len;
const char *src = luaL_checklstring(L, 1, &len);
SDL_AudioFormat format = luaL_checkinteger(L,2);
int volume = (int)luaL_optinteger(L,2,SDL_MIX_MAXVOLUME);
//char* dst;
//size_t len;
//const char *src = luaL_checklstring(L, 1, &len);
//SDL_AudioFormat format = luaL_checkinteger(L,2);
//int volume = (int)luaL_optinteger(L,2,SDL_MIX_MAXVOLUME);
//
//SDL_MixAudioFormat((Uint8 *)data, (const Uint8 *)src, format, len, volume);
@ -205,9 +205,9 @@ static int LUA_MixAudioFormat(lua_State *L)
static int LUA_QueueAudio(lua_State *L)
{
SDL_AudioDeviceID dev = (SDL_AudioDeviceID)luaL_checkinteger(L, 1);
size_t len;
const char *data = luaL_checklstring(L, 2, &len);
//SDL_AudioDeviceID dev = (SDL_AudioDeviceID)luaL_checkinteger(L, 1);
//size_t len;
//const char *data = luaL_checklstring(L, 2, &len);
//SDL_QueueAudio(dev, (void *)data, len)
@ -216,8 +216,8 @@ static int LUA_QueueAudio(lua_State *L)
static int LUA_DequeueAudio(lua_State *L)
{
SDL_AudioDeviceID dev = (SDL_AudioDeviceID)luaL_checkinteger(L, 1);
size_t len = luaL_checkinteger(L, 2);
//SDL_AudioDeviceID dev = (SDL_AudioDeviceID)luaL_checkinteger(L, 1);
//size_t len = luaL_checkinteger(L, 2);
// len = SDL_DequeueAudio(dev, data, len);
@ -296,6 +296,7 @@ static const luaL_Reg sdl_funcs[] = {
{"GetAudioDeviceName",LUA_GetAudioDeviceName},
{"OpenAudioDevice",LUA_OpenAudioDevice},
{"GetAudioStatus",LUA_GetAudioStatus},
{"GetAudioDeviceStatus",LUA_GetAudioDeviceStatus},
{"PauseAudio",LUA_PauseAudio},
{"PauseAudioDevice",LUA_PauseAudioDevice},
{"LoadWAV_RW",LUA_LoadWAV_RW},

2
source/lib/gsdl2/events.c
View File

@ -541,8 +541,6 @@ static int LUA_GetEvent(lua_State *L){
static int LUA_CreateEvent(lua_State *L)
{
SDL_Event *ev = (SDL_Event*)lua_newuserdata(L, sizeof (SDL_Event));
luaL_setmetatable(L, "SDL_Event");
return 1;
}

30
source/lib/gsdl2/gge.c
View File

@ -1,18 +1,19 @@
#include "gge.h"
#include <SDL_image.h>
#include <SDL_syswm.h>
#include <Windows.h>
//TextureÈ¡ÏñËØ
int GGE_GetTexturePixel(lua_State *L)
{
GGE_Texture * tex = (GGE_Texture*)luaL_checkudata(L, 1, "SDL_Texture");
int x = (int)luaL_checkinteger(L,2);
int y = (int)luaL_checkinteger(L,3);
int format,access, w, h;
if (!tex->rect && SDL_QueryTexture(tex->tex , &format, &access, &w, &h)==0 && access==SDL_TEXTUREACCESS_STREAMING && x>=0 && y>=0 && x<w && y<h){
Uint32 format;
int access, w, h;
if (!tex->rect && SDL_QueryTexture(tex->tex , &format, &access, &w, &h)==0 &&
access==SDL_TEXTUREACCESS_STREAMING && x>=0 && y>=0 && x<w && y<h){
if(!tex->locked){
SDL_LockTexture(tex->tex,NULL,&tex->pixels,&tex->pitch);
SDL_LockTexture(tex->tex,NULL,(void**)&tex->pixels,&tex->pitch);
tex->locked = 1;
}
if (!tex->format)
@ -57,11 +58,13 @@ int LUA_SetTexturePixel(lua_State *L)
int g = (int)luaL_optinteger(L,5,0);
int b = (int)luaL_optinteger(L,6,0);
int a = (int)luaL_optinteger(L,7,0);
int format,access, w, h;
Uint32 format;
int access, w, h;
if (!tex->rect && SDL_QueryTexture(tex->tex , &format, &access, &w, &h)==0 && access==SDL_TEXTUREACCESS_STREAMING && x>=0 && y>=0 && x<w && y<h){
if (!tex->rect && SDL_QueryTexture(tex->tex , &format, &access, &w, &h)==0 &&
access==SDL_TEXTUREACCESS_STREAMING && x>=0 && y>=0 && x<w && y<h){
if(!tex->locked){
SDL_LockTexture(tex->tex,NULL,&tex->pixels,&tex->pitch);
SDL_LockTexture(tex->tex,NULL, (void**)&tex->pixels,&tex->pitch);
tex->locked = 1;
}
if (!tex->format)
@ -86,13 +89,14 @@ int LUA_SetTexturePixel(lua_State *L)
int GGE_TextureToGrayscale(lua_State *L)
{
GGE_Texture * tex = (GGE_Texture*)luaL_checkudata(L, 1, "SDL_Texture");
int access,format, w, h;
Uint32 format;
int access, w, h;
if (!tex->rect && SDL_QueryTexture(tex->tex , &format, &access, &w, &h)==0 && access==SDL_TEXTUREACCESS_STREAMING){
int i;
Uint8 r,g,b,a,gray;
if(!tex->locked)
SDL_LockTexture(tex->tex,NULL,&tex->pixels,&tex->pitch);
SDL_LockTexture(tex->tex,NULL,(void**)&tex->pixels,&tex->pitch);
if (!tex->format)
tex->format = SDL_AllocFormat(format);
//SDL_ConvertPixels
@ -239,6 +243,8 @@ int GGE_GetSurfaceRect(lua_State *L)
return 0;
}
//ÁÄÌì´°¿Ú
#ifdef _WIN32
#include <Windows.h>
int GGE_SetParent(lua_State *L)
{
SDL_Window * Child = *(SDL_Window**)luaL_checkudata(L, 1, "SDL_Window");
@ -262,9 +268,11 @@ int GGE_SetParent(lua_State *L)
return 0;
}
#endif
static const luaL_Reg window_funcs[] = {
#ifdef _WIN32
{"SetParent",GGE_SetParent},
#endif
{ NULL, NULL}
};

44
source/lib/gsdl2/haptic.c
View File

@ -31,7 +31,7 @@ static int LUA_HapticOpened(lua_State *L)
static int LUA_HapticIndex(lua_State *L)
{
SDL_Haptic * ud = *(SDL_Haptic**)luaL_checkudata(L, 1, "SDL_Haptic");
//SDL_Haptic * ud = *(SDL_Haptic**)luaL_checkudata(L, 1, "SDL_Haptic");
//SDL_HapticIndex
return 1;
}
@ -52,147 +52,147 @@ static int LUA_HapticOpenFromMouse(lua_State *L)
static int LUA_HapticClose(lua_State *L)
{
SDL_Haptic * ud = *(SDL_Haptic**)luaL_checkudata(L, 1, "SDL_Haptic");
//SDL_Haptic * ud = *(SDL_Haptic**)luaL_checkudata(L, 1, "SDL_Haptic");
//SDL_HapticClose
return 1;
}
static int LUA_HapticNumEffects(lua_State *L)
{
SDL_Haptic * ud = *(SDL_Haptic**)luaL_checkudata(L, 1, "SDL_Haptic");
//SDL_Haptic * ud = *(SDL_Haptic**)luaL_checkudata(L, 1, "SDL_Haptic");
//SDL_HapticNumEffects
return 1;
}
static int LUA_HapticNumEffectsPlaying(lua_State *L)
{
SDL_Haptic * ud = *(SDL_Haptic**)luaL_checkudata(L, 1, "SDL_Haptic");
//SDL_Haptic * ud = *(SDL_Haptic**)luaL_checkudata(L, 1, "SDL_Haptic");
//SDL_HapticNumEffectsPlaying
return 1;
}
static int LUA_HapticQuery(lua_State *L)
{
SDL_Haptic * ud = *(SDL_Haptic**)luaL_checkudata(L, 1, "SDL_Haptic");
//SDL_Haptic * ud = *(SDL_Haptic**)luaL_checkudata(L, 1, "SDL_Haptic");
//SDL_HapticQuery
return 1;
}
static int LUA_HapticNumAxes(lua_State *L)
{
SDL_Haptic * ud = *(SDL_Haptic**)luaL_checkudata(L, 1, "SDL_Haptic");
//SDL_Haptic * ud = *(SDL_Haptic**)luaL_checkudata(L, 1, "SDL_Haptic");
//SDL_HapticNumAxes
return 1;
}
static int LUA_HapticEffectSupported(lua_State *L)
{
SDL_Haptic * ud = *(SDL_Haptic**)luaL_checkudata(L, 1, "SDL_Haptic");
//SDL_Haptic * ud = *(SDL_Haptic**)luaL_checkudata(L, 1, "SDL_Haptic");
//SDL_HapticEffectSupported
return 1;
}
static int LUA_HapticNewEffect(lua_State *L)
{
SDL_Haptic * ud = *(SDL_Haptic**)luaL_checkudata(L, 1, "SDL_Haptic");
//SDL_Haptic * ud = *(SDL_Haptic**)luaL_checkudata(L, 1, "SDL_Haptic");
//SDL_HapticNewEffect
return 1;
}
static int LUA_HapticUpdateEffect(lua_State *L)
{
SDL_Haptic * ud = *(SDL_Haptic**)luaL_checkudata(L, 1, "SDL_Haptic");
//SDL_Haptic * ud = *(SDL_Haptic**)luaL_checkudata(L, 1, "SDL_Haptic");
//SDL_HapticUpdateEffect
return 1;
}
static int LUA_HapticRunEffect(lua_State *L)
{
SDL_Haptic * ud = *(SDL_Haptic**)luaL_checkudata(L, 1, "SDL_Haptic");
//SDL_Haptic * ud = *(SDL_Haptic**)luaL_checkudata(L, 1, "SDL_Haptic");
//SDL_HapticRunEffect
return 1;
}
static int LUA_HapticStopEffect(lua_State *L)
{
SDL_Haptic * ud = *(SDL_Haptic**)luaL_checkudata(L, 1, "SDL_Haptic");
//SDL_Haptic * ud = *(SDL_Haptic**)luaL_checkudata(L, 1, "SDL_Haptic");
//SDL_HapticStopEffect
return 1;
}
static int LUA_HapticDestroyEffect(lua_State *L)
{
SDL_Haptic * ud = *(SDL_Haptic**)luaL_checkudata(L, 1, "SDL_Haptic");
//SDL_Haptic * ud = *(SDL_Haptic**)luaL_checkudata(L, 1, "SDL_Haptic");
//SDL_HapticDestroyEffect
return 1;
}
static int LUA_HapticGetEffectStatus(lua_State *L)
{
SDL_Haptic * ud = *(SDL_Haptic**)luaL_checkudata(L, 1, "SDL_Haptic");
//SDL_Haptic * ud = *(SDL_Haptic**)luaL_checkudata(L, 1, "SDL_Haptic");
//SDL_HapticGetEffectStatus
return 1;
}
static int LUA_HapticSetGain(lua_State *L)
{
SDL_Haptic * ud = *(SDL_Haptic**)luaL_checkudata(L, 1, "SDL_Haptic");
//SDL_Haptic * ud = *(SDL_Haptic**)luaL_checkudata(L, 1, "SDL_Haptic");
//SDL_HapticSetGain
return 1;
}
static int LUA_HapticSetAutocenter(lua_State *L)
{
SDL_Haptic * ud = *(SDL_Haptic**)luaL_checkudata(L, 1, "SDL_Haptic");
//SDL_Haptic * ud = *(SDL_Haptic**)luaL_checkudata(L, 1, "SDL_Haptic");
//SDL_HapticSetAutocenter
return 1;
}
static int LUA_HapticPause(lua_State *L)
{
SDL_Haptic * ud = *(SDL_Haptic**)luaL_checkudata(L, 1, "SDL_Haptic");
//SDL_Haptic * ud = *(SDL_Haptic**)luaL_checkudata(L, 1, "SDL_Haptic");
//SDL_HapticPause
return 1;
}
static int LUA_HapticUnpause(lua_State *L)
{
SDL_Haptic * ud = *(SDL_Haptic**)luaL_checkudata(L, 1, "SDL_Haptic");
//SDL_Haptic * ud = *(SDL_Haptic**)luaL_checkudata(L, 1, "SDL_Haptic");
//SDL_HapticUnpause
return 1;
}
static int LUA_HapticStopAll(lua_State *L)
{
SDL_Haptic * ud = *(SDL_Haptic**)luaL_checkudata(L, 1, "SDL_Haptic");
//SDL_Haptic * ud = *(SDL_Haptic**)luaL_checkudata(L, 1, "SDL_Haptic");
//SDL_HapticStopAll
return 1;
}
static int LUA_HapticRumbleSupported(lua_State *L)
{
SDL_Haptic * ud = *(SDL_Haptic**)luaL_checkudata(L, 1, "SDL_Haptic");
//SDL_Haptic * ud = *(SDL_Haptic**)luaL_checkudata(L, 1, "SDL_Haptic");
//SDL_HapticRumbleSupported
return 1;
}
static int LUA_HapticRumbleInit(lua_State *L)
{
SDL_Haptic * ud = *(SDL_Haptic**)luaL_checkudata(L, 1, "SDL_Haptic");
//SDL_Haptic * ud = *(SDL_Haptic**)luaL_checkudata(L, 1, "SDL_Haptic");
//SDL_HapticRumbleInit
return 1;
}
static int LUA_HapticRumblePlay(lua_State *L)
{
SDL_Haptic * ud = *(SDL_Haptic**)luaL_checkudata(L, 1, "SDL_Haptic");
//SDL_Haptic * ud = *(SDL_Haptic**)luaL_checkudata(L, 1, "SDL_Haptic");
//SDL_HapticRumblePlay
return 1;
}
static int LUA_HapticRumbleStop(lua_State *L)
{
SDL_Haptic * ud = *(SDL_Haptic**)luaL_checkudata(L, 1, "SDL_Haptic");
//SDL_Haptic * ud = *(SDL_Haptic**)luaL_checkudata(L, 1, "SDL_Haptic");
//SDL_HapticRumbleStop
return 1;
}

6
source/lib/gsdl2/pixels.c
View File

@ -67,7 +67,7 @@ static int LUA_AllocPalette(lua_State *L)
static int LUA_SetPixelFormatPalette(lua_State *L)
{
SDL_PixelFormat *pf = *(SDL_PixelFormat**)luaL_checkudata(L, 1, "SDL_PixelFormat");
//SDL_PixelFormat *pf = *(SDL_PixelFormat**)luaL_checkudata(L, 1, "SDL_PixelFormat");
//lua_pushinteger(L,SDL_SetPixelFormatPalette(pf,));
return 0;
}
@ -132,8 +132,8 @@ static int LUA_GetRGBA(lua_State *L)//
static int LUA_CalculateGammaRamp(lua_State *L)
{
float gamma = (float)luaL_checknumber(L,1);
Uint16 * ramp;
//float gamma = (float)luaL_checknumber(L,1);
//Uint16 * ramp;
//SDL_CalculateGammaRamp(gamma,ramp);
return 0;
}

4
source/lib/gsdl2/renderer.c
View File

@ -158,7 +158,7 @@ static int LUA_CreateTextureFromSurface(lua_State *L)
if (tex)
{
Uint8 r, g, b, a;
SDL_BlendMode mode;
//SDL_BlendMode mode;
SDL_GetSurfaceColorMod(sf, &r, &g, &b);
SDL_SetTextureColorMod(tex, r, g, b);
@ -301,7 +301,7 @@ static int LUA_LockTexture(lua_State *L)
GGE_Texture * tex = (GGE_Texture*)luaL_checkudata(L, 1, "SDL_Texture");
SDL_Rect * rect= rect = (SDL_Rect*)luaL_testudata(L, 2, "SDL_Rect");
if (tex->locked == 0 && SDL_LockTexture(tex->tex,rect,&tex->pixels,&tex->pitch)==0)
if (tex->locked == 0 && SDL_LockTexture(tex->tex,rect,(void**)&tex->pixels,&tex->pitch)==0)
{
tex->rect = rect;
tex->locked = 1;

1
source/lib/gsdl2/sdl_ttf.c
View File

@ -1,6 +1,5 @@
#include "gge.h"
#include <SDL_ttf.h>
#include <windows.h>
static int LUA_TTF_VERSION(lua_State *L)
{

4
source/lib/gsdl2/surface.c
View File

@ -96,8 +96,8 @@ static int LUA_FreeSurface(lua_State *L)
static int LUA_SetSurfacePalette(lua_State *L)
{
SDL_Surface * sf = *(SDL_Surface**)luaL_checkudata(L, 1, "SDL_Surface");
SDL_Palette palette;//?
//SDL_Surface * sf = *(SDL_Surface**)luaL_checkudata(L, 1, "SDL_Surface");
//SDL_Palette palette;//?
//if (SDL_SetSurfacePalette(sf, &palette)== 0){
// lua_pushboolean(L,1);

1
source/lib/gsdl2/thread.c
View File

@ -171,7 +171,6 @@ static int LUA_GetThreadID(lua_State *L)
static int LUA_SetThreadPriority(lua_State *L)
{
GGE_Thread * ud = (GGE_Thread*)luaL_checkudata(L, 1, "SDL_Thread");
static const char *const opts[] = {"SDL_THREAD_PRIORITY_LOW", "SDL_THREAD_PRIORITY_NORMAL", "SDL_THREAD_PRIORITY_HIGH","SDL_THREAD_PRIORITY_TIME_CRITICAL", NULL};
lua_pushinteger(L,SDL_SetThreadPriority((SDL_ThreadPriority)luaL_checkoption(L, 2, NULL, opts)));

2
source/lib/gsdl2/timer.c
View File

@ -33,7 +33,7 @@ typedef struct _TimeInfo
}TimeInfo;
static Uint32 LUA_TimerCallback(Uint32 interval, void* param) {
TimeInfo* info = (TimeInfo*)param;
//TimeInfo* info = (TimeInfo*)param;
return 0;
}

22
source/lib/gsdl2/video.c
View File

@ -537,9 +537,9 @@ static int LUA_UpdateWindowSurface(lua_State *L)
//TODO
static int LUA_UpdateWindowSurfaceRects(lua_State *L)
{
SDL_Window * win = *(SDL_Window**)luaL_checkudata(L, 1, "SDL_Window");
SDL_Rect * rect = (SDL_Rect*)luaL_checkudata(L, 2, "SDL_Rect");
int numrects = luaL_checkinteger(L,2);
//SDL_Window * win = *(SDL_Window**)luaL_checkudata(L, 1, "SDL_Window");
//SDL_Rect * rect = (SDL_Rect*)luaL_checkudata(L, 2, "SDL_Rect");
//int numrects = luaL_checkinteger(L,2);
// if (SDL_UpdateWindowSurfaceRects(win, rect, numrects) == 0){
// lua_pushboolean(L,1);
// return 1;
@ -635,10 +635,10 @@ static int LUA_SetWindowInputFocus(lua_State *L)
static int LUA_SetWindowGammaRamp(lua_State *L)
{
SDL_Window * win = *(SDL_Window**)luaL_checkudata(L, 1, "SDL_Window");
Uint16 red[256];
Uint16 green[256];
Uint16 blue[256];
//SDL_Window * win = *(SDL_Window**)luaL_checkudata(L, 1, "SDL_Window");
//Uint16 red[256];
//Uint16 green[256];
//Uint16 blue[256];
//TODO
@ -652,10 +652,10 @@ static int LUA_SetWindowGammaRamp(lua_State *L)
static int LUA_GetWindowGammaRamp(lua_State *L)
{
SDL_Window * win = *(SDL_Window**)luaL_checkudata(L, 1, "SDL_Window");
Uint16 red[256];
Uint16 green[256];
Uint16 blue[256];
//SDL_Window * win = *(SDL_Window**)luaL_checkudata(L, 1, "SDL_Window");
//Uint16 red[256];
//Uint16 green[256];
//Uint16 blue[256];
//TODO
//if (SDL_GetWindowGammaRamp(win, red, green, blue) == 0){
// lua_createtable(L, 3, 3);