diff options
Diffstat (limited to 'build')
| -rw-r--r-- | build/vc++/3rdparty/cembed/cembed.vcxproj | 130 | ||||
| -rw-r--r-- | build/vc++/3rdparty/cembed/cembed.vcxproj.filters | 6 | ||||
| -rw-r--r-- | build/vc++/3rdparty/cembed/cembed.vcxproj.user | 4 | ||||
| -rw-r--r-- | build/vc++/jin.sln | 13 | ||||
| -rw-r--r-- | build/vc++/jin/jin.vcxproj | 2 | ||||
| -rw-r--r-- | build/vc++/libjin-lua/libjin-lua.vcxproj (renamed from build/vc++/jin.vcxproj) | 205 | ||||
| -rw-r--r-- | build/vc++/libjin-lua/libjin-lua.vcxproj.filters (renamed from build/vc++/jin.vcxproj.filters) | 208 | ||||
| -rw-r--r-- | build/vc++/libjin-lua/libjin-lua.vcxproj.user (renamed from build/vc++/jin.vcxproj.user) | 4 | ||||
| -rw-r--r-- | build/vc++/resource.h | bin | 858 -> 0 bytes |
9 files changed, 350 insertions, 222 deletions
diff --git a/build/vc++/3rdparty/cembed/cembed.vcxproj b/build/vc++/3rdparty/cembed/cembed.vcxproj new file mode 100644 index 0000000..04e1300 --- /dev/null +++ b/build/vc++/3rdparty/cembed/cembed.vcxproj @@ -0,0 +1,130 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="15.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> + <ProjectConfiguration Include="Debug|x64"> + <Configuration>Debug</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|x64"> + <Configuration>Release</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <VCProjectVersion>15.0</VCProjectVersion> + <ProjectGuid>{DE837ACB-AA3B-4C91-9CA1-395D1B85E11F}</ProjectGuid> + <RootNamespace>cembed</RootNamespace> + <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <PlatformToolset>v141</PlatformToolset> + <CharacterSet>MultiByte</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <PlatformToolset>v141</PlatformToolset> + <WholeProgramOptimization>true</WholeProgramOptimization> + <CharacterSet>MultiByte</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <PlatformToolset>v141</PlatformToolset> + <CharacterSet>MultiByte</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <PlatformToolset>v141</PlatformToolset> + <WholeProgramOptimization>true</WholeProgramOptimization> + <CharacterSet>MultiByte</CharacterSet> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Label="Shared"> + </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> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <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|x64'"> + <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'"> + <OutDir>$(SolutionDir)..\..\bin</OutDir> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <OutDir>$(SolutionDir)..\..\bin</OutDir> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <WarningLevel>Level3</WarningLevel> + <Optimization>Disabled</Optimization> + <SDLCheck>true</SDLCheck> + <ConformanceMode>true</ConformanceMode> + <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + </ClCompile> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <ClCompile> + <WarningLevel>Level3</WarningLevel> + <Optimization>Disabled</Optimization> + <SDLCheck>true</SDLCheck> + <ConformanceMode>true</ConformanceMode> + </ClCompile> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <WarningLevel>Level3</WarningLevel> + <Optimization>MaxSpeed</Optimization> + <FunctionLevelLinking>true</FunctionLevelLinking> + <IntrinsicFunctions>true</IntrinsicFunctions> + <SDLCheck>true</SDLCheck> + <ConformanceMode>true</ConformanceMode> + <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + </ClCompile> + <Link> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <ClCompile> + <WarningLevel>Level3</WarningLevel> + <Optimization>MaxSpeed</Optimization> + <FunctionLevelLinking>true</FunctionLevelLinking> + <IntrinsicFunctions>true</IntrinsicFunctions> + <SDLCheck>true</SDLCheck> + <ConformanceMode>true</ConformanceMode> + </ClCompile> + <Link> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> + </Link> + </ItemDefinitionGroup> + <ItemGroup> + <ClCompile Include="..\..\..\..\src\3rdparty\cembed\cembed.c" /> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> +</Project>
\ No newline at end of file diff --git a/build/vc++/3rdparty/cembed/cembed.vcxproj.filters b/build/vc++/3rdparty/cembed/cembed.vcxproj.filters new file mode 100644 index 0000000..3600749 --- /dev/null +++ b/build/vc++/3rdparty/cembed/cembed.vcxproj.filters @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup> + <ClCompile Include="..\..\..\..\src\3rdparty\cembed\cembed.c" /> + </ItemGroup> +</Project>
\ No newline at end of file diff --git a/build/vc++/3rdparty/cembed/cembed.vcxproj.user b/build/vc++/3rdparty/cembed/cembed.vcxproj.user new file mode 100644 index 0000000..be25078 --- /dev/null +++ b/build/vc++/3rdparty/cembed/cembed.vcxproj.user @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup /> +</Project>
\ No newline at end of file diff --git a/build/vc++/jin.sln b/build/vc++/jin.sln index a1f5d5f..b1807ac 100644 --- a/build/vc++/jin.sln +++ b/build/vc++/jin.sln @@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 VisualStudioVersion = 15.0.27703.2047 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libjin-lua", "jin.vcxproj", "{A3E35ECA-62EB-45CE-8152-674FBC7F7A3B}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libjin-lua", "libjin-lua\libjin-lua.vcxproj", "{A3E35ECA-62EB-45CE-8152-674FBC7F7A3B}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libjin", "libjin\libjin.vcxproj", "{9EE02090-C15E-4520-9C05-C435E45EF2FC}" EndProject @@ -47,6 +47,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "luax", "3rdparty\luax\luax. EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Lua51", "3rdparty\Lua51\Lua51.vcxproj", "{4156CD69-6FC4-4B32-B008-BB94C8AE17F5}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cembed", "3rdparty\cembed\cembed.vcxproj", "{DE837ACB-AA3B-4C91-9CA1-395D1B85E11F}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|x64 = Debug|x64 @@ -183,6 +185,14 @@ Global {4156CD69-6FC4-4B32-B008-BB94C8AE17F5}.Release|x64.Build.0 = Release|x64 {4156CD69-6FC4-4B32-B008-BB94C8AE17F5}.Release|x86.ActiveCfg = Release|Win32 {4156CD69-6FC4-4B32-B008-BB94C8AE17F5}.Release|x86.Build.0 = Release|Win32 + {DE837ACB-AA3B-4C91-9CA1-395D1B85E11F}.Debug|x64.ActiveCfg = Debug|x64 + {DE837ACB-AA3B-4C91-9CA1-395D1B85E11F}.Debug|x64.Build.0 = Debug|x64 + {DE837ACB-AA3B-4C91-9CA1-395D1B85E11F}.Debug|x86.ActiveCfg = Debug|Win32 + {DE837ACB-AA3B-4C91-9CA1-395D1B85E11F}.Debug|x86.Build.0 = Debug|Win32 + {DE837ACB-AA3B-4C91-9CA1-395D1B85E11F}.Release|x64.ActiveCfg = Release|x64 + {DE837ACB-AA3B-4C91-9CA1-395D1B85E11F}.Release|x64.Build.0 = Release|x64 + {DE837ACB-AA3B-4C91-9CA1-395D1B85E11F}.Release|x86.ActiveCfg = Release|Win32 + {DE837ACB-AA3B-4C91-9CA1-395D1B85E11F}.Release|x86.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -206,6 +216,7 @@ Global {45AC0438-98A8-4369-A21D-BBCBE7995B34} = {2A2F610D-E42B-426F-8DC8-79E0C6FCCDD2} {C6B16179-5640-4D41-8756-0525D25EB569} = {65DFFFA6-F434-47FB-9DB2-DCF019060B92} {4156CD69-6FC4-4B32-B008-BB94C8AE17F5} = {2A2F610D-E42B-426F-8DC8-79E0C6FCCDD2} + {DE837ACB-AA3B-4C91-9CA1-395D1B85E11F} = {65DFFFA6-F434-47FB-9DB2-DCF019060B92} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {633D8D43-3349-43F7-8835-7D7F58BAD2A8} diff --git a/build/vc++/jin/jin.vcxproj b/build/vc++/jin/jin.vcxproj index 7c0c145..98ae932 100644 --- a/build/vc++/jin/jin.vcxproj +++ b/build/vc++/jin/jin.vcxproj @@ -143,7 +143,7 @@ <ClCompile Include="..\..\..\src\jin\main.cpp" /> </ItemGroup> <ItemGroup> - <ProjectReference Include="..\jin.vcxproj"> + <ProjectReference Include="..\libjin-lua\libjin-lua.vcxproj"> <Project>{a3e35eca-62eb-45ce-8152-674fbc7f7a3b}</Project> </ProjectReference> </ItemGroup> diff --git a/build/vc++/jin.vcxproj b/build/vc++/libjin-lua/libjin-lua.vcxproj index cfc6eba..57d1837 100644 --- a/build/vc++/jin.vcxproj +++ b/build/vc++/libjin-lua/libjin-lua.vcxproj @@ -117,7 +117,7 @@ <IntrinsicFunctions>true</IntrinsicFunctions> <SDLCheck>true</SDLCheck> <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>$(SolutionDir)..\..\src\;$(SolutionDir)..\..\src\3rdparty\LuaJIT-2.0.5\include;$(SolutionDir)..\..\src\3rdparty\;$(SolutionDir)..\..\src\3rdparty\SDL2\include;$(SolutionDir)..\..\src\lua;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\src\;$(SolutionDir)..\..\..\src\3rdparty\LuaJIT-2.0.5\include;$(SolutionDir)..\..\..\src\3rdparty\;$(SolutionDir)..\..\..\src\3rdparty\SDL2\include;$(SolutionDir)..\..\..\src\lua;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <CompileAs>CompileAsCpp</CompileAs> <ObjectFileName>$(IntDir)/%(RelativeDir)/</ObjectFileName> <FavorSizeOrSpeed>Size</FavorSizeOrSpeed> @@ -147,117 +147,110 @@ </Link> </ItemDefinitionGroup> <ItemGroup> - <ClCompile Include="..\..\src\lua\common\je_lua_runtime.cpp" /> - <ClCompile Include="..\..\src\lua\common\je_lua_callback.cpp" /> - <ClCompile Include="..\..\src\lua\common\je_lua_function.cpp" /> - <ClCompile Include="..\..\src\lua\common\je_lua_port.h" /> - <ClCompile Include="..\..\src\lua\common\je_lua_object.cpp" /> - <ClCompile Include="..\..\src\lua\common\je_lua_reference.cpp" /> - <ClCompile Include="..\..\src\lua\common\je_lua_shared.cpp" /> - <ClCompile Include="..\..\src\lua\je_lua_jin.cpp" /> - <ClCompile Include="..\..\src\lua\modules\ai\je_lua_ai.cpp" /> - <ClCompile Include="..\..\src\lua\modules\ai\je_lua_behavior_tree.cpp" /> - <ClCompile Include="..\..\src\lua\modules\ai\je_lua_state_machine.cpp" /> - <ClCompile Include="..\..\src\lua\modules\audio\je_lua_audio.cpp" /> - <ClCompile Include="..\..\src\lua\modules\audio\je_lua_source.cpp" /> - <ClCompile Include="..\..\src\lua\modules\bit\je_lua_bit.cpp" /> - <ClCompile Include="..\..\src\lua\modules\core\je_lua_core.cpp" /> - <ClCompile Include="..\..\src\lua\modules\event\je_lua_event.cpp" /> - <ClCompile Include="..\..\src\lua\modules\filesystem\je_lua_filesystem.cpp" /> - <ClCompile Include="..\..\src\lua\modules\graphics\je_lua_animation.cpp" /> - <ClCompile Include="..\..\src\lua\modules\graphics\je_lua_animator.cpp" /> - <ClCompile Include="..\..\src\lua\modules\graphics\je_lua_bitmap.cpp" /> - <ClCompile Include="..\..\src\lua\modules\graphics\je_lua_canvas.cpp" /> - <ClCompile Include="..\..\src\lua\modules\graphics\je_lua_particle_system.cpp" /> - <ClCompile Include="..\..\src\lua\modules\graphics\je_lua_sprite.cpp" /> - <ClCompile Include="..\..\src\lua\modules\graphics\je_lua_spritesheet.cpp" /> - <ClCompile Include="..\..\src\lua\modules\graphics\je_lua_text.cpp" /> - <ClCompile Include="..\..\src\lua\modules\graphics\je_lua_texture_font.cpp" /> - <ClCompile Include="..\..\src\lua\modules\graphics\je_lua_ttf.cpp" /> - <ClCompile Include="..\..\src\lua\modules\graphics\je_lua_ttf_data.cpp" /> - <ClCompile Include="..\..\src\lua\modules\graphics\je_lua_graphics.cpp" /> - <ClCompile Include="..\..\src\lua\modules\graphics\je_lua_page.cpp" /> - <ClCompile Include="..\..\src\lua\modules\graphics\je_lua_texture.cpp" /> - <ClCompile Include="..\..\src\lua\modules\graphics\je_lua_shader.cpp" /> - <ClCompile Include="..\..\src\lua\modules\joypad\je_lua_joypad.cpp" /> - <ClCompile Include="..\..\src\lua\modules\keyboard\je_lua_keyboard.cpp" /> - <ClCompile Include="..\..\src\lua\modules\math\je_lua_math.cpp" /> - <ClCompile Include="..\..\src\lua\modules\mouse\je_lua_mouse.cpp" /> - <ClCompile Include="..\..\src\lua\modules\net\je_lua_buffer.cpp" /> - <ClCompile Include="..\..\src\lua\modules\net\je_lua_net.cpp" /> - <ClCompile Include="..\..\src\lua\modules\net\je_lua_socket.cpp" /> - <ClCompile Include="..\..\src\lua\modules\thread\je_lua_thread.cpp" /> - <ClCompile Include="..\..\src\lua\modules\time\je_lua_time.cpp" /> - <ClCompile Include="..\..\src\lua\modules\time\je_lua_timer.cpp" /> - </ItemGroup> - <ItemGroup> - <ClInclude Include="..\..\src\lua\common\je_lua.h" /> - <ClInclude Include="..\..\src\lua\common\je_lua_common.h" /> - <ClInclude Include="..\..\src\lua\common\je_lua_constant.h" /> - <ClInclude Include="..\..\src\lua\common\je_lua_error.h" /> - <ClInclude Include="..\..\src\lua\common\je_lua_callback.h" /> - <ClInclude Include="..\..\src\lua\common\je_lua_function.h" /> - <ClInclude Include="..\..\src\lua\common\je_lua_object.h" /> - <ClInclude Include="..\..\src\lua\common\je_lua_reference.h" /> - <ClInclude Include="..\..\src\lua\common\je_lua_shared.hpp" /> - <ClInclude Include="..\..\src\lua\embed\embed.h" /> - <ClInclude Include="..\..\src\lua\embed\scripts\ai.lua.h" /> - <ClInclude Include="..\..\src\lua\embed\scripts\boot.lua.h" /> - <ClInclude Include="..\..\src\lua\embed\scripts\graphics.lua.h" /> - <ClInclude Include="..\..\src\lua\embed\scripts\keyboard.lua.h" /> - <ClInclude Include="..\..\src\lua\embed\scripts\mouse.lua.h" /> - <ClInclude Include="..\..\src\lua\embed\scripts\net.lua.h" /> - <ClInclude Include="..\..\src\lua\embed\scripts\path.lua.h" /> - <ClInclude Include="..\..\src\lua\je_lua_jin.h" /> - <ClInclude Include="..\..\src\lua\modules\ai\je_lua_ai.h" /> - <ClInclude Include="..\..\src\lua\modules\ai\je_lua_behavior_tree.h" /> - <ClInclude Include="..\..\src\lua\modules\ai\je_lua_state_machine.h" /> - <ClInclude Include="..\..\src\lua\modules\audio\je_lua_audio.h" /> - <ClInclude Include="..\..\src\lua\modules\audio\je_lua_source.h" /> - <ClInclude Include="..\..\src\lua\modules\bit\je_lua_bit.h" /> - <ClInclude Include="..\..\src\lua\modules\core\je_lua_core.h" /> - <ClInclude Include="..\..\src\lua\modules\event\je_lua_event.h" /> - <ClInclude Include="..\..\src\lua\modules\filesystem\je_lua_filesystem.h" /> - <ClInclude Include="..\..\src\lua\modules\graphics\je_lua_animation.h" /> - <ClInclude Include="..\..\src\lua\modules\graphics\je_lua_animator.h" /> - <ClInclude Include="..\..\src\lua\modules\graphics\je_lua_bitmap.h" /> - <ClInclude Include="..\..\src\lua\modules\graphics\je_lua_canvas.h" /> - <ClInclude Include="..\..\src\lua\modules\graphics\je_lua_graphics.h" /> - <ClInclude Include="..\..\src\lua\modules\graphics\je_lua_page.h" /> - <ClInclude Include="..\..\src\lua\modules\graphics\je_lua_particle_system.h" /> - <ClInclude Include="..\..\src\lua\modules\graphics\je_lua_shader.h" /> - <ClInclude Include="..\..\src\lua\modules\graphics\je_lua_sprite.h" /> - <ClInclude Include="..\..\src\lua\modules\graphics\je_lua_spritesheet.h" /> - <ClInclude Include="..\..\src\lua\modules\graphics\je_lua_text.h" /> - <ClInclude Include="..\..\src\lua\modules\graphics\je_lua_texture.h" /> - <ClInclude Include="..\..\src\lua\modules\graphics\je_lua_texture_font.h" /> - <ClInclude Include="..\..\src\lua\modules\graphics\je_lua_ttf.h" /> - <ClInclude Include="..\..\src\lua\modules\graphics\je_lua_ttf_data.h" /> - <ClInclude Include="..\..\src\lua\modules\je_lua_modules.h" /> - <ClInclude Include="..\..\src\lua\modules\joypad\je_lua_joypad.h" /> - <ClInclude Include="..\..\src\lua\modules\keyboard\je_lua_keyboard.h" /> - <ClInclude Include="..\..\src\lua\modules\math\je_lua_math.h" /> - <ClInclude Include="..\..\src\lua\modules\mouse\je_lua_mouse.h" /> - <ClInclude Include="..\..\src\lua\modules\net\je_lua_buffer.h" /> - <ClInclude Include="..\..\src\lua\modules\net\je_lua_net.h" /> - <ClInclude Include="..\..\src\lua\modules\net\je_lua_socket.h" /> - <ClInclude Include="..\..\src\lua\modules\thread\je_lua_thread.h" /> - <ClInclude Include="..\..\src\lua\modules\time\je_lua_time.h" /> - <ClInclude Include="..\..\src\lua\modules\time\je_lua_timer.h" /> - <ClInclude Include="..\..\src\lua\resources\font.ttf.h" /> - <ClInclude Include="resource.h" /> - </ItemGroup> - <ItemGroup> - <ResourceCompile Include="jin.rc" /> + <ClCompile Include="..\..\..\src\lua\common\je_lua_runtime.cpp" /> + <ClCompile Include="..\..\..\src\lua\common\je_lua_callback.cpp" /> + <ClCompile Include="..\..\..\src\lua\common\je_lua_function.cpp" /> + <ClCompile Include="..\..\..\src\lua\common\je_lua_port.h" /> + <ClCompile Include="..\..\..\src\lua\common\je_lua_object.cpp" /> + <ClCompile Include="..\..\..\src\lua\common\je_lua_reference.cpp" /> + <ClCompile Include="..\..\..\src\lua\common\je_lua_shared.cpp" /> + <ClCompile Include="..\..\..\src\lua\je_lua_jin.cpp" /> + <ClCompile Include="..\..\..\src\lua\modules\ai\je_lua_ai.cpp" /> + <ClCompile Include="..\..\..\src\lua\modules\ai\je_lua_behavior_tree.cpp" /> + <ClCompile Include="..\..\..\src\lua\modules\ai\je_lua_state_machine.cpp" /> + <ClCompile Include="..\..\..\src\lua\modules\audio\je_lua_audio.cpp" /> + <ClCompile Include="..\..\..\src\lua\modules\audio\je_lua_source.cpp" /> + <ClCompile Include="..\..\..\src\lua\modules\bit\je_lua_bit.cpp" /> + <ClCompile Include="..\..\..\src\lua\modules\core\je_lua_core.cpp" /> + <ClCompile Include="..\..\..\src\lua\modules\event\je_lua_event.cpp" /> + <ClCompile Include="..\..\..\src\lua\modules\filesystem\je_lua_filesystem.cpp" /> + <ClCompile Include="..\..\..\src\lua\modules\graphics\je_lua_animation.cpp" /> + <ClCompile Include="..\..\..\src\lua\modules\graphics\je_lua_animator.cpp" /> + <ClCompile Include="..\..\..\src\lua\modules\graphics\je_lua_bitmap.cpp" /> + <ClCompile Include="..\..\..\src\lua\modules\graphics\je_lua_canvas.cpp" /> + <ClCompile Include="..\..\..\src\lua\modules\graphics\je_lua_particle_system.cpp" /> + <ClCompile Include="..\..\..\src\lua\modules\graphics\je_lua_sprite.cpp" /> + <ClCompile Include="..\..\..\src\lua\modules\graphics\je_lua_spritesheet.cpp" /> + <ClCompile Include="..\..\..\src\lua\modules\graphics\je_lua_text.cpp" /> + <ClCompile Include="..\..\..\src\lua\modules\graphics\je_lua_texture_font.cpp" /> + <ClCompile Include="..\..\..\src\lua\modules\graphics\je_lua_ttf.cpp" /> + <ClCompile Include="..\..\..\src\lua\modules\graphics\je_lua_ttf_data.cpp" /> + <ClCompile Include="..\..\..\src\lua\modules\graphics\je_lua_graphics.cpp" /> + <ClCompile Include="..\..\..\src\lua\modules\graphics\je_lua_page.cpp" /> + <ClCompile Include="..\..\..\src\lua\modules\graphics\je_lua_texture.cpp" /> + <ClCompile Include="..\..\..\src\lua\modules\graphics\je_lua_shader.cpp" /> + <ClCompile Include="..\..\..\src\lua\modules\joypad\je_lua_joypad.cpp" /> + <ClCompile Include="..\..\..\src\lua\modules\keyboard\je_lua_keyboard.cpp" /> + <ClCompile Include="..\..\..\src\lua\modules\math\je_lua_math.cpp" /> + <ClCompile Include="..\..\..\src\lua\modules\mouse\je_lua_mouse.cpp" /> + <ClCompile Include="..\..\..\src\lua\modules\net\je_lua_buffer.cpp" /> + <ClCompile Include="..\..\..\src\lua\modules\net\je_lua_net.cpp" /> + <ClCompile Include="..\..\..\src\lua\modules\net\je_lua_socket.cpp" /> + <ClCompile Include="..\..\..\src\lua\modules\thread\je_lua_thread.cpp" /> + <ClCompile Include="..\..\..\src\lua\modules\time\je_lua_time.cpp" /> + <ClCompile Include="..\..\..\src\lua\modules\time\je_lua_timer.cpp" /> </ItemGroup> <ItemGroup> - <Image Include="..\..\res\icon.ico" /> + <ClInclude Include="..\..\..\src\lua\common\je_lua.h" /> + <ClInclude Include="..\..\..\src\lua\common\je_lua_common.h" /> + <ClInclude Include="..\..\..\src\lua\common\je_lua_constant.h" /> + <ClInclude Include="..\..\..\src\lua\common\je_lua_error.h" /> + <ClInclude Include="..\..\..\src\lua\common\je_lua_callback.h" /> + <ClInclude Include="..\..\..\src\lua\common\je_lua_function.h" /> + <ClInclude Include="..\..\..\src\lua\common\je_lua_object.h" /> + <ClInclude Include="..\..\..\src\lua\common\je_lua_reference.h" /> + <ClInclude Include="..\..\..\src\lua\common\je_lua_shared.hpp" /> + <ClInclude Include="..\..\..\src\lua\embed\embed.h" /> + <ClInclude Include="..\..\..\src\lua\embed\scripts\ai.lua.h" /> + <ClInclude Include="..\..\..\src\lua\embed\scripts\boot.lua.h" /> + <ClInclude Include="..\..\..\src\lua\embed\scripts\graphics.lua.h" /> + <ClInclude Include="..\..\..\src\lua\embed\scripts\keyboard.lua.h" /> + <ClInclude Include="..\..\..\src\lua\embed\scripts\mouse.lua.h" /> + <ClInclude Include="..\..\..\src\lua\embed\scripts\net.lua.h" /> + <ClInclude Include="..\..\..\src\lua\embed\scripts\path.lua.h" /> + <ClInclude Include="..\..\..\src\lua\je_lua_jin.h" /> + <ClInclude Include="..\..\..\src\lua\modules\ai\je_lua_ai.h" /> + <ClInclude Include="..\..\..\src\lua\modules\ai\je_lua_behavior_tree.h" /> + <ClInclude Include="..\..\..\src\lua\modules\ai\je_lua_state_machine.h" /> + <ClInclude Include="..\..\..\src\lua\modules\audio\je_lua_audio.h" /> + <ClInclude Include="..\..\..\src\lua\modules\audio\je_lua_source.h" /> + <ClInclude Include="..\..\..\src\lua\modules\bit\je_lua_bit.h" /> + <ClInclude Include="..\..\..\src\lua\modules\core\je_lua_core.h" /> + <ClInclude Include="..\..\..\src\lua\modules\event\je_lua_event.h" /> + <ClInclude Include="..\..\..\src\lua\modules\filesystem\je_lua_filesystem.h" /> + <ClInclude Include="..\..\..\src\lua\modules\graphics\je_lua_animation.h" /> + <ClInclude Include="..\..\..\src\lua\modules\graphics\je_lua_animator.h" /> + <ClInclude Include="..\..\..\src\lua\modules\graphics\je_lua_bitmap.h" /> + <ClInclude Include="..\..\..\src\lua\modules\graphics\je_lua_canvas.h" /> + <ClInclude Include="..\..\..\src\lua\modules\graphics\je_lua_graphics.h" /> + <ClInclude Include="..\..\..\src\lua\modules\graphics\je_lua_page.h" /> + <ClInclude Include="..\..\..\src\lua\modules\graphics\je_lua_particle_system.h" /> + <ClInclude Include="..\..\..\src\lua\modules\graphics\je_lua_shader.h" /> + <ClInclude Include="..\..\..\src\lua\modules\graphics\je_lua_sprite.h" /> + <ClInclude Include="..\..\..\src\lua\modules\graphics\je_lua_spritesheet.h" /> + <ClInclude Include="..\..\..\src\lua\modules\graphics\je_lua_text.h" /> + <ClInclude Include="..\..\..\src\lua\modules\graphics\je_lua_texture.h" /> + <ClInclude Include="..\..\..\src\lua\modules\graphics\je_lua_texture_font.h" /> + <ClInclude Include="..\..\..\src\lua\modules\graphics\je_lua_ttf.h" /> + <ClInclude Include="..\..\..\src\lua\modules\graphics\je_lua_ttf_data.h" /> + <ClInclude Include="..\..\..\src\lua\modules\je_lua_modules.h" /> + <ClInclude Include="..\..\..\src\lua\modules\joypad\je_lua_joypad.h" /> + <ClInclude Include="..\..\..\src\lua\modules\keyboard\je_lua_keyboard.h" /> + <ClInclude Include="..\..\..\src\lua\modules\math\je_lua_math.h" /> + <ClInclude Include="..\..\..\src\lua\modules\mouse\je_lua_mouse.h" /> + <ClInclude Include="..\..\..\src\lua\modules\net\je_lua_buffer.h" /> + <ClInclude Include="..\..\..\src\lua\modules\net\je_lua_net.h" /> + <ClInclude Include="..\..\..\src\lua\modules\net\je_lua_socket.h" /> + <ClInclude Include="..\..\..\src\lua\modules\thread\je_lua_thread.h" /> + <ClInclude Include="..\..\..\src\lua\modules\time\je_lua_time.h" /> + <ClInclude Include="..\..\..\src\lua\modules\time\je_lua_timer.h" /> + <ClInclude Include="..\..\..\src\lua\resources\font.ttf.h" /> </ItemGroup> <ItemGroup> - <ProjectReference Include="3rdparty\LuaJIT-2.0.5\LuaJIT-2.0.5.vcxproj"> + <ProjectReference Include="..\3rdparty\LuaJIT-2.0.5\LuaJIT-2.0.5.vcxproj"> <Project>{45ac0438-98a8-4369-a21d-bbcbe7995b34}</Project> </ProjectReference> - <ProjectReference Include="libjin\libjin.vcxproj"> + <ProjectReference Include="..\libjin\libjin.vcxproj"> <Project>{9ee02090-c15e-4520-9c05-c435e45ef2fc}</Project> </ProjectReference> </ItemGroup> diff --git a/build/vc++/jin.vcxproj.filters b/build/vc++/libjin-lua/libjin-lua.vcxproj.filters index 029c097..bf1010a 100644 --- a/build/vc++/jin.vcxproj.filters +++ b/build/vc++/libjin-lua/libjin-lua.vcxproj.filters @@ -55,9 +55,6 @@ <Filter Include="source\embed"> <UniqueIdentifier>{9cf92f3f-bcc5-442b-aa92-c88eeb1c5e45}</UniqueIdentifier> </Filter> - <Filter Include="resource"> - <UniqueIdentifier>{579f12b8-5758-4be5-9cd7-e1fa62fdef74}</UniqueIdentifier> - </Filter> <Filter Include="source\modules\ai"> <UniqueIdentifier>{fc3fecf1-63e8-4d28-97a7-bf6a1817f57b}</UniqueIdentifier> </Filter> @@ -66,308 +63,295 @@ </Filter> </ItemGroup> <ItemGroup> - <ClCompile Include="..\..\src\lua\modules\graphics\je_lua_sprite.cpp"> + <ClCompile Include="..\..\..\src\lua\modules\graphics\je_lua_sprite.cpp"> <Filter>source\modules\graphics</Filter> </ClCompile> - <ClCompile Include="..\..\src\lua\modules\graphics\je_lua_graphics.cpp"> + <ClCompile Include="..\..\..\src\lua\modules\graphics\je_lua_graphics.cpp"> <Filter>source\modules\graphics</Filter> </ClCompile> - <ClCompile Include="..\..\src\lua\modules\graphics\je_lua_page.cpp"> + <ClCompile Include="..\..\..\src\lua\modules\graphics\je_lua_page.cpp"> <Filter>source\modules\graphics</Filter> </ClCompile> - <ClCompile Include="..\..\src\lua\modules\graphics\je_lua_shader.cpp"> + <ClCompile Include="..\..\..\src\lua\modules\graphics\je_lua_shader.cpp"> <Filter>source\modules\graphics</Filter> </ClCompile> - <ClCompile Include="..\..\src\lua\modules\graphics\je_lua_text.cpp"> + <ClCompile Include="..\..\..\src\lua\modules\graphics\je_lua_text.cpp"> <Filter>source\modules\graphics</Filter> </ClCompile> - <ClCompile Include="..\..\src\lua\modules\graphics\je_lua_texture.cpp"> + <ClCompile Include="..\..\..\src\lua\modules\graphics\je_lua_texture.cpp"> <Filter>source\modules\graphics</Filter> </ClCompile> - <ClCompile Include="..\..\src\lua\modules\graphics\je_lua_texture_font.cpp"> + <ClCompile Include="..\..\..\src\lua\modules\graphics\je_lua_texture_font.cpp"> <Filter>source\modules\graphics</Filter> </ClCompile> - <ClCompile Include="..\..\src\lua\modules\graphics\je_lua_ttf.cpp"> + <ClCompile Include="..\..\..\src\lua\modules\graphics\je_lua_ttf.cpp"> <Filter>source\modules\graphics</Filter> </ClCompile> - <ClCompile Include="..\..\src\lua\modules\graphics\je_lua_ttf_data.cpp"> + <ClCompile Include="..\..\..\src\lua\modules\graphics\je_lua_ttf_data.cpp"> <Filter>source\modules\graphics</Filter> </ClCompile> - <ClCompile Include="..\..\src\lua\modules\graphics\je_lua_canvas.cpp"> + <ClCompile Include="..\..\..\src\lua\modules\graphics\je_lua_canvas.cpp"> <Filter>source\modules\graphics</Filter> </ClCompile> - <ClCompile Include="..\..\src\lua\modules\graphics\je_lua_bitmap.cpp"> + <ClCompile Include="..\..\..\src\lua\modules\graphics\je_lua_bitmap.cpp"> <Filter>source\modules\graphics</Filter> </ClCompile> - <ClCompile Include="..\..\src\lua\modules\audio\je_lua_audio.cpp"> + <ClCompile Include="..\..\..\src\lua\modules\audio\je_lua_audio.cpp"> <Filter>source\modules\audio</Filter> </ClCompile> - <ClCompile Include="..\..\src\lua\modules\audio\je_lua_source.cpp"> + <ClCompile Include="..\..\..\src\lua\modules\audio\je_lua_source.cpp"> <Filter>source\modules\audio</Filter> </ClCompile> - <ClCompile Include="..\..\src\lua\modules\bit\je_lua_bit.cpp"> + <ClCompile Include="..\..\..\src\lua\modules\bit\je_lua_bit.cpp"> <Filter>source\modules\bit</Filter> </ClCompile> - <ClCompile Include="..\..\src\lua\modules\core\je_lua_core.cpp"> + <ClCompile Include="..\..\..\src\lua\modules\core\je_lua_core.cpp"> <Filter>source\modules\core</Filter> </ClCompile> - <ClCompile Include="..\..\src\lua\modules\event\je_lua_event.cpp"> + <ClCompile Include="..\..\..\src\lua\modules\event\je_lua_event.cpp"> <Filter>source\modules\event</Filter> </ClCompile> - <ClCompile Include="..\..\src\lua\modules\filesystem\je_lua_filesystem.cpp"> + <ClCompile Include="..\..\..\src\lua\modules\filesystem\je_lua_filesystem.cpp"> <Filter>source\modules\filesystem</Filter> </ClCompile> - <ClCompile Include="..\..\src\lua\modules\joypad\je_lua_joypad.cpp"> + <ClCompile Include="..\..\..\src\lua\modules\joypad\je_lua_joypad.cpp"> <Filter>source\modules\joypad</Filter> </ClCompile> - <ClCompile Include="..\..\src\lua\modules\keyboard\je_lua_keyboard.cpp"> + <ClCompile Include="..\..\..\src\lua\modules\keyboard\je_lua_keyboard.cpp"> <Filter>source\modules\keyboard</Filter> </ClCompile> - <ClCompile Include="..\..\src\lua\modules\math\je_lua_math.cpp"> + <ClCompile Include="..\..\..\src\lua\modules\math\je_lua_math.cpp"> <Filter>source\modules\math</Filter> </ClCompile> - <ClCompile Include="..\..\src\lua\modules\mouse\je_lua_mouse.cpp"> + <ClCompile Include="..\..\..\src\lua\modules\mouse\je_lua_mouse.cpp"> <Filter>source\modules\mouse</Filter> </ClCompile> - <ClCompile Include="..\..\src\lua\modules\net\je_lua_buffer.cpp"> + <ClCompile Include="..\..\..\src\lua\modules\net\je_lua_buffer.cpp"> <Filter>source\modules\net</Filter> </ClCompile> - <ClCompile Include="..\..\src\lua\modules\net\je_lua_net.cpp"> + <ClCompile Include="..\..\..\src\lua\modules\net\je_lua_net.cpp"> <Filter>source\modules\net</Filter> </ClCompile> - <ClCompile Include="..\..\src\lua\modules\net\je_lua_socket.cpp"> + <ClCompile Include="..\..\..\src\lua\modules\net\je_lua_socket.cpp"> <Filter>source\modules\net</Filter> </ClCompile> - <ClCompile Include="..\..\src\lua\modules\thread\je_lua_thread.cpp"> + <ClCompile Include="..\..\..\src\lua\modules\thread\je_lua_thread.cpp"> <Filter>source\modules\thread</Filter> </ClCompile> - <ClCompile Include="..\..\src\lua\modules\time\je_lua_time.cpp"> + <ClCompile Include="..\..\..\src\lua\modules\time\je_lua_time.cpp"> <Filter>source\modules\time</Filter> </ClCompile> - <ClCompile Include="..\..\src\lua\modules\graphics\je_lua_particle_system.cpp"> + <ClCompile Include="..\..\..\src\lua\modules\graphics\je_lua_particle_system.cpp"> <Filter>source\modules\graphics</Filter> </ClCompile> - <ClCompile Include="..\..\src\lua\common\je_lua_port.h"> + <ClCompile Include="..\..\..\src\lua\common\je_lua_port.h"> <Filter>source\common</Filter> </ClCompile> - <ClCompile Include="..\..\src\lua\modules\ai\je_lua_behavior_tree.cpp"> + <ClCompile Include="..\..\..\src\lua\modules\ai\je_lua_behavior_tree.cpp"> <Filter>source\modules\ai</Filter> </ClCompile> - <ClCompile Include="..\..\src\lua\modules\ai\je_lua_ai.cpp"> + <ClCompile Include="..\..\..\src\lua\modules\ai\je_lua_ai.cpp"> <Filter>source\modules\ai</Filter> </ClCompile> - <ClCompile Include="..\..\src\lua\modules\ai\je_lua_state_machine.cpp"> + <ClCompile Include="..\..\..\src\lua\modules\ai\je_lua_state_machine.cpp"> <Filter>source\modules\ai</Filter> </ClCompile> - <ClCompile Include="..\..\src\lua\modules\time\je_lua_timer.cpp"> + <ClCompile Include="..\..\..\src\lua\modules\time\je_lua_timer.cpp"> <Filter>source\modules\time</Filter> </ClCompile> - <ClCompile Include="..\..\src\lua\common\je_lua_reference.cpp"> + <ClCompile Include="..\..\..\src\lua\common\je_lua_reference.cpp"> <Filter>source\common</Filter> </ClCompile> - <ClCompile Include="..\..\src\lua\common\je_lua_callback.cpp"> + <ClCompile Include="..\..\..\src\lua\common\je_lua_callback.cpp"> <Filter>source\common</Filter> </ClCompile> - <ClCompile Include="..\..\src\lua\modules\graphics\je_lua_spritesheet.cpp"> + <ClCompile Include="..\..\..\src\lua\modules\graphics\je_lua_spritesheet.cpp"> <Filter>source\modules\graphics</Filter> </ClCompile> - <ClCompile Include="..\..\src\lua\common\je_lua_function.cpp"> + <ClCompile Include="..\..\..\src\lua\common\je_lua_function.cpp"> <Filter>source\common</Filter> </ClCompile> - <ClCompile Include="..\..\src\lua\modules\graphics\je_lua_animation.cpp"> + <ClCompile Include="..\..\..\src\lua\modules\graphics\je_lua_animation.cpp"> <Filter>source\modules\graphics</Filter> </ClCompile> - <ClCompile Include="..\..\src\lua\modules\graphics\je_lua_animator.cpp"> + <ClCompile Include="..\..\..\src\lua\modules\graphics\je_lua_animator.cpp"> <Filter>source\modules\graphics</Filter> </ClCompile> - <ClCompile Include="..\..\src\lua\common\je_lua_shared.cpp"> + <ClCompile Include="..\..\..\src\lua\common\je_lua_shared.cpp"> <Filter>source\common</Filter> </ClCompile> - <ClCompile Include="..\..\src\lua\common\je_lua_object.cpp"> + <ClCompile Include="..\..\..\src\lua\common\je_lua_object.cpp"> <Filter>source\common</Filter> </ClCompile> - <ClCompile Include="..\..\src\lua\common\je_lua_runtime.cpp"> + <ClCompile Include="..\..\..\src\lua\common\je_lua_runtime.cpp"> <Filter>source\common</Filter> </ClCompile> - <ClCompile Include="..\..\src\lua\je_lua_jin.cpp"> + <ClCompile Include="..\..\..\src\lua\je_lua_jin.cpp"> <Filter>source</Filter> </ClCompile> </ItemGroup> <ItemGroup> - <ClInclude Include="resource.h"> - <Filter>resource</Filter> - </ClInclude> - <ClInclude Include="..\..\src\lua\resources\font.ttf.h"> + <ClInclude Include="..\..\..\src\lua\resources\font.ttf.h"> <Filter>source\resources</Filter> </ClInclude> - <ClInclude Include="..\..\src\lua\modules\net\je_lua_buffer.h"> + <ClInclude Include="..\..\..\src\lua\modules\net\je_lua_buffer.h"> <Filter>source\modules\net</Filter> </ClInclude> - <ClInclude Include="..\..\src\lua\modules\thread\je_lua_thread.h"> + <ClInclude Include="..\..\..\src\lua\modules\thread\je_lua_thread.h"> <Filter>source\modules\thread</Filter> </ClInclude> - <ClInclude Include="..\..\src\lua\common\je_lua_common.h"> + <ClInclude Include="..\..\..\src\lua\common\je_lua_common.h"> <Filter>source\common</Filter> </ClInclude> - <ClInclude Include="..\..\src\lua\common\je_lua_constant.h"> + <ClInclude Include="..\..\..\src\lua\common\je_lua_constant.h"> <Filter>source\common</Filter> </ClInclude> - <ClInclude Include="..\..\src\lua\common\je_lua_error.h"> + <ClInclude Include="..\..\..\src\lua\common\je_lua_error.h"> <Filter>source\common</Filter> </ClInclude> - <ClInclude Include="..\..\src\lua\embed\embed.h"> + <ClInclude Include="..\..\..\src\lua\embed\embed.h"> <Filter>source\embed</Filter> </ClInclude> - <ClInclude Include="..\..\src\lua\embed\scripts\boot.lua.h"> + <ClInclude Include="..\..\..\src\lua\embed\scripts\boot.lua.h"> <Filter>source\embed\scripts</Filter> </ClInclude> - <ClInclude Include="..\..\src\lua\embed\scripts\graphics.lua.h"> + <ClInclude Include="..\..\..\src\lua\embed\scripts\graphics.lua.h"> <Filter>source\embed\scripts</Filter> </ClInclude> - <ClInclude Include="..\..\src\lua\embed\scripts\keyboard.lua.h"> + <ClInclude Include="..\..\..\src\lua\embed\scripts\keyboard.lua.h"> <Filter>source\embed\scripts</Filter> </ClInclude> - <ClInclude Include="..\..\src\lua\embed\scripts\mouse.lua.h"> + <ClInclude Include="..\..\..\src\lua\embed\scripts\mouse.lua.h"> <Filter>source\embed\scripts</Filter> </ClInclude> - <ClInclude Include="..\..\src\lua\embed\scripts\net.lua.h"> + <ClInclude Include="..\..\..\src\lua\embed\scripts\net.lua.h"> <Filter>source\embed\scripts</Filter> </ClInclude> - <ClInclude Include="..\..\src\lua\embed\scripts\path.lua.h"> + <ClInclude Include="..\..\..\src\lua\embed\scripts\path.lua.h"> <Filter>source\embed\scripts</Filter> </ClInclude> - <ClInclude Include="..\..\src\lua\embed\scripts\ai.lua.h"> + <ClInclude Include="..\..\..\src\lua\embed\scripts\ai.lua.h"> <Filter>source\embed\scripts</Filter> </ClInclude> - <ClInclude Include="..\..\src\lua\modules\time\je_lua_timer.h"> + <ClInclude Include="..\..\..\src\lua\modules\time\je_lua_timer.h"> <Filter>source\modules\time</Filter> </ClInclude> - <ClInclude Include="..\..\src\lua\common\je_lua_shared.hpp"> + <ClInclude Include="..\..\..\src\lua\common\je_lua_shared.hpp"> <Filter>source\common</Filter> </ClInclude> - <ClInclude Include="..\..\src\lua\common\je_lua_reference.h"> + <ClInclude Include="..\..\..\src\lua\common\je_lua_reference.h"> <Filter>source\common</Filter> </ClInclude> - <ClInclude Include="..\..\src\lua\common\je_lua_callback.h"> + <ClInclude Include="..\..\..\src\lua\common\je_lua_callback.h"> <Filter>source\common</Filter> </ClInclude> - <ClInclude Include="..\..\src\lua\modules\graphics\je_lua_page.h"> + <ClInclude Include="..\..\..\src\lua\modules\graphics\je_lua_page.h"> <Filter>source\modules\graphics</Filter> </ClInclude> - <ClInclude Include="..\..\src\lua\modules\graphics\je_lua_spritesheet.h"> + <ClInclude Include="..\..\..\src\lua\modules\graphics\je_lua_spritesheet.h"> <Filter>source\modules\graphics</Filter> </ClInclude> - <ClInclude Include="..\..\src\lua\modules\graphics\je_lua_sprite.h"> + <ClInclude Include="..\..\..\src\lua\modules\graphics\je_lua_sprite.h"> <Filter>source\modules\graphics</Filter> </ClInclude> - <ClInclude Include="..\..\src\lua\modules\graphics\je_lua_bitmap.h"> + <ClInclude Include="..\..\..\src\lua\modules\graphics\je_lua_bitmap.h"> <Filter>source\modules\graphics</Filter> </ClInclude> - <ClInclude Include="..\..\src\lua\modules\graphics\je_lua_canvas.h"> + <ClInclude Include="..\..\..\src\lua\modules\graphics\je_lua_canvas.h"> <Filter>source\modules\graphics</Filter> </ClInclude> - <ClInclude Include="..\..\src\lua\modules\graphics\je_lua_graphics.h"> + <ClInclude Include="..\..\..\src\lua\modules\graphics\je_lua_graphics.h"> <Filter>source\modules\graphics</Filter> </ClInclude> - <ClInclude Include="..\..\src\lua\modules\graphics\je_lua_particle_system.h"> + <ClInclude Include="..\..\..\src\lua\modules\graphics\je_lua_particle_system.h"> <Filter>source\modules\graphics</Filter> </ClInclude> - <ClInclude Include="..\..\src\lua\modules\graphics\je_lua_shader.h"> + <ClInclude Include="..\..\..\src\lua\modules\graphics\je_lua_shader.h"> <Filter>source\modules\graphics</Filter> </ClInclude> - <ClInclude Include="..\..\src\lua\modules\graphics\je_lua_text.h"> + <ClInclude Include="..\..\..\src\lua\modules\graphics\je_lua_text.h"> <Filter>source\modules\graphics</Filter> </ClInclude> - <ClInclude Include="..\..\src\lua\modules\graphics\je_lua_texture.h"> + <ClInclude Include="..\..\..\src\lua\modules\graphics\je_lua_texture.h"> <Filter>source\modules\graphics</Filter> </ClInclude> - <ClInclude Include="..\..\src\lua\modules\graphics\je_lua_texture_font.h"> + <ClInclude Include="..\..\..\src\lua\modules\graphics\je_lua_texture_font.h"> <Filter>source\modules\graphics</Filter> </ClInclude> - <ClInclude Include="..\..\src\lua\modules\graphics\je_lua_ttf.h"> + <ClInclude Include="..\..\..\src\lua\modules\graphics\je_lua_ttf.h"> <Filter>source\modules\graphics</Filter> </ClInclude> - <ClInclude Include="..\..\src\lua\modules\graphics\je_lua_ttf_data.h"> + <ClInclude Include="..\..\..\src\lua\modules\graphics\je_lua_ttf_data.h"> <Filter>source\modules\graphics</Filter> </ClInclude> - <ClInclude Include="..\..\src\lua\modules\ai\je_lua_ai.h"> + <ClInclude Include="..\..\..\src\lua\modules\ai\je_lua_ai.h"> <Filter>source\modules\ai</Filter> </ClInclude> - <ClInclude Include="..\..\src\lua\modules\ai\je_lua_behavior_tree.h"> + <ClInclude Include="..\..\..\src\lua\modules\ai\je_lua_behavior_tree.h"> <Filter>source\modules\ai</Filter> </ClInclude> - <ClInclude Include="..\..\src\lua\modules\ai\je_lua_state_machine.h"> + <ClInclude Include="..\..\..\src\lua\modules\ai\je_lua_state_machine.h"> <Filter>source\modules\ai</Filter> </ClInclude> - <ClInclude Include="..\..\src\lua\modules\audio\je_lua_audio.h"> + <ClInclude Include="..\..\..\src\lua\modules\audio\je_lua_audio.h"> <Filter>source\modules\audio</Filter> </ClInclude> - <ClInclude Include="..\..\src\lua\modules\audio\je_lua_source.h"> + <ClInclude Include="..\..\..\src\lua\modules\audio\je_lua_source.h"> <Filter>source\modules\audio</Filter> </ClInclude> - <ClInclude Include="..\..\src\lua\modules\bit\je_lua_bit.h"> + <ClInclude Include="..\..\..\src\lua\modules\bit\je_lua_bit.h"> <Filter>source\modules\bit</Filter> </ClInclude> - <ClInclude Include="..\..\src\lua\modules\core\je_lua_core.h"> + <ClInclude Include="..\..\..\src\lua\modules\core\je_lua_core.h"> <Filter>source\modules\core</Filter> </ClInclude> - <ClInclude Include="..\..\src\lua\modules\event\je_lua_event.h"> + <ClInclude Include="..\..\..\src\lua\modules\event\je_lua_event.h"> <Filter>source\modules\event</Filter> </ClInclude> - <ClInclude Include="..\..\src\lua\modules\filesystem\je_lua_filesystem.h"> + <ClInclude Include="..\..\..\src\lua\modules\filesystem\je_lua_filesystem.h"> <Filter>source\modules\filesystem</Filter> </ClInclude> - <ClInclude Include="..\..\src\lua\modules\joypad\je_lua_joypad.h"> + <ClInclude Include="..\..\..\src\lua\modules\joypad\je_lua_joypad.h"> <Filter>source\modules\joypad</Filter> </ClInclude> - <ClInclude Include="..\..\src\lua\modules\keyboard\je_lua_keyboard.h"> + <ClInclude Include="..\..\..\src\lua\modules\keyboard\je_lua_keyboard.h"> <Filter>source\modules\keyboard</Filter> </ClInclude> - <ClInclude Include="..\..\src\lua\modules\math\je_lua_math.h"> + <ClInclude Include="..\..\..\src\lua\modules\math\je_lua_math.h"> <Filter>source\modules\math</Filter> </ClInclude> - <ClInclude Include="..\..\src\lua\modules\mouse\je_lua_mouse.h"> + <ClInclude Include="..\..\..\src\lua\modules\mouse\je_lua_mouse.h"> <Filter>source\modules\mouse</Filter> </ClInclude> - <ClInclude Include="..\..\src\lua\modules\net\je_lua_net.h"> + <ClInclude Include="..\..\..\src\lua\modules\net\je_lua_net.h"> <Filter>source\modules\net</Filter> </ClInclude> - <ClInclude Include="..\..\src\lua\modules\net\je_lua_socket.h"> + <ClInclude Include="..\..\..\src\lua\modules\net\je_lua_socket.h"> <Filter>source\modules\net</Filter> </ClInclude> - <ClInclude Include="..\..\src\lua\modules\time\je_lua_time.h"> + <ClInclude Include="..\..\..\src\lua\modules\time\je_lua_time.h"> <Filter>source\modules\time</Filter> </ClInclude> - <ClInclude Include="..\..\src\lua\common\je_lua_function.h"> + <ClInclude Include="..\..\..\src\lua\common\je_lua_function.h"> <Filter>source\common</Filter> </ClInclude> - <ClInclude Include="..\..\src\lua\modules\graphics\je_lua_animation.h"> + <ClInclude Include="..\..\..\src\lua\modules\graphics\je_lua_animation.h"> <Filter>source\modules\graphics</Filter> </ClInclude> - <ClInclude Include="..\..\src\lua\modules\graphics\je_lua_animator.h"> + <ClInclude Include="..\..\..\src\lua\modules\graphics\je_lua_animator.h"> <Filter>source\modules\graphics</Filter> </ClInclude> - <ClInclude Include="..\..\src\lua\common\je_lua.h"> + <ClInclude Include="..\..\..\src\lua\common\je_lua.h"> <Filter>source\common</Filter> </ClInclude> - <ClInclude Include="..\..\src\lua\modules\je_lua_modules.h"> + <ClInclude Include="..\..\..\src\lua\modules\je_lua_modules.h"> <Filter>source\modules</Filter> </ClInclude> - <ClInclude Include="..\..\src\lua\common\je_lua_object.h"> + <ClInclude Include="..\..\..\src\lua\common\je_lua_object.h"> <Filter>source\common</Filter> </ClInclude> - <ClInclude Include="..\..\src\lua\je_lua_jin.h"> + <ClInclude Include="..\..\..\src\lua\je_lua_jin.h"> <Filter>source</Filter> </ClInclude> </ItemGroup> - <ItemGroup> - <ResourceCompile Include="jin.rc"> - <Filter>resource</Filter> - </ResourceCompile> - </ItemGroup> - <ItemGroup> - <Image Include="..\..\res\icon.ico"> - <Filter>resource</Filter> - </Image> - </ItemGroup> </Project>
\ No newline at end of file diff --git a/build/vc++/jin.vcxproj.user b/build/vc++/libjin-lua/libjin-lua.vcxproj.user index fbd2421..a8fee8c 100644 --- a/build/vc++/jin.vcxproj.user +++ b/build/vc++/libjin-lua/libjin-lua.vcxproj.user @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <LocalDebuggerWorkingDirectory>$(ProjectDir)..\..\bin</LocalDebuggerWorkingDirectory> + <LocalDebuggerWorkingDirectory>$(ProjectDir)..\..\..\bin</LocalDebuggerWorkingDirectory> <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <LocalDebuggerWorkingDirectory>$(ProjectDir)..\..\bin</LocalDebuggerWorkingDirectory> + <LocalDebuggerWorkingDirectory>$(ProjectDir)..\..\..\bin</LocalDebuggerWorkingDirectory> <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor> </PropertyGroup> <PropertyGroup> diff --git a/build/vc++/resource.h b/build/vc++/resource.h Binary files differdeleted file mode 100644 index fdc6053..0000000 --- a/build/vc++/resource.h +++ /dev/null |