diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..e9f02ef --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "3rd-party"] + path = 3rd-party + url = git@github.com:nesbox/3rd-party.git diff --git a/3rd-party b/3rd-party new file mode 160000 index 0000000..c3f37f4 --- /dev/null +++ b/3rd-party @@ -0,0 +1 @@ +Subproject commit c3f37f4431282db7f1a99a89f90767fa20481a84 diff --git a/Makefile b/Makefile index a2186e3..9ca5e09 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ OPT=-O3 -Wall -std=c99 OPT_PRO=-DTIC80_PRO BIN_NAME= bin/tic80 -3RD_PARTY = ../3rd-party +3RD_PARTY = 3rd-party DUKTAPE_LIB = $(3RD_PARTY)/duktape-2.2.0/src BLIPBUF_LIB = $(3RD_PARTY)/blip-buf SDL_NET_LIB = $(3RD_PARTY)/SDL2_net-2.0.1 @@ -327,7 +327,7 @@ chip-lto-pro: $(eval OPT += $(OPT_PRO)) make chip-lto OPT="$(OPT)" -linux: +linux: $(CC) $(LINUX_INCLUDES) $(SOURCES) $(LPEG_SRC) $(GIF_SRC) $(SOURCES_EXT) $(TIC80_SRC) $(OPT) $(INCLUDES) $(LINUX_LIBS) $(LINUX_LINKER_FLAGS) -o $(BIN_NAME) linux-pro: diff --git a/README.md b/README.md index def9d63..78593f7 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,6 @@ Thanks! - install GIT - run following commands in `cmd` ``` -git clone https://github.com/nesbox/3rd-party git clone https://github.com/nesbox/TIC-80 ``` - open `TIC-80\build\windows\tic\tic.sln` and build @@ -30,7 +29,6 @@ made by [@matheuslessarodrigues](https://github.com/matheuslessarodrigues) run the following commands in the Terminal ``` sudo apt-get install git build-essential libgtk-3-dev libsdl2-dev lua5.3-dev zlib1g-dev -git clone https://github.com/nesbox/3rd-party git clone https://github.com/nesbox/TIC-80 cd TIC-80 make linux diff --git a/build/android/jni/SDL2/Android.mk b/build/android/jni/SDL2/Android.mk index db19fcf..ce1241e 100644 --- a/build/android/jni/SDL2/Android.mk +++ b/build/android/jni/SDL2/Android.mk @@ -2,5 +2,5 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := SDL2 -LOCAL_SRC_FILES := ../../../../../3rd-party/pre-built/android/sdl2/$(TARGET_ARCH_ABI)/libSDL2.so -include $(PREBUILT_SHARED_LIBRARY) \ No newline at end of file +LOCAL_SRC_FILES := ../../../../3rd-party/pre-built/android/sdl2/$(TARGET_ARCH_ABI)/libSDL2.so +include $(PREBUILT_SHARED_LIBRARY) diff --git a/build/android/jni/gif/Android.mk b/build/android/jni/gif/Android.mk index 60c457c..d1c1758 100644 --- a/build/android/jni/gif/Android.mk +++ b/build/android/jni/gif/Android.mk @@ -2,5 +2,5 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := gif -LOCAL_SRC_FILES := ../../../../../3rd-party/pre-built/android/gif/$(TARGET_ARCH_ABI)/libgif.so -include $(PREBUILT_SHARED_LIBRARY) \ No newline at end of file +LOCAL_SRC_FILES := ../../../../3rd-party/pre-built/android/gif/$(TARGET_ARCH_ABI)/libgif.so +include $(PREBUILT_SHARED_LIBRARY) diff --git a/build/android/jni/lua/Android.mk b/build/android/jni/lua/Android.mk index 7b4529a..1ec602a 100644 --- a/build/android/jni/lua/Android.mk +++ b/build/android/jni/lua/Android.mk @@ -2,5 +2,5 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := lua -LOCAL_SRC_FILES := ../../../../../3rd-party/pre-built/android/lua/$(TARGET_ARCH_ABI)/liblua.so -include $(PREBUILT_SHARED_LIBRARY) \ No newline at end of file +LOCAL_SRC_FILES := ../../../../3rd-party/pre-built/android/lua/$(TARGET_ARCH_ABI)/liblua.so +include $(PREBUILT_SHARED_LIBRARY) diff --git a/build/android/jni/src/Android.mk b/build/android/jni/src/Android.mk index 72d1977..6b456a1 100644 --- a/build/android/jni/src/Android.mk +++ b/build/android/jni/src/Android.mk @@ -5,7 +5,7 @@ LOCAL_CFLAGS += -O3 -Wall -std=c99 -D"log2(x)=(log(x)/log(2))" LOCAL_MODULE := main SRC_PATH := ../../../../src -THIRD_PARTY_PATH := ../../../../../3rd-party +THIRD_PARTY_PATH := ../../../../3rd-party LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/$(THIRD_PARTY_PATH)/SDL2-2.0.7/include \ diff --git a/build/android/jni/zlib/Android.mk b/build/android/jni/zlib/Android.mk index 2f7be55..605795d 100644 --- a/build/android/jni/zlib/Android.mk +++ b/build/android/jni/zlib/Android.mk @@ -2,5 +2,5 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := z -LOCAL_SRC_FILES := ../../../../../3rd-party/pre-built/android/zlib/$(TARGET_ARCH_ABI)/libz.so -include $(PREBUILT_SHARED_LIBRARY) \ No newline at end of file +LOCAL_SRC_FILES := ../../../../3rd-party/pre-built/android/zlib/$(TARGET_ARCH_ABI)/libz.so +include $(PREBUILT_SHARED_LIBRARY) diff --git a/build/uwp/gif/gif.vcxproj b/build/uwp/gif/gif.vcxproj index 890df8a..0fe82ba 100644 --- a/build/uwp/gif/gif.vcxproj +++ b/build/uwp/gif/gif.vcxproj @@ -27,14 +27,14 @@ - - - - - - - - + + + + + + + + {bc1084df-210a-48d6-a077-761d8c16947b} @@ -206,4 +206,4 @@ - \ No newline at end of file + diff --git a/build/uwp/gif/gif.vcxproj.filters b/build/uwp/gif/gif.vcxproj.filters index cc4f672..9766790 100644 --- a/build/uwp/gif/gif.vcxproj.filters +++ b/build/uwp/gif/gif.vcxproj.filters @@ -1,13 +1,13 @@  - - - - - - - - + + + + + + + + - \ No newline at end of file + diff --git a/build/uwp/lua/lua.vcxproj b/build/uwp/lua/lua.vcxproj index a9456bf..664e087 100644 --- a/build/uwp/lua/lua.vcxproj +++ b/build/uwp/lua/lua.vcxproj @@ -27,41 +27,41 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {53802f21-41da-4ac1-8b62-0dac2ccb8af8} @@ -245,4 +245,4 @@ - \ No newline at end of file + diff --git a/build/uwp/lua/lua.vcxproj.filters b/build/uwp/lua/lua.vcxproj.filters index fadc3b8..d97176e 100644 --- a/build/uwp/lua/lua.vcxproj.filters +++ b/build/uwp/lua/lua.vcxproj.filters @@ -16,109 +16,109 @@ - + 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 - + lua\lib - + lua\lib - + lua\lib - + lpeg - + lpeg - + lpeg - + lpeg - + lpeg diff --git a/build/uwp/tic/tic.sln b/build/uwp/tic/tic.sln index 60da1ee..dc4ac55 100644 --- a/build/uwp/tic/tic.sln +++ b/build/uwp/tic/tic.sln @@ -11,9 +11,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gif", "..\gif\gif.vcxproj", EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tic80", "..\tic80\tic80.vcxproj", "{9C39ACF1-5F52-4A2B-A467-9F2805D6174B}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL2-UWP", "..\..\..\..\3rd-party\SDL2-2.0.7\VisualC-WinRT\UWP_VS2015\SDL-UWP.vcxproj", "{89E9B32E-A86A-47C3-A948-D2B1622925CE}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL2-UWP", "..\..\..\3rd-party\SDL2-2.0.7\VisualC-WinRT\UWP_VS2015\SDL-UWP.vcxproj", "{89E9B32E-A86A-47C3-A948-D2B1622925CE}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib-uwp", "..\..\..\..\3rd-party\zlib-1.2.8\winrt\zlib-uwp\zlib-uwp.vcxproj", "{978F53DB-F959-4CB4-84A7-463AF29949BE}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib-uwp", "..\..\..\3rd-party\zlib-1.2.8\winrt\zlib-uwp\zlib-uwp.vcxproj", "{978F53DB-F959-4CB4-84A7-463AF29949BE}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/build/uwp/tic/tic.vcxproj b/build/uwp/tic/tic.vcxproj index 828fe34..b7ed1be 100644 --- a/build/uwp/tic/tic.vcxproj +++ b/build/uwp/tic/tic.vcxproj @@ -109,7 +109,7 @@ 4453;28204 false NotUsing - ..\include;..\..\..\include;..\..\..\..\3rd-party\lua-5.3.1\src;..\..\..\..\3rd-party\giflib-5.1.4\lib;..\..\..\..\3rd-party\SDL2-2.0.7\include;..\..\..\..\3rd-party\zlib-1.2.8;..\..\..\..\3rd-party\SDL2_net-2.0.1;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ..\include;..\..\..\include;..\..\..\3rd-party\lua-5.3.1\src;..\..\..\3rd-party\giflib-5.1.4\lib;..\..\..\3rd-party\SDL2-2.0.7\include;..\..\..\3rd-party\zlib-1.2.8;..\..\..\3rd-party\SDL2_net-2.0.1;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) _WINSOCK_DEPRECATED_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;LUA_COMPAT_5_2;_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1;%(ClCompile.PreprocessorDefinitions) @@ -125,7 +125,7 @@ 4453;28204 false NotUsing - ..\include;..\..\..\include;..\..\..\..\3rd-party\lua-5.3.1\src;..\..\..\..\3rd-party\giflib-5.1.4\lib;..\..\..\..\3rd-party\SDL2-2.0.7\include;..\..\..\..\3rd-party\zlib-1.2.8;..\..\..\..\3rd-party\SDL2_net-2.0.1;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ..\include;..\..\..\include;..\..\..\3rd-party\lua-5.3.1\src;..\..\..\3rd-party\giflib-5.1.4\lib;..\..\..\3rd-party\SDL2-2.0.7\include;..\..\..\3rd-party\zlib-1.2.8;..\..\..\3rd-party\SDL2_net-2.0.1;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) _WINSOCK_DEPRECATED_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;LUA_COMPAT_5_2;_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1;%(ClCompile.PreprocessorDefinitions) @@ -141,7 +141,7 @@ 4453;28204 false NotUsing - ..\include;..\..\..\include;..\..\..\..\3rd-party\lua-5.3.1\src;..\..\..\..\3rd-party\giflib-5.1.4\lib;..\..\..\..\3rd-party\SDL2-2.0.7\include;..\..\..\..\3rd-party\zlib-1.2.8;..\..\..\..\3rd-party\SDL2_net-2.0.1;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ..\include;..\..\..\include;..\..\..\3rd-party\lua-5.3.1\src;..\..\..\3rd-party\giflib-5.1.4\lib;..\..\..\3rd-party\SDL2-2.0.7\include;..\..\..\3rd-party\zlib-1.2.8;..\..\..\3rd-party\SDL2_net-2.0.1;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) _WINSOCK_DEPRECATED_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;LUA_COMPAT_5_2;_UNICODE;UNICODE;%(PreprocessorDefinitions) @@ -157,7 +157,7 @@ 4453;28204 false NotUsing - ..\include;..\..\..\include;..\..\..\..\3rd-party\lua-5.3.1\src;..\..\..\..\3rd-party\giflib-5.1.4\lib;..\..\..\..\3rd-party\SDL2-2.0.7\include;..\..\..\..\3rd-party\zlib-1.2.8;..\..\..\..\3rd-party\SDL2_net-2.0.1;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ..\include;..\..\..\include;..\..\..\3rd-party\lua-5.3.1\src;..\..\..\3rd-party\giflib-5.1.4\lib;..\..\..\3rd-party\SDL2-2.0.7\include;..\..\..\3rd-party\zlib-1.2.8;..\..\..\3rd-party\SDL2_net-2.0.1;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) _WINSOCK_DEPRECATED_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;LUA_COMPAT_5_2;_UNICODE;UNICODE;%(PreprocessorDefinitions) @@ -173,7 +173,7 @@ 4453;28204 false NotUsing - ..\include;..\..\..\include;..\..\..\..\3rd-party\lua-5.3.1\src;..\..\..\..\3rd-party\giflib-5.1.4\lib;..\..\..\..\3rd-party\SDL2-2.0.7\include;..\..\..\..\3rd-party\zlib-1.2.8;..\..\..\..\3rd-party\SDL2_net-2.0.1;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ..\include;..\..\..\include;..\..\..\3rd-party\lua-5.3.1\src;..\..\..\3rd-party\giflib-5.1.4\lib;..\..\..\3rd-party\SDL2-2.0.7\include;..\..\..\3rd-party\zlib-1.2.8;..\..\..\3rd-party\SDL2_net-2.0.1;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) _WINSOCK_DEPRECATED_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;LUA_COMPAT_5_2;_UNICODE;UNICODE;%(PreprocessorDefinitions) @@ -189,7 +189,7 @@ 4453;28204 false NotUsing - ..\include;..\..\..\include;..\..\..\..\3rd-party\lua-5.3.1\src;..\..\..\..\3rd-party\giflib-5.1.4\lib;..\..\..\..\3rd-party\SDL2-2.0.7\include;..\..\..\..\3rd-party\zlib-1.2.8;..\..\..\..\3rd-party\SDL2_net-2.0.1;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ..\include;..\..\..\include;..\..\..\3rd-party\lua-5.3.1\src;..\..\..\3rd-party\giflib-5.1.4\lib;..\..\..\3rd-party\SDL2-2.0.7\include;..\..\..\3rd-party\zlib-1.2.8;..\..\..\3rd-party\SDL2_net-2.0.1;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) _WINSOCK_DEPRECATED_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;LUA_COMPAT_5_2;_UNICODE;UNICODE;%(PreprocessorDefinitions) @@ -216,10 +216,10 @@ - + {89e9b32e-a86a-47c3-a948-d2b1622925ce} - + {978f53db-f959-4cb4-84a7-463af29949be} @@ -233,7 +233,7 @@ - + true true true @@ -241,9 +241,9 @@ true true - - - + + + @@ -278,7 +278,7 @@ - + diff --git a/build/uwp/tic/tic.vcxproj.filters b/build/uwp/tic/tic.vcxproj.filters index 248ef60..6a52f48 100644 --- a/build/uwp/tic/tic.vcxproj.filters +++ b/build/uwp/tic/tic.vcxproj.filters @@ -113,18 +113,18 @@ src - - + + src\ext\net - + src\ext\net - + src\ext\net - + \ No newline at end of file diff --git a/build/uwp/tic80/tic80.vcxproj b/build/uwp/tic80/tic80.vcxproj index db6d15b..a020cad 100644 --- a/build/uwp/tic80/tic80.vcxproj +++ b/build/uwp/tic80/tic80.vcxproj @@ -27,8 +27,8 @@ - - + + @@ -143,7 +143,7 @@ NotUsing false - ..\..\..\include;..\..\..\..\3rd-party\lua-5.3.1\src;..\..\..\..\3rd-party\giflib-5.1.4\lib;..\..\..\..\3rd-party\duktape-2.2.0\src;..\..\..\..\3rd-party\blip-buf;..\..\..\..\3rd-party\moonscript;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ..\..\..\include;..\..\..\3rd-party\lua-5.3.1\src;..\..\..\3rd-party\giflib-5.1.4\lib;..\..\..\3rd-party\duktape-2.2.0\src;..\..\..\3rd-party\blip-buf;..\..\..\3rd-party\moonscript;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) LUA_COMPAT_5_2;_CRT_SECURE_NO_WARNINGS;TIC80_SHARED;_WINDLL;%(PreprocessorDefinitions) false @@ -159,7 +159,7 @@ NotUsing false - ..\..\..\include;..\..\..\..\3rd-party\lua-5.3.1\src;..\..\..\..\3rd-party\giflib-5.1.4\lib;..\..\..\..\3rd-party\duktape-2.2.0\src;..\..\..\..\3rd-party\blip-buf;..\..\..\..\3rd-party\moonscript;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ..\..\..\include;..\..\..\3rd-party\lua-5.3.1\src;..\..\..\3rd-party\giflib-5.1.4\lib;..\..\..\3rd-party\duktape-2.2.0\src;..\..\..\3rd-party\blip-buf;..\..\..\3rd-party\moonscript;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) LUA_COMPAT_5_2;_CRT_SECURE_NO_WARNINGS;TIC80_SHARED;_WINDLL;%(PreprocessorDefinitions) false @@ -175,7 +175,7 @@ NotUsing false - ..\..\..\include;..\..\..\..\3rd-party\lua-5.3.1\src;..\..\..\..\3rd-party\giflib-5.1.4\lib;..\..\..\..\3rd-party\duktape-2.2.0\src;..\..\..\..\3rd-party\blip-buf;..\..\..\..\3rd-party\moonscript;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ..\..\..\include;..\..\..\3rd-party\lua-5.3.1\src;..\..\..\3rd-party\giflib-5.1.4\lib;..\..\..\3rd-party\duktape-2.2.0\src;..\..\..\3rd-party\blip-buf;..\..\..\3rd-party\moonscript;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) LUA_COMPAT_5_2;_CRT_SECURE_NO_WARNINGS;TIC80_SHARED;_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1;%(ClCompile.PreprocessorDefinitions) false @@ -191,7 +191,7 @@ NotUsing false - ..\..\..\include;..\..\..\..\3rd-party\lua-5.3.1\src;..\..\..\..\3rd-party\giflib-5.1.4\lib;..\..\..\..\3rd-party\duktape-2.2.0\src;..\..\..\..\3rd-party\blip-buf;..\..\..\..\3rd-party\moonscript;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ..\..\..\include;..\..\..\3rd-party\lua-5.3.1\src;..\..\..\3rd-party\giflib-5.1.4\lib;..\..\..\3rd-party\duktape-2.2.0\src;..\..\..\3rd-party\blip-buf;..\..\..\3rd-party\moonscript;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) LUA_COMPAT_5_2;_CRT_SECURE_NO_WARNINGS;TIC80_SHARED;_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1;%(ClCompile.PreprocessorDefinitions) false @@ -207,7 +207,7 @@ NotUsing false - ..\..\..\include;..\..\..\..\3rd-party\lua-5.3.1\src;..\..\..\..\3rd-party\giflib-5.1.4\lib;..\..\..\..\3rd-party\duktape-2.2.0\src;..\..\..\..\3rd-party\blip-buf;..\..\..\..\3rd-party\moonscript;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ..\..\..\include;..\..\..\3rd-party\lua-5.3.1\src;..\..\..\3rd-party\giflib-5.1.4\lib;..\..\..\3rd-party\duktape-2.2.0\src;..\..\..\3rd-party\blip-buf;..\..\..\3rd-party\moonscript;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) LUA_COMPAT_5_2;_CRT_SECURE_NO_WARNINGS;TIC80_SHARED;_WINDLL;%(PreprocessorDefinitions) false @@ -223,7 +223,7 @@ NotUsing false - ..\..\..\include;..\..\..\..\3rd-party\lua-5.3.1\src;..\..\..\..\3rd-party\giflib-5.1.4\lib;..\..\..\..\3rd-party\duktape-2.2.0\src;..\..\..\..\3rd-party\blip-buf;..\..\..\..\3rd-party\moonscript;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ..\..\..\include;..\..\..\3rd-party\lua-5.3.1\src;..\..\..\3rd-party\giflib-5.1.4\lib;..\..\..\3rd-party\duktape-2.2.0\src;..\..\..\3rd-party\blip-buf;..\..\..\3rd-party\moonscript;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) LUA_COMPAT_5_2;_CRT_SECURE_NO_WARNINGS;TIC80_SHARED;_WINDLL;%(PreprocessorDefinitions) false diff --git a/build/uwp/tic80/tic80.vcxproj.filters b/build/uwp/tic80/tic80.vcxproj.filters index 056c074..2dc1824 100644 --- a/build/uwp/tic80/tic80.vcxproj.filters +++ b/build/uwp/tic80/tic80.vcxproj.filters @@ -30,10 +30,10 @@ src\ext - + src\ext\duktape - + src\ext diff --git a/build/windows/example/example.vcxproj b/build/windows/example/example.vcxproj index aa33de4..8982b6b 100644 --- a/build/windows/example/example.vcxproj +++ b/build/windows/example/example.vcxproj @@ -38,10 +38,10 @@ - + {da956fd3-e142-46f2-9dd5-c78bebb56b7a} - + {81ce8daf-ebb2-4761-8e45-b71abcca8c68} @@ -167,7 +167,7 @@ Level3 Disabled WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - ..\..\..\..\3rd-party\SDL2-2.0.7\include;..\..\..\include; + ..\..\..\3rd-party\SDL2-2.0.7\include;..\..\..\include; Windows @@ -182,7 +182,7 @@ Level3 Disabled WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - ..\..\..\..\3rd-party\SDL2-2.0.7\include;..\..\..\include; + ..\..\..\3rd-party\SDL2-2.0.7\include;..\..\..\include; Windows @@ -197,7 +197,7 @@ Level3 Disabled _DEBUG;_WINDOWS;%(PreprocessorDefinitions) - ..\..\..\..\3rd-party\SDL2-2.0.7\include;..\..\..\include; + ..\..\..\3rd-party\SDL2-2.0.7\include;..\..\..\include; Windows @@ -212,7 +212,7 @@ Level3 Disabled _DEBUG;_WINDOWS;%(PreprocessorDefinitions) - ..\..\..\..\3rd-party\SDL2-2.0.7\include;..\..\..\include; + ..\..\..\3rd-party\SDL2-2.0.7\include;..\..\..\include; Windows @@ -229,7 +229,7 @@ true true WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - ..\..\..\..\3rd-party\SDL2-2.0.7\include;..\..\..\include; + ..\..\..\3rd-party\SDL2-2.0.7\include;..\..\..\include; Windows @@ -248,7 +248,7 @@ true true WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - ..\..\..\..\3rd-party\SDL2-2.0.7\include;..\..\..\include; + ..\..\..\3rd-party\SDL2-2.0.7\include;..\..\..\include; Windows @@ -267,7 +267,7 @@ true true NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - ..\..\..\..\3rd-party\SDL2-2.0.7\include;..\..\..\include; + ..\..\..\3rd-party\SDL2-2.0.7\include;..\..\..\include; Windows @@ -286,7 +286,7 @@ true true NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - ..\..\..\..\3rd-party\SDL2-2.0.7\include;..\..\..\include; + ..\..\..\3rd-party\SDL2-2.0.7\include;..\..\..\include; Windows diff --git a/build/windows/gif/gif.vcxproj b/build/windows/gif/gif.vcxproj index bf3af20..4a7d81d 100644 --- a/build/windows/gif/gif.vcxproj +++ b/build/windows/gif/gif.vcxproj @@ -35,14 +35,14 @@ - - - - - - - - + + + + + + + + {6EA9D998-7557-4AED-ABFC-142F9960C9B6} diff --git a/build/windows/gif/gif.vcxproj.filters b/build/windows/gif/gif.vcxproj.filters index dc1928a..b9cfe7f 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 4c968da..b45f460 100644 --- a/build/windows/lua/lua.vcxproj +++ b/build/windows/lua/lua.vcxproj @@ -35,43 +35,43 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {57D2471B-3138-495E-AF18-6E290D098FFC} diff --git a/build/windows/lua/lua.vcxproj.filters b/build/windows/lua/lua.vcxproj.filters index ab51814..fbdc017 100644 --- a/build/windows/lua/lua.vcxproj.filters +++ b/build/windows/lua/lua.vcxproj.filters @@ -12,115 +12,115 @@ - + 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 f3e260b..6e45ff4 100644 --- a/build/windows/tic/tic.sln +++ b/build/windows/tic/tic.sln @@ -15,9 +15,9 @@ 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.7\VisualC\SDL\SDL.vcxproj", "{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL2", "..\..\..\3rd-party\SDL2-2.0.7\VisualC\SDL\SDL.vcxproj", "{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL2main", "..\..\..\..\3rd-party\SDL2-2.0.7\VisualC\SDLmain\SDLmain.vcxproj", "{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL2main", "..\..\..\3rd-party\SDL2-2.0.7\VisualC\SDLmain\SDLmain.vcxproj", "{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/build/windows/tic/tic.vcxproj b/build/windows/tic/tic.vcxproj index 6747df7..38b4606 100644 --- a/build/windows/tic/tic.vcxproj +++ b/build/windows/tic/tic.vcxproj @@ -35,10 +35,10 @@ - + {da956fd3-e142-46f2-9dd5-c78bebb56b7a} - + {81ce8daf-ebb2-4761-8e45-b71abcca8c68} @@ -55,9 +55,9 @@ - - - + + + @@ -210,7 +210,7 @@ Disabled _CRT_SECURE_NO_WARNINGS;LUA_COMPAT_5_2;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) MultiThreadedDebug - ..\include;..\..\..\include;..\..\..\..\3rd-party\lua-5.3.1\src;..\..\..\..\3rd-party\giflib-5.1.4\lib;..\..\..\..\3rd-party\zlib-1.2.8;..\..\..\..\3rd-party\SDL2-2.0.7\include;..\..\..\..\3rd-party\SDL2_net-2.0.1 + ..\include;..\..\..\include;..\..\..\3rd-party\lua-5.3.1\src;..\..\..\3rd-party\giflib-5.1.4\lib;..\..\..\3rd-party\zlib-1.2.8;..\..\..\3rd-party\SDL2-2.0.7\include;..\..\..\3rd-party\SDL2_net-2.0.1 Windows @@ -227,7 +227,7 @@ Disabled TIC80_PRO;_CRT_SECURE_NO_WARNINGS;LUA_COMPAT_5_2;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) MultiThreadedDebug - ..\include;..\..\..\include;..\..\..\..\3rd-party\lua-5.3.1\src;..\..\..\..\3rd-party\giflib-5.1.4\lib;..\..\..\..\3rd-party\zlib-1.2.8;..\..\..\..\3rd-party\SDL2-2.0.7\include;..\..\..\..\3rd-party\SDL2_net-2.0.1 + ..\include;..\..\..\include;..\..\..\3rd-party\lua-5.3.1\src;..\..\..\3rd-party\giflib-5.1.4\lib;..\..\..\3rd-party\zlib-1.2.8;..\..\..\3rd-party\SDL2-2.0.7\include;..\..\..\3rd-party\SDL2_net-2.0.1 Windows @@ -244,7 +244,7 @@ Disabled _CRT_SECURE_NO_WARNINGS;LUA_COMPAT_5_2;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) MultiThreadedDebug - ..\include;..\..\..\include;..\..\..\..\3rd-party\lua-5.3.1\src;..\..\..\..\3rd-party\giflib-5.1.4\lib;..\..\..\..\3rd-party\zlib-1.2.8;..\..\..\..\3rd-party\SDL2-2.0.7\include;..\..\..\..\3rd-party\SDL2_net-2.0.1 + ..\include;..\..\..\include;..\..\..\3rd-party\lua-5.3.1\src;..\..\..\3rd-party\giflib-5.1.4\lib;..\..\..\3rd-party\zlib-1.2.8;..\..\..\3rd-party\SDL2-2.0.7\include;..\..\..\3rd-party\SDL2_net-2.0.1 Windows @@ -261,7 +261,7 @@ Disabled TIC80_PRO;_CRT_SECURE_NO_WARNINGS;LUA_COMPAT_5_2;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) MultiThreadedDebug - ..\include;..\..\..\include;..\..\..\..\3rd-party\lua-5.3.1\src;..\..\..\..\3rd-party\giflib-5.1.4\lib;..\..\..\..\3rd-party\zlib-1.2.8;..\..\..\..\3rd-party\SDL2-2.0.7\include;..\..\..\..\3rd-party\SDL2_net-2.0.1 + ..\include;..\..\..\include;..\..\..\3rd-party\lua-5.3.1\src;..\..\..\3rd-party\giflib-5.1.4\lib;..\..\..\3rd-party\zlib-1.2.8;..\..\..\3rd-party\SDL2-2.0.7\include;..\..\..\3rd-party\SDL2_net-2.0.1 Windows @@ -280,7 +280,7 @@ true _CRT_SECURE_NO_WARNINGS;LUA_COMPAT_5_2;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) MultiThreaded - ..\include;..\..\..\include;..\..\..\..\3rd-party\lua-5.3.1\src;..\..\..\..\3rd-party\giflib-5.1.4\lib;..\..\..\..\3rd-party\zlib-1.2.8;..\..\..\..\3rd-party\SDL2-2.0.7\include;..\..\..\..\3rd-party\SDL2_net-2.0.1 + ..\include;..\..\..\include;..\..\..\3rd-party\lua-5.3.1\src;..\..\..\3rd-party\giflib-5.1.4\lib;..\..\..\3rd-party\zlib-1.2.8;..\..\..\3rd-party\SDL2-2.0.7\include;..\..\..\3rd-party\SDL2_net-2.0.1 Windows @@ -301,7 +301,7 @@ true TIC80_PRO;_CRT_SECURE_NO_WARNINGS;LUA_COMPAT_5_2;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) MultiThreaded - ..\include;..\..\..\include;..\..\..\..\3rd-party\lua-5.3.1\src;..\..\..\..\3rd-party\giflib-5.1.4\lib;..\..\..\..\3rd-party\zlib-1.2.8;..\..\..\..\3rd-party\SDL2-2.0.7\include;..\..\..\..\3rd-party\SDL2_net-2.0.1 + ..\include;..\..\..\include;..\..\..\3rd-party\lua-5.3.1\src;..\..\..\3rd-party\giflib-5.1.4\lib;..\..\..\3rd-party\zlib-1.2.8;..\..\..\3rd-party\SDL2-2.0.7\include;..\..\..\3rd-party\SDL2_net-2.0.1 Windows @@ -322,7 +322,7 @@ true _CRT_SECURE_NO_WARNINGS;LUA_COMPAT_5_2;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) MultiThreaded - ..\include;..\..\..\include;..\..\..\..\3rd-party\lua-5.3.1\src;..\..\..\..\3rd-party\giflib-5.1.4\lib;..\..\..\..\3rd-party\zlib-1.2.8;..\..\..\..\3rd-party\SDL2-2.0.7\include;..\..\..\..\3rd-party\SDL2_net-2.0.1 + ..\include;..\..\..\include;..\..\..\3rd-party\lua-5.3.1\src;..\..\..\3rd-party\giflib-5.1.4\lib;..\..\..\3rd-party\zlib-1.2.8;..\..\..\3rd-party\SDL2-2.0.7\include;..\..\..\3rd-party\SDL2_net-2.0.1 Windows @@ -343,7 +343,7 @@ true TIC80_PRO;_CRT_SECURE_NO_WARNINGS;LUA_COMPAT_5_2;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) MultiThreaded - ..\include;..\..\..\include;..\..\..\..\3rd-party\lua-5.3.1\src;..\..\..\..\3rd-party\giflib-5.1.4\lib;..\..\..\..\3rd-party\zlib-1.2.8;..\..\..\..\3rd-party\SDL2-2.0.7\include;..\..\..\..\3rd-party\SDL2_net-2.0.1 + ..\include;..\..\..\include;..\..\..\3rd-party\lua-5.3.1\src;..\..\..\3rd-party\giflib-5.1.4\lib;..\..\..\3rd-party\zlib-1.2.8;..\..\..\3rd-party\SDL2-2.0.7\include;..\..\..\3rd-party\SDL2_net-2.0.1 Windows diff --git a/build/windows/tic/tic.vcxproj.filters b/build/windows/tic/tic.vcxproj.filters index dc1c916..cf46206 100644 --- a/build/windows/tic/tic.vcxproj.filters +++ b/build/windows/tic/tic.vcxproj.filters @@ -81,13 +81,13 @@ src - + src\ext\net - + src\ext\net - + src\ext\net diff --git a/build/windows/tic80/tic80.vcxproj b/build/windows/tic80/tic80.vcxproj index e1d22b8..a0cc0e2 100644 --- a/build/windows/tic80/tic80.vcxproj +++ b/build/windows/tic80/tic80.vcxproj @@ -35,8 +35,8 @@ - - + + @@ -172,7 +172,7 @@ Level3 Disabled WIN32;_DEBUG;_WINDOWS;_USRDLL;TIC80_EXPORTS;%(PreprocessorDefinitions) - ..\..\..\include;..\..\..\..\3rd-party\lua-5.3.1\src;..\..\..\..\3rd-party\giflib-5.1.4\lib;..\..\..\..\3rd-party\duktape-2.2.0\src;..\..\..\..\3rd-party\blip-buf;..\..\..\..\3rd-party\moonscript + ..\..\..\include;..\..\..\3rd-party\lua-5.3.1\src;..\..\..\3rd-party\giflib-5.1.4\lib;..\..\..\3rd-party\duktape-2.2.0\src;..\..\..\3rd-party\blip-buf;..\..\..\3rd-party\moonscript MultiThreadedDebug @@ -187,7 +187,7 @@ Level3 Disabled TIC80_PRO;WIN32;_DEBUG;_WINDOWS;_USRDLL;TIC80_EXPORTS;%(PreprocessorDefinitions) - ..\..\..\include;..\..\..\..\3rd-party\lua-5.3.1\src;..\..\..\..\3rd-party\giflib-5.1.4\lib;..\..\..\..\3rd-party\duktape-2.2.0\src;..\..\..\..\3rd-party\blip-buf;..\..\..\..\3rd-party\moonscript + ..\..\..\include;..\..\..\3rd-party\lua-5.3.1\src;..\..\..\3rd-party\giflib-5.1.4\lib;..\..\..\3rd-party\duktape-2.2.0\src;..\..\..\3rd-party\blip-buf;..\..\..\3rd-party\moonscript MultiThreadedDebug @@ -202,7 +202,7 @@ Level3 Disabled _DEBUG;_WINDOWS;_USRDLL;TIC80_EXPORTS;%(PreprocessorDefinitions) - ..\..\..\include;..\..\..\..\3rd-party\lua-5.3.1\src;..\..\..\..\3rd-party\giflib-5.1.4\lib;..\..\..\..\3rd-party\duktape-2.2.0\src;..\..\..\..\3rd-party\blip-buf;..\..\..\..\3rd-party\moonscript + ..\..\..\include;..\..\..\3rd-party\lua-5.3.1\src;..\..\..\3rd-party\giflib-5.1.4\lib;..\..\..\3rd-party\duktape-2.2.0\src;..\..\..\3rd-party\blip-buf;..\..\..\3rd-party\moonscript MultiThreadedDebug @@ -217,7 +217,7 @@ Level3 Disabled TIC80_PRO;_DEBUG;_WINDOWS;_USRDLL;TIC80_EXPORTS;%(PreprocessorDefinitions) - ..\..\..\include;..\..\..\..\3rd-party\lua-5.3.1\src;..\..\..\..\3rd-party\giflib-5.1.4\lib;..\..\..\..\3rd-party\duktape-2.2.0\src;..\..\..\..\3rd-party\blip-buf;..\..\..\..\3rd-party\moonscript + ..\..\..\include;..\..\..\3rd-party\lua-5.3.1\src;..\..\..\3rd-party\giflib-5.1.4\lib;..\..\..\3rd-party\duktape-2.2.0\src;..\..\..\3rd-party\blip-buf;..\..\..\3rd-party\moonscript MultiThreadedDebug @@ -234,7 +234,7 @@ true true WIN32;NDEBUG;_WINDOWS;_USRDLL;TIC80_EXPORTS;%(PreprocessorDefinitions) - ..\..\..\include;..\..\..\..\3rd-party\lua-5.3.1\src;..\..\..\..\3rd-party\giflib-5.1.4\lib;..\..\..\..\3rd-party\duktape-2.2.0\src;..\..\..\..\3rd-party\blip-buf;..\..\..\..\3rd-party\moonscript + ..\..\..\include;..\..\..\3rd-party\lua-5.3.1\src;..\..\..\3rd-party\giflib-5.1.4\lib;..\..\..\3rd-party\duktape-2.2.0\src;..\..\..\3rd-party\blip-buf;..\..\..\3rd-party\moonscript MultiThreaded @@ -253,7 +253,7 @@ true true TIC80_PRO;WIN32;NDEBUG;_WINDOWS;_USRDLL;TIC80_EXPORTS;%(PreprocessorDefinitions) - ..\..\..\include;..\..\..\..\3rd-party\lua-5.3.1\src;..\..\..\..\3rd-party\giflib-5.1.4\lib;..\..\..\..\3rd-party\duktape-2.2.0\src;..\..\..\..\3rd-party\blip-buf;..\..\..\..\3rd-party\moonscript + ..\..\..\include;..\..\..\3rd-party\lua-5.3.1\src;..\..\..\3rd-party\giflib-5.1.4\lib;..\..\..\3rd-party\duktape-2.2.0\src;..\..\..\3rd-party\blip-buf;..\..\..\3rd-party\moonscript MultiThreaded @@ -272,7 +272,7 @@ true true NDEBUG;_WINDOWS;_USRDLL;TIC80_EXPORTS;%(PreprocessorDefinitions) - ..\..\..\include;..\..\..\..\3rd-party\lua-5.3.1\src;..\..\..\..\3rd-party\giflib-5.1.4\lib;..\..\..\..\3rd-party\duktape-2.2.0\src;..\..\..\..\3rd-party\blip-buf;..\..\..\..\3rd-party\moonscript + ..\..\..\include;..\..\..\3rd-party\lua-5.3.1\src;..\..\..\3rd-party\giflib-5.1.4\lib;..\..\..\3rd-party\duktape-2.2.0\src;..\..\..\3rd-party\blip-buf;..\..\..\3rd-party\moonscript MultiThreaded @@ -291,7 +291,7 @@ true true TIC80_PRO;NDEBUG;_WINDOWS;_USRDLL;TIC80_EXPORTS;%(PreprocessorDefinitions) - ..\..\..\include;..\..\..\..\3rd-party\lua-5.3.1\src;..\..\..\..\3rd-party\giflib-5.1.4\lib;..\..\..\..\3rd-party\duktape-2.2.0\src;..\..\..\..\3rd-party\blip-buf;..\..\..\..\3rd-party\moonscript + ..\..\..\include;..\..\..\3rd-party\lua-5.3.1\src;..\..\..\3rd-party\giflib-5.1.4\lib;..\..\..\3rd-party\duktape-2.2.0\src;..\..\..\3rd-party\blip-buf;..\..\..\3rd-party\moonscript MultiThreaded diff --git a/build/windows/tic80/tic80.vcxproj.filters b/build/windows/tic80/tic80.vcxproj.filters index 8c3cd76..4f9b12f 100644 --- a/build/windows/tic80/tic80.vcxproj.filters +++ b/build/windows/tic80/tic80.vcxproj.filters @@ -30,10 +30,10 @@ src - + src\ext\duktape - + src\ext diff --git a/build/windows/zlib/zlib.vcxproj b/build/windows/zlib/zlib.vcxproj index 59d4a75..af17073 100644 --- a/build/windows/zlib/zlib.vcxproj +++ b/build/windows/zlib/zlib.vcxproj @@ -35,21 +35,21 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + {1DFBDFA2-F204-42FF-B99E-250E4B2EBA04} diff --git a/build/windows/zlib/zlib.vcxproj.filters b/build/windows/zlib/zlib.vcxproj.filters index f752ff9..922147a 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