From 41e7d4123ef981f495220b0440b0b4a234ec33ed Mon Sep 17 00:00:00 2001 From: chaoskagami Date: Sat, 16 Jul 2016 04:37:16 -0400 Subject: [PATCH] Screw windows. --- .gitignore | 237 +--------- Makefile | 5 +- windows/xds.sln | 28 -- windows/xds/xds.vcxproj | 378 --------------- windows/xds/xds.vcxproj.filters | 783 -------------------------------- 5 files changed, 12 insertions(+), 1419 deletions(-) delete mode 100644 windows/xds.sln delete mode 100644 windows/xds/xds.vcxproj delete mode 100644 windows/xds/xds.vcxproj.filters diff --git a/.gitignore b/.gitignore index 59cc646..6be9f58 100644 --- a/.gitignore +++ b/.gitignore @@ -1,231 +1,10 @@ -################# -## Eclipse -################# - -*.pydevproject -.project -.metadata -bin/ -tmp/ -*.tmp -*.bak -*.swp -*~.nib -local.properties -.classpath -.settings/ -.loadpath - -# External tool builders -.externalToolBuilders/ - -# Locally stored "Eclipse launch configurations" -*.launch - -# CDT-specific -.cproject - -# PDT-specific -.buildpath - - -################# -## Visual Studio -################# - -## Ignore Visual Studio temporary files, build results, and -## files generated by popular Visual Studio add-ons. - -# User-specific files -*.suo -*.user -*.sln.docstates - -# Build results - -[Dd]ebug/ -[Rr]elease/ -#x64/ -build/ -[Bb]in/ -[Oo]bj/ - -# MSTest test Results -[Tt]est[Rr]esult*/ -[Bb]uild[Ll]og.* - -*_i.c -*_p.c -*.ilk -*.meta -*.obj -*.pch -*.pdb -*.pgc -*.pgd -*.rsp -*.sbr -*.tlb -*.tli -*.tlh -*.tmp -*.tmp_proj -*.log -*.vspscc -*.vssscc -.builds -*.pidb -*.log -*.scc - -# Visual C++ cache files -ipch/ -*.aps -*.ncb -*.opensdf -*.sdf -*.cachefile - -# Visual Studio profiler -*.psess -*.vsp -*.vspx - -# Guidance Automation Toolkit -*.gpState - -# ReSharper is a .NET coding add-in -_ReSharper*/ -*.[Rr]e[Ss]harper - -# TeamCity is a build add-in -_TeamCity* - -# DotCover is a Code Coverage Tool -*.dotCover - -# NCrunch -*.ncrunch* -.*crunch*.local.xml - -# Installshield output folder -[Ee]xpress/ - -# DocProject is a documentation generator add-in -DocProject/buildhelp/ -DocProject/Help/*.HxT -DocProject/Help/*.HxC -DocProject/Help/*.hhc -DocProject/Help/*.hhk -DocProject/Help/*.hhp -DocProject/Help/Html2 -DocProject/Help/html - -# Click-Once directory -publish/ - -# Publish Web Output -*.Publish.xml -*.pubxml -*.publishproj - -# NuGet Packages Directory -## TODO: If you have NuGet Package Restore enabled, uncomment the next line -#packages/ - -# Windows Azure Build Output -csx -*.build.csdef - -# Windows Store app package directory -AppPackages/ - -# Others -sql/ -*.Cache -ClientBin/ -[Ss]tyle[Cc]op.* -~$* -*~ -*.dbmdl -*.[Pp]ublish.xml -*.pfx -*.publishsettings - -# RIA/Silverlight projects -Generated_Code/ - -# Backup & report files from converting an old project file to a newer -# Visual Studio version. Backup files are not needed, because we have git ;-) -_UpgradeReport_Files/ -Backup*/ -UpgradeLog*.XML -UpgradeLog*.htm - -# SQL Server files -App_Data/*.mdf -App_Data/*.ldf - -############# -## Windows detritus -############# - -# Windows image file caches -Thumbs.db -ehthumbs.db - -# Folder config file -Desktop.ini - -# Recycle Bin used on file shares -$RECYCLE.BIN/ - -# Mac crap -.DS_Store - - -############# -## Python -############# - -*.py[cod] - -# Packages -*.egg -*.egg-info -dist/ -build/ -eggs/ -parts/ -var/ -sdist/ -develop-eggs/ -.installed.cfg - -# Installer logs -pip-log.txt - -# Unit test / coverage reports -.coverage -.tox - -#Translations -*.mo - -#Mr Developer -.mr.developer.cfg -tests/jit/data.bin -static_recompiler/jit/jit/data.bin -static_recompiler/jit/data.bin -xds/code.bin -xds/* +*.bin *.3dsx -*.elf *.smdh -windows/xds/* -include/GL/glcorearb.h -include/GL/gl3w.h -*.autosave - -!windows/xds/xds.vcxproj.filters -!windows/xds/xds.vcxproj \ No newline at end of file +*.cxi +*.o +*.d +*.elf +*.vco +xds +xds_test_* diff --git a/Makefile b/Makefile index b226cd2..2f676ed 100644 --- a/Makefile +++ b/Makefile @@ -16,10 +16,13 @@ LDFLAGS := -L/opt/local/lib -Lexternal/gl3w -lpthread -lX11 -lXxf86vm -lXrender COMMON_FILES := $(patsubst %.cpp,%.o,$(patsubst %.c,%.o,$(SOURCE_FILES))) -xds: $(COMMON_FILES) source/Main.cpp +xds: deps $(COMMON_FILES) source/Main.cpp echo $(COMMON_FILES) g++ -o xds $(TEST_DEFS) $(BUILD_FLAGS) $(COMMON_FILES) $(LDFLAGS) +deps: + cd external/gl3w && ./gl3w_gen.py && CFLAGS= CXXFLAGS= LDFLAGS= cmake . && make + %.o: %.c gcc $(CFLAGS) -c -o $@ $< diff --git a/windows/xds.sln b/windows/xds.sln deleted file mode 100644 index cca0e8b..0000000 --- a/windows/xds.sln +++ /dev/null @@ -1,28 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2013 -VisualStudioVersion = 12.0.31101.0 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xds", "xds\xds.vcxproj", "{09D06FBC-3840-460A-A62F-915E9976D3DD}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 - Release|Win32 = Release|Win32 - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {09D06FBC-3840-460A-A62F-915E9976D3DD}.Debug|Win32.ActiveCfg = Debug|Win32 - {09D06FBC-3840-460A-A62F-915E9976D3DD}.Debug|Win32.Build.0 = Debug|Win32 - {09D06FBC-3840-460A-A62F-915E9976D3DD}.Debug|x64.ActiveCfg = Debug|x64 - {09D06FBC-3840-460A-A62F-915E9976D3DD}.Debug|x64.Build.0 = Debug|x64 - {09D06FBC-3840-460A-A62F-915E9976D3DD}.Release|Win32.ActiveCfg = Release|Win32 - {09D06FBC-3840-460A-A62F-915E9976D3DD}.Release|Win32.Build.0 = Release|Win32 - {09D06FBC-3840-460A-A62F-915E9976D3DD}.Release|x64.ActiveCfg = Release|x64 - {09D06FBC-3840-460A-A62F-915E9976D3DD}.Release|x64.Build.0 = Release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/windows/xds/xds.vcxproj b/windows/xds/xds.vcxproj deleted file mode 100644 index 30ff818..0000000 --- a/windows/xds/xds.vcxproj +++ /dev/null @@ -1,378 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {09D06FBC-3840-460A-A62F-915E9976D3DD} - xds - - - - Application - true - v120 - MultiByte - - - Application - true - v120 - MultiByte - - - Application - false - v120 - true - MultiByte - - - Application - false - v120 - true - MultiByte - - - - - - - - - - - - - - - - - - - $(VC_IncludePath);$(WindowsSDK_IncludePath);..\..\external\glfw-3.1.1\include;..\..\external\gl3w\include - $(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);..\..\external\glfw-3.1.1\lib-msvc_v120-Win32 - - - $(VC_IncludePath);$(WindowsSDK_IncludePath);..\..\external\glfw-3.1.1\include;..\..\external\gl3w\include - $(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);..\..\external\glfw-3.1.1\lib-msvc_v120-Win32 - - - $(VC_IncludePath);$(WindowsSDK_IncludePath);..\..\external\glfw-3.1.1\include;..\..\external\gl3w\include - $(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);..\..\external\glfw-3.1.1\lib-msvc_v120-Win32 - - - - Level3 - Disabled - - - ..\..\include;..\..\source;%(AdditionalIncludeDirectories) - - - _CRT_SECURE_NO_WARNINGS;_MBCS;%(PreprocessorDefinitions) - false - true - - - true - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;glfw3dll.a;libglfw3.a;opengl32.lib;%(AdditionalDependencies) - ..\..\..\xds\external\glfw-3.1.1\lib-mingw-i686 - - - - - Level3 - Disabled - - - ..\..\include;..\..\source;%(AdditionalIncludeDirectories) - - - _CRT_SECURE_NO_WARNINGS;_MBCS;%(PreprocessorDefinitions) - false - - - true - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;glfw3dll.a;libglfw3.a;opengl32.lib;%(AdditionalDependencies) - ..\..\..\xds\external\glfw-3.1.1\lib-mingw-x86_64 - - - - - Level3 - MaxSpeed - true - true - true - ..\..\include;..\..\source;%(AdditionalIncludeDirectories) - Speed - false - - - true - true - true - ..\..\..\xds\external\glfw-3.1.1\lib-mingw-i686 - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;glfw3dll.a;libglfw3.a;opengl32.lib;%(AdditionalDependencies) - UseLinkTimeCodeGeneration - - - - - Level3 - MaxSpeed - true - true - true - - - true - true - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/windows/xds/xds.vcxproj.filters b/windows/xds/xds.vcxproj.filters deleted file mode 100644 index 7bfd4a3..0000000 --- a/windows/xds/xds.vcxproj.filters +++ /dev/null @@ -1,783 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - {623eb22a-f60d-4a20-9e92-3979d76595b4} - - - {4fe457d1-ceb5-409d-84cf-a1911267eaf5} - - - {7e1621f6-7854-47fc-9d82-2bc5c208ae40} - - - {08151f03-e45e-4dba-af6d-99ad8d0b01cb} - - - {2f20cf62-abb6-4862-bff2-fb62b8deb1d6} - - - {36f858dd-b843-4126-8c7d-9de75a11b234} - - - {79422764-d3be-48f3-9584-129a2ab458cf} - - - {10614ff5-150e-46c7-9c54-16861cdfa53b} - - - {179e18cf-1739-44ab-bbe3-7eb8261b69d1} - - - {32802e89-89cf-43dd-a053-47402500ed30} - - - {f6fe027e-b504-4285-976e-399dba8c2eb8} - - - {a5df2270-d9f0-4040-9b10-015647fee2aa} - - - {9c307d7a-2791-4336-a8c9-0147c371530f} - - - {382047ba-4098-46c0-b612-519db3036a59} - - - {e7e613f3-dec0-4aeb-9125-8dc4bb5cc1de} - - - {dc2e250f-bba4-4e2a-a910-22f497d916f5} - - - {c1e42c27-9ab5-41f8-aa5e-f28b4865785d} - - - {6dd721ff-0a84-478b-80c4-f16301eefc57} - - - {9d5b48a7-b930-4b5d-ac21-ce2fec6fda1c} - - - {77088b69-1a15-4561-94fc-0e4190334709} - - - {cfaf96de-a351-4271-a656-e539c9fe3afe} - - - {46f4de3a-f782-49a2-9492-64cb1c1af867} - - - {367fe785-ec91-4b0f-91b1-562917affe1d} - - - {b013cb66-cc5e-4e0d-87f6-1fdee1c05812} - - - {b35ae2d7-256c-4d64-aac8-95c28f84c92b} - - - {7625735c-488f-4669-8b19-aa47b7b596b7} - - - {e6437f6e-5d52-4083-a151-5388c6af9f6b} - - - {a97ccd93-4cc0-4165-a938-599113404970} - - - {8c09cb90-802e-494c-8e4c-1a3984025eff} - - - {03b6769b-066f-4036-983e-1c916efdbe29} - - - {f63e9a8e-b22d-4bd7-b6ba-0bce6e32ca8d} - - - {df7f13d0-1d8b-4d6e-8b9a-5bd055dc3362} - - - {f28c6a93-11db-4407-acda-9cbb99a6a798} - - - {0bd598af-7f9f-438b-a3b4-be6f51772b25} - - - - - Source Files - - - Source Files\kernel - - - Source Files\kernel - - - Source Files\kernel - - - Source Files\kernel - - - Source Files\kernel - - - Source Files\kernel - - - Source Files\kernel - - - Source Files\arm - - - Source Files\arm\skyeye_common\vfp - - - Source Files\arm\skyeye_common\vfp - - - Source Files\arm\skyeye_common\vfp - - - Source Files\arm\skyeye_common\vfp - - - Source Files\arm\skyeye_common\interpreter - - - Source Files\arm\skyeye_common\interpreter - - - Source Files\arm\skyeye_common\interpreter - - - Source Files\arm\skyeye_common\interpreter - - - Source Files\arm\skyeye_common\interpreter - - - Source Files\arm\skyeye_common\interpreter - - - Source Files\arm\skyeye_common\interpreter - - - Source Files\arm\skyeye_common\dyncom - - - Source Files\arm\skyeye_common\dyncom - - - Source Files\arm\skyeye_common\dyncom - - - Source Files\arm\skyeye_common\dyncom - - - Source Files\arm\skyeye_common\dyncom - - - Source Files\arm\skyeye_common\disassembler - - - Source Files\util - - - Source Files\kernel - - - Source Files\kernel - - - Source Files - - - Source Files\kernel - - - Source Files\kernel - - - Source Files\kernel - - - Source Files\kernel - - - Source Files\kernel - - - Source Files\kernel - - - Source Files\kernel - - - Source Files\hardware - - - Source Files\process9 - - - Source Files\kernel - - - Source Files\util - - - Source Files\kernel - - - Source Files\kernel - - - Source Files\kernel - - - Source Files\kernel - - - Source Files\kernel - - - Source Files\kernel - - - Source Files\kernel - - - Source Files\arm\skyeye_common\dyncom - - - Source Files\process9 - - - Source Files\process9 - - - Source Files\process9\archive - - - Source Files\process9\archive - - - Source Files\process9\archive - - - Source Files\util - - - Source Files\process9 - - - Source Files\process9\archive - - - Source Files\process9 - - - Source Files\hardware - - - Source Files\kernel - - - Source Files\process9\archive - - - Source Files\kernel - - - Source Files\kernel - - - Source Files\gui - - - External Files\imgui - - - External Files\gl3w - - - Source Files\gui - - - Source Files\process9 - - - Source Files\process9\archive - - - Source Files\process9\archive - - - Source Files\hardware - - - Source Files\hardware\i2c - - - Source Files\hardware\i2c - - - Source Files\hardware\i2c - - - Source Files\hardware - - - Source Files\hardware - - - Source Files\hardware - - - Source Files\process9 - - - Source Files\hardware - - - Source Files\hardware\GPU - - - Source Files\process9\archive - - - Source Files\citraimport\GPU\EMUWindow - - - Source Files\citraimport\GPU - - - Source Files\citraimport\GPU - - - Source Files\citraimport\GPU - - - Source Files\citraimport\GPU - - - Source Files\citraimport\GPU - - - Source Files\citraimport\GPU - - - Source Files\citraimport\GPU - - - Source Files\citraimport\GPU - - - Source Files\citraimport\GPU - - - Source Files\citraimport\GPU - - - Source Files\citraimport\GPU - - - Source Files\citraimport\GPU - - - Source Files\citraimport\GPU - - - Source Files\citraimport\GPU - - - Source Files\citraimport\GPU - - - Source Files\citraimport\GPU - - - Source Files\citraimport\GPU - - - Source Files\citraimport\GPU - - - Source Files\citraimport\common - - - Source Files\citraimport\common - - - Source Files\citraimport\common - - - Source Files\citraimport\common - - - Source Files\citraimport\common - - - Source Files\citraimport\common - - - Source Files\citraimport\common - - - Source Files\citraimport\common - - - Source Files\citraimport\common - - - Source Files\citraimport\common - - - Source Files\citraimport\common\loging - - - Source Files\citraimport\common\loging - - - Source Files\citraimport\common\loging - - - Source Files\citraimport\common\x64 - - - Source Files\citraimport\common\x64 - - - Source Files\citraimport\common\x64 - - - Source Files\citraimport - - - Source Files\hardware - - - Source Files\citraimport\GPU - - - Source Files\hardware - - - Source Files\hardware - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files\arm - - - Header Files\kernel - - - Header Files\kernel - - - Header Files\kernel - - - Header Files\kernel - - - Header Files\kernel - - - Header Files\kernel - - - Header Files\kernel - - - Header Files\kernel - - - Header Files - - - Header Files\kernel - - - Header Files\kernel - - - Header Files - - - Header Files\kernel - - - Header Files\kernel - - - Header Files\kernel - - - Header Files\util - - - Header Files\util - - - Header Files - - - Header Files\kernel - - - Header Files\arm\interpreter - - - Header Files\hardware - - - Header Files - - - Header Files\kernel - - - Header Files\kernel - - - Header Files\kernel - - - Header Files\hardware - - - Header Files - - - Header Files\process9 - - - Header Files\kernel - - - Header Files\kernel - - - Header Files\kernel - - - Header Files\kernel - - - Header Files\kernel - - - Header Files\kernel - - - Header Files\kernel - - - Header Files\kernel - - - Header Files\arm\skyeye_common - - - Header Files\process9 - - - Header Files\process9 - - - Header Files\process9\archive - - - Header Files\process9 - - - Header Files\process9\archive - - - Header Files\process9\archive - - - Header Files\util - - - Header Files\process9 - - - Header Files\process9\archive - - - Header Files\process9 - - - Header Files\hardware - - - Header Files\kernel - - - Header Files\process9\archive - - - Header Files\kernel - - - Header Files\kernel - - - Header Files\gui - - - Header Files - - - Header Files\process9 - - - Header Files\process9\archive - - - Header Files\process9\archive - - - Header Files\hardware - - - Header Files\hardware\i2c - - - Header Files\hardware\i2c - - - Header Files\hardware\i2c - - - Header Files\hardware - - - Header Files\hardware - - - Header Files\hardware - - - Header Files\process9 - - - Header Files\hardware - - - Header Files\kernel - - - Header Files\hardware - - - Header Files\hardware\GPU - - - Header Files\process9\archive - - - Source Files\citraimport\GPU - - - Source Files\citraimport\GPU - - - Source Files\citraimport\GPU - - - Source Files\citraimport\GPU - - - Source Files\citraimport\GPU - - - Source Files\citraimport\GPU - - - Source Files\citraimport\GPU - - - Source Files\citraimport\GPU - - - Source Files\citraimport\GPU - - - Source Files\citraimport\GPU - - - Source Files\citraimport\GPU - - - Source Files\citraimport\GPU - - - Source Files\citraimport\GPU - - - Source Files\citraimport\GPU - - - Source Files\citraimport\GPU - - - Source Files\citraimport\GPU - - - Source Files\citraimport\GPU - - - Source Files\citraimport\GPU - - - Source Files\citraimport\GPU - - - Source Files\citraimport\GPU - - - Source Files\citraimport\GPU - - - Source Files\citraimport\GPU - - - Header Files\hardware - - - Header Files\hardware - - - \ No newline at end of file -- 2.39.5