From 8a05238dad3b980ebaa616a453df8f48fec78912 Mon Sep 17 00:00:00 2001 From: jp9000 Date: Sat, 9 Mar 2013 16:00:46 -0700 Subject: [PATCH] fixed some issues with the project files: removed *.filters from gitignore, added *.filters files to git, fixed project dependencies that were causing the project to compile incorrectly --- .gitignore | 1 - DShowPlugin/DShowPlugin.vcxproj | 6 - DShowPlugin/DShowPlugin.vcxproj.filters | 106 ++++++++ GraphicsCapture/GraphicsCapture.vcxproj | 6 - .../GraphicsCapture.vcxproj.filters | 56 +++++ .../GraphicsCaptureHook.vcxproj.filters | 54 ++++ OBS-All.sln | 13 + OBS.vcxproj | 18 -- OBS.vcxproj.filters | 236 ++++++++++++++++++ OBSApi/OBSApi.vcxproj | 16 +- OBSApi/OBSApi.vcxproj.filters | 172 +++++++++++++ injectHelper/injectHelper.vcxproj.filters | 14 ++ libfaac/libfaac.vcxproj.filters | 101 ++++++++ librtmp/librtmp.vcxproj.filters | 66 +++++ libsamplerate/libsamplerate.vcxproj.filters | 51 ++++ 15 files changed, 874 insertions(+), 42 deletions(-) create mode 100644 DShowPlugin/DShowPlugin.vcxproj.filters create mode 100644 GraphicsCapture/GraphicsCapture.vcxproj.filters create mode 100644 GraphicsCapture/GraphicsCaptureHook/GraphicsCaptureHook.vcxproj.filters create mode 100644 OBS.vcxproj.filters create mode 100644 OBSApi/OBSApi.vcxproj.filters create mode 100644 injectHelper/injectHelper.vcxproj.filters create mode 100644 libfaac/libfaac.vcxproj.filters create mode 100644 librtmp/librtmp.vcxproj.filters create mode 100644 libsamplerate/libsamplerate.vcxproj.filters diff --git a/.gitignore b/.gitignore index 95b13767..a22d2917 100644 --- a/.gitignore +++ b/.gitignore @@ -15,7 +15,6 @@ ipch/ *.opensdf *.xml *.ipch -*.filters *.css *.xslt *.aps diff --git a/DShowPlugin/DShowPlugin.vcxproj b/DShowPlugin/DShowPlugin.vcxproj index 24360f49..f9a1225f 100644 --- a/DShowPlugin/DShowPlugin.vcxproj +++ b/DShowPlugin/DShowPlugin.vcxproj @@ -264,12 +264,6 @@ - - - {11a35235-dd48-41e2-8f40-825c78024bc0} - false - - diff --git a/DShowPlugin/DShowPlugin.vcxproj.filters b/DShowPlugin/DShowPlugin.vcxproj.filters new file mode 100644 index 00000000..4a861b65 --- /dev/null +++ b/DShowPlugin/DShowPlugin.vcxproj.filters @@ -0,0 +1,106 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;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 + + + {13c7e79e-dcbc-4157-af5a-79bbe67971b0} + + + + + Source + + + Source + + + Source + + + Source + + + Source + + + Source + + + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + + + Resources + + + Shaders + + + Shaders + + + Shaders + + + Shaders + + + Shaders + + + Shaders + + + Shaders + + + Shaders + + + Shaders + + + Shaders + + + Shaders + + + Shaders + + + Shaders + + + + + Resources + + + \ No newline at end of file diff --git a/GraphicsCapture/GraphicsCapture.vcxproj b/GraphicsCapture/GraphicsCapture.vcxproj index 4b22c37b..d612be17 100644 --- a/GraphicsCapture/GraphicsCapture.vcxproj +++ b/GraphicsCapture/GraphicsCapture.vcxproj @@ -227,12 +227,6 @@ - - - {11a35235-dd48-41e2-8f40-825c78024bc0} - false - - diff --git a/GraphicsCapture/GraphicsCapture.vcxproj.filters b/GraphicsCapture/GraphicsCapture.vcxproj.filters new file mode 100644 index 00000000..6ffdbef9 --- /dev/null +++ b/GraphicsCapture/GraphicsCapture.vcxproj.filters @@ -0,0 +1,56 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;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 + + + + + Source + + + Source + + + Source + + + Source + + + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + + + Resources + + + \ No newline at end of file diff --git a/GraphicsCapture/GraphicsCaptureHook/GraphicsCaptureHook.vcxproj.filters b/GraphicsCapture/GraphicsCaptureHook/GraphicsCaptureHook.vcxproj.filters new file mode 100644 index 00000000..e85e2f69 --- /dev/null +++ b/GraphicsCapture/GraphicsCaptureHook/GraphicsCaptureHook.vcxproj.filters @@ -0,0 +1,54 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;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 + + + + + Source + + + Source + + + Source + + + Source + + + Source + + + Source + + + Source + + + Source + + + + + Headers + + + Headers + + + Headers + + + \ No newline at end of file diff --git a/OBS-All.sln b/OBS-All.sln index d75f2e09..b3be0031 100644 --- a/OBS-All.sln +++ b/OBS-All.sln @@ -6,12 +6,25 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "librtmp", "librtmp\librtmp.vcxproj", "{22BF0EE3-CDCD-4925-A5F6-0A94CB5D4DB1}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsamplerate", "libsamplerate\libsamplerate.vcxproj", "{47AFDBEF-F15F-4BC0-B436-5BE443C3F80F}" + ProjectSection(ProjectDependencies) = postProject + {9CC48C6E-92EB-4814-AD37-97AB3622AB65} = {9CC48C6E-92EB-4814-AD37-97AB3622AB65} + {22BF0EE3-CDCD-4925-A5F6-0A94CB5D4DB1} = {22BF0EE3-CDCD-4925-A5F6-0A94CB5D4DB1} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OBS", "OBS.vcxproj", "{221C92F4-3416-43F1-8E4E-78657AFD0111}" + ProjectSection(ProjectDependencies) = postProject + {11A35235-DD48-41E2-8F40-825C78024BC0} = {11A35235-DD48-41E2-8F40-825C78024BC0} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OBSApi", "OBSApi\OBSApi.vcxproj", "{11A35235-DD48-41E2-8F40-825C78024BC0}" + ProjectSection(ProjectDependencies) = postProject + {47AFDBEF-F15F-4BC0-B436-5BE443C3F80F} = {47AFDBEF-F15F-4BC0-B436-5BE443C3F80F} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DShowPlugin", "DShowPlugin\DShowPlugin.vcxproj", "{D75E4F7D-0CC8-4F0F-B8A2-5E384A27753C}" + ProjectSection(ProjectDependencies) = postProject + {11A35235-DD48-41E2-8F40-825C78024BC0} = {11A35235-DD48-41E2-8F40-825C78024BC0} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GraphicsCapture", "GraphicsCapture\GraphicsCapture.vcxproj", "{7BB0C67E-9CDD-4ABB-8728-41F2BE5C54D8}" ProjectSection(ProjectDependencies) = postProject diff --git a/OBS.vcxproj b/OBS.vcxproj index 4f00b0b0..ff229950 100644 --- a/OBS.vcxproj +++ b/OBS.vcxproj @@ -305,24 +305,6 @@ - - - {9cc48c6e-92eb-4814-ad37-97ab3622ab65} - false - - - {22bf0ee3-cdcd-4925-a5f6-0a94cb5d4db1} - false - - - {47afdbef-f15f-4bc0-b436-5be443c3f80f} - false - - - {11a35235-dd48-41e2-8f40-825c78024bc0} - false - - diff --git a/OBS.vcxproj.filters b/OBS.vcxproj.filters new file mode 100644 index 00000000..441ad53d --- /dev/null +++ b/OBS.vcxproj.filters @@ -0,0 +1,236 @@ + + + + + Source + + + Source + + + Source + + + Source + + + Source + + + Source + + + Source + + + Source + + + Source + + + Source + + + Source + + + Source + + + Source + + + Source + + + Source + + + Source + + + Source + + + Source + + + Source + + + Source + + + Source + + + Source + + + Source + + + Source + + + Source + + + Source + + + Source + + + Source + + + Source + + + Source + + + Source + + + Source + + + Source + + + Source + + + Source + + + Source + + + Source + + + Source + + + Source + + + Source + + + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + + + Resources + + + Resources + + + Resources + + + Resources + + + Resources + + + Resources + + + Resources + + + Shaders + + + Shaders + + + Shaders + + + Shaders + + + Shaders + + + Shaders + + + Shaders + + + Shaders + + + Shaders + + + + + {37253580-c8f2-4488-9f8e-85782dea399d} + h;hpp;hxx;hm;inl;inc;xsd + + + {c7980321-beda-4354-870e-0819ae11464d} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + {7d178c27-342a-4100-9daa-c360d22d977d} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {a2d93ce3-630d-408d-8a9e-89dc2532938e} + pShader;vShader + + + + + Resources + + + \ No newline at end of file diff --git a/OBSApi/OBSApi.vcxproj b/OBSApi/OBSApi.vcxproj index 371c04dd..2d1f445f 100644 --- a/OBSApi/OBSApi.vcxproj +++ b/OBSApi/OBSApi.vcxproj @@ -117,6 +117,8 @@ ..\rundir\pdb32\stripped\$(TargetName).pdb Windows MachineX86 + + copy $(OutDir)$(ProjectName).dll ..\rundir @@ -138,13 +140,13 @@ ProgramDatabase - winmm.lib;psapi.lib;libsamplerate.lib;%(AdditionalDependencies) ../libsamplerate/x64/debug;%(AdditionalLibraryDirectories) true ..\rundir\pdb64\$(TargetName).pdb ..\rundir\pdb64\stripped\$(TargetName).pdb Windows MachineX64 + winmm.lib;psapi.lib;libsamplerate.lib;%(AdditionalDependencies) copy $(OutDir)$(ProjectName).dll ..\rundir @@ -205,6 +207,8 @@ true true MachineX64 + + copy $(OutDir)$(ProjectName).dll ..\rundir @@ -262,16 +266,6 @@ - - - {47afdbef-f15f-4bc0-b436-5be443c3f80f} - false - true - false - true - false - - diff --git a/OBSApi/OBSApi.vcxproj.filters b/OBSApi/OBSApi.vcxproj.filters new file mode 100644 index 00000000..f45f8027 --- /dev/null +++ b/OBSApi/OBSApi.vcxproj.filters @@ -0,0 +1,172 @@ + + + + + Source + + + Source + + + Source + + + Source + + + Source + + + Source + + + Source + + + Source + + + Source + + + Utility\Source + + + Utility\Source + + + Utility\Source + + + Utility\Source + + + Utility\Source + + + Utility\Source + + + Utility\Source + + + Utility\Source + + + Utility\Source + + + Utility\Source + + + Utility\Source + + + Utility\Source + + + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Utility\Headers + + + Utility\Headers + + + Utility\Headers + + + Utility\Headers + + + Utility\Headers + + + Utility\Headers + + + Utility\Headers + + + Utility\Headers + + + Utility\Headers + + + Utility\Headers + + + Utility\Headers + + + Utility\Headers + + + Utility\Headers + + + Utility\Headers + + + Utility\Headers + + + Utility\Headers + + + Utility\Headers + + + Utility\Headers + + + + + {ebd85662-234c-431a-bd43-a28cbe7fd3dc} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {da761293-0967-4901-9a8e-a587ac2a4599} + h;hpp;hxx;hm;inl;inc;xsd + + + {88bebac1-7d10-48ff-9d34-689b04181ac5} + + + {0c983f30-fef0-4755-b9b5-e93d87239460} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {d0560106-adb4-4e7a-9d24-2e1ec753ca95} + h;hpp;hxx;hm;inl;inc;xsd + + + \ No newline at end of file diff --git a/injectHelper/injectHelper.vcxproj.filters b/injectHelper/injectHelper.vcxproj.filters new file mode 100644 index 00000000..508232d7 --- /dev/null +++ b/injectHelper/injectHelper.vcxproj.filters @@ -0,0 +1,14 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + + + Source + + + \ No newline at end of file diff --git a/libfaac/libfaac.vcxproj.filters b/libfaac/libfaac.vcxproj.filters new file mode 100644 index 00000000..76f7afb5 --- /dev/null +++ b/libfaac/libfaac.vcxproj.filters @@ -0,0 +1,101 @@ + + + + + {0fb5c2b4-169f-416c-bb78-d460af5dcf74} + cpp;c;cxx;rc;def;r;odl;idl;hpj;bat + + + {580cb1c3-b7e2-4936-a493-3c0301f98eb8} + h;hpp;hxx;hm;inl + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + \ No newline at end of file diff --git a/librtmp/librtmp.vcxproj.filters b/librtmp/librtmp.vcxproj.filters new file mode 100644 index 00000000..7dc7b018 --- /dev/null +++ b/librtmp/librtmp.vcxproj.filters @@ -0,0 +1,66 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;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 + + + + + Source + + + Source + + + Source + + + Source + + + Source + + + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + \ No newline at end of file diff --git a/libsamplerate/libsamplerate.vcxproj.filters b/libsamplerate/libsamplerate.vcxproj.filters new file mode 100644 index 00000000..93290e6d --- /dev/null +++ b/libsamplerate/libsamplerate.vcxproj.filters @@ -0,0 +1,51 @@ + + + + + Source + + + Source + + + Source + + + Source + + + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + + + {358b26fc-b1ef-4294-a9cc-d6a64be4ba77} + + + {f23ee9cc-d36b-453e-9cbc-6ac40131f1e6} + + + {f3ed8158-880e-4aa4-ac5e-c82086a24375} + + + \ No newline at end of file