diff --git a/README.md b/README.md index cd9af97..2cb49b2 100644 --- a/README.md +++ b/README.md @@ -8,3 +8,17 @@ This is the official issues tracker of . If you are experi Documentation is available in the [wiki](https://github.com/nesbox/tic.computer/wiki). Thanks! + +Building with Visual Studio 2015 +======= +- install Visual Studio 2015 +- install GIT +- run following commands in `cmd` +``` +mkdir tic +cd tic +git clone https://github.com/nesbox/3rd-party +git clone https://github.com/nesbox/TIC-80.git +``` +- open `TIC-80\build\windows\tic\tic.sln` and run build +- enjoy :) diff --git a/build/windows/gif/gif.vcxproj b/build/windows/gif/gif.vcxproj index c0c2bde..28e075e 100644 --- a/build/windows/gif/gif.vcxproj +++ b/build/windows/gif/gif.vcxproj @@ -19,14 +19,14 @@ - - - - - - - - + + + + + + + + {6EA9D998-7557-4AED-ABFC-142F9960C9B6} diff --git a/build/windows/gif/gif.vcxproj.filters b/build/windows/gif/gif.vcxproj.filters index e9e4b11..dc1928a 100644 --- a/build/windows/gif/gif.vcxproj.filters +++ b/build/windows/gif/gif.vcxproj.filters @@ -1,13 +1,13 @@  - - - - - - - - + + + + + + + + \ No newline at end of file diff --git a/build/windows/lua/lua.vcxproj b/build/windows/lua/lua.vcxproj index 63838f9..147b9f1 100644 --- a/build/windows/lua/lua.vcxproj +++ b/build/windows/lua/lua.vcxproj @@ -19,43 +19,43 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {57D2471B-3138-495E-AF18-6E290D098FFC} diff --git a/build/windows/lua/lua.vcxproj.filters b/build/windows/lua/lua.vcxproj.filters index fd28ba7..ab51814 100644 --- a/build/windows/lua/lua.vcxproj.filters +++ b/build/windows/lua/lua.vcxproj.filters @@ -12,115 +12,115 @@ - - lua\lib - - - lua\lib - - - lua\lib - - - lua\lib - - - lua\lib - - - lua\lib - - - lua\lib - - - lua\lib - - - lua - - - lua - - - lua - - - lua - - - lua - - - lua - - - lua - - - lua - - - lua - - - lua - - - lua - - - lua - - - lua - - - lua - - - lua - - - lua - - - lua - - - lua - - - lua - - - lua - - - lua - - - lua - - - lua - - - lua - - + lpeg - + lpeg - + lpeg - + lpeg - + + lua\lib + + + lua\lib + + + lua + + + lua + + + lua + + + lua + + + lua + + + lua + + + lua + + + lua + + + lua + + + lua + + + lua + + + lua + + + lua + + + lua + + + lua + + + lua + + + lua + + + lua + + + lua + + + lua + + + lua + + + lua + + + lua + + + lua + + + lua\lib + + + lua\lib + + + lua\lib + + + lua\lib + + + lua\lib + + + lua\lib + + lpeg diff --git a/build/windows/tic/tic.sln b/build/windows/tic/tic.sln index f0ba6b0..7516dd7 100644 --- a/build/windows/tic/tic.sln +++ b/build/windows/tic/tic.sln @@ -15,6 +15,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tic80", "..\tic80\tic80.vcx EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example", "..\example\example.vcxproj", "{86CAA9C1-C61A-40D8-AC77-33D94754C824}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL2", "..\..\..\..\3rd-party\SDL2-2.0.5\VisualC\SDL\SDL.vcxproj", "{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL2main", "..\..\..\..\3rd-party\SDL2-2.0.5\VisualC\SDLmain\SDLmain.vcxproj", "{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|x64 = Debug|x64 @@ -71,6 +75,22 @@ Global {86CAA9C1-C61A-40D8-AC77-33D94754C824}.Release|x64.Build.0 = Release|x64 {86CAA9C1-C61A-40D8-AC77-33D94754C824}.Release|x86.ActiveCfg = Release|Win32 {86CAA9C1-C61A-40D8-AC77-33D94754C824}.Release|x86.Build.0 = Release|Win32 + {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Debug|x64.ActiveCfg = Debug|x64 + {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Debug|x64.Build.0 = Debug|x64 + {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Debug|x86.ActiveCfg = Debug|Win32 + {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Debug|x86.Build.0 = Debug|Win32 + {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release|x64.ActiveCfg = Release|x64 + {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release|x64.Build.0 = Release|x64 + {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release|x86.ActiveCfg = Release|Win32 + {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release|x86.Build.0 = Release|Win32 + {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Debug|x64.ActiveCfg = Debug|x64 + {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Debug|x64.Build.0 = Debug|x64 + {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Debug|x86.ActiveCfg = Debug|Win32 + {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Debug|x86.Build.0 = Debug|Win32 + {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release|x64.ActiveCfg = Release|x64 + {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release|x64.Build.0 = Release|x64 + {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release|x86.ActiveCfg = Release|Win32 + {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release|x86.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/build/windows/tic/tic.vcxproj b/build/windows/tic/tic.vcxproj index 066a510..0ba75df 100644 --- a/build/windows/tic/tic.vcxproj +++ b/build/windows/tic/tic.vcxproj @@ -19,6 +19,12 @@ + + {da956fd3-e142-46f2-9dd5-c78bebb56b7a} + + + {81ce8daf-ebb2-4761-8e45-b71abcca8c68} + {6ea9d998-7557-4aed-abfc-142f9960c9b6} @@ -144,7 +150,7 @@ Windows true - SDL2main.lib;SDL2.lib;ws2_32.lib;version.lib;Imm32.lib;Winmm.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + ws2_32.lib;version.lib;Imm32.lib;Winmm.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) ..\..\..\lib\windows @@ -160,7 +166,7 @@ Windows true - SDL2main.lib;SDL2.lib;ws2_32.lib;version.lib;Imm32.lib;Winmm.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + ws2_32.lib;version.lib;Imm32.lib;Winmm.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) ..\..\..\lib\windows @@ -180,7 +186,7 @@ true true true - SDL2main.lib;SDL2.lib;ws2_32.lib;version.lib;Imm32.lib;Winmm.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + ws2_32.lib;version.lib;Imm32.lib;Winmm.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) ..\..\..\lib\windows @@ -200,7 +206,7 @@ true true true - SDL2main.lib;SDL2.lib;ws2_32.lib;version.lib;Imm32.lib;Winmm.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + ws2_32.lib;version.lib;Imm32.lib;Winmm.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) ..\..\..\lib\windows diff --git a/build/windows/zlib/zlib.vcxproj b/build/windows/zlib/zlib.vcxproj index 9c63f11..51a0ac8 100644 --- a/build/windows/zlib/zlib.vcxproj +++ b/build/windows/zlib/zlib.vcxproj @@ -19,21 +19,21 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + {1DFBDFA2-F204-42FF-B99E-250E4B2EBA04} diff --git a/build/windows/zlib/zlib.vcxproj.filters b/build/windows/zlib/zlib.vcxproj.filters index 0dc4b01..f752ff9 100644 --- a/build/windows/zlib/zlib.vcxproj.filters +++ b/build/windows/zlib/zlib.vcxproj.filters @@ -1,20 +1,20 @@  - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/lib/windows/SDL2.lib b/lib/windows/SDL2.lib deleted file mode 100644 index 0b0c31e..0000000 Binary files a/lib/windows/SDL2.lib and /dev/null differ diff --git a/lib/windows/SDL2main.lib b/lib/windows/SDL2main.lib deleted file mode 100644 index 3404a6b..0000000 Binary files a/lib/windows/SDL2main.lib and /dev/null differ