diff --git a/GlidePort.sln b/Aerofoil.sln similarity index 97% rename from GlidePort.sln rename to Aerofoil.sln index 7baaef6..1757aa4 100644 --- a/GlidePort.sln +++ b/Aerofoil.sln @@ -11,8 +11,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MiniRez", "MiniRez\MiniRez. EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GpApp", "GpApp\GpApp.vcxproj", "{6233C3F2-5781-488E-B190-4FA8836F5A77}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GpD3D", "GpD3D\GpD3D.vcxproj", "{0E383EF0-CEF7-4733-87C6-5AC9844AA1EF}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hqx2gp", "hqx2gp\hqx2gp.vcxproj", "{5FDE4822-C771-46A5-B6B2-FD12BACE86BF}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PictChecker", "PictChecker\PictChecker.vcxproj", "{99549E56-2B3A-4B0C-9A1F-FBA6395BC96C}" @@ -33,6 +31,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ImportCharSet", "ImportChar EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GpInputDriver_XInput", "GpInputDriver_XInput\GpInputDriver_XInput.vcxproj", "{17B96F07-EF92-47CD-95A5-8E6EE38AB564}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Aerofoil", "Aerofoil\Aerofoil.vcxproj", "{0E383EF0-CEF7-4733-87C6-5AC9844AA1EF}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|x64 = Debug|x64 @@ -73,14 +73,6 @@ Global {6233C3F2-5781-488E-B190-4FA8836F5A77}.Release|x64.Build.0 = Release|x64 {6233C3F2-5781-488E-B190-4FA8836F5A77}.Release|x86.ActiveCfg = Release|Win32 {6233C3F2-5781-488E-B190-4FA8836F5A77}.Release|x86.Build.0 = Release|Win32 - {0E383EF0-CEF7-4733-87C6-5AC9844AA1EF}.Debug|x64.ActiveCfg = Debug|x64 - {0E383EF0-CEF7-4733-87C6-5AC9844AA1EF}.Debug|x64.Build.0 = Debug|x64 - {0E383EF0-CEF7-4733-87C6-5AC9844AA1EF}.Debug|x86.ActiveCfg = Debug|Win32 - {0E383EF0-CEF7-4733-87C6-5AC9844AA1EF}.Debug|x86.Build.0 = Debug|Win32 - {0E383EF0-CEF7-4733-87C6-5AC9844AA1EF}.Release|x64.ActiveCfg = Release|x64 - {0E383EF0-CEF7-4733-87C6-5AC9844AA1EF}.Release|x64.Build.0 = Release|x64 - {0E383EF0-CEF7-4733-87C6-5AC9844AA1EF}.Release|x86.ActiveCfg = Release|Win32 - {0E383EF0-CEF7-4733-87C6-5AC9844AA1EF}.Release|x86.Build.0 = Release|Win32 {5FDE4822-C771-46A5-B6B2-FD12BACE86BF}.Debug|x64.ActiveCfg = Debug|x64 {5FDE4822-C771-46A5-B6B2-FD12BACE86BF}.Debug|x64.Build.0 = Debug|x64 {5FDE4822-C771-46A5-B6B2-FD12BACE86BF}.Debug|x86.ActiveCfg = Debug|Win32 @@ -161,6 +153,14 @@ Global {17B96F07-EF92-47CD-95A5-8E6EE38AB564}.Release|x64.Build.0 = Release|x64 {17B96F07-EF92-47CD-95A5-8E6EE38AB564}.Release|x86.ActiveCfg = Release|Win32 {17B96F07-EF92-47CD-95A5-8E6EE38AB564}.Release|x86.Build.0 = Release|Win32 + {0E383EF0-CEF7-4733-87C6-5AC9844AA1EF}.Debug|x64.ActiveCfg = Debug|x64 + {0E383EF0-CEF7-4733-87C6-5AC9844AA1EF}.Debug|x64.Build.0 = Debug|x64 + {0E383EF0-CEF7-4733-87C6-5AC9844AA1EF}.Debug|x86.ActiveCfg = Debug|Win32 + {0E383EF0-CEF7-4733-87C6-5AC9844AA1EF}.Debug|x86.Build.0 = Debug|Win32 + {0E383EF0-CEF7-4733-87C6-5AC9844AA1EF}.Release|x64.ActiveCfg = Release|x64 + {0E383EF0-CEF7-4733-87C6-5AC9844AA1EF}.Release|x64.Build.0 = Release|x64 + {0E383EF0-CEF7-4733-87C6-5AC9844AA1EF}.Release|x86.ActiveCfg = Release|Win32 + {0E383EF0-CEF7-4733-87C6-5AC9844AA1EF}.Release|x86.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/GpD3D/GpD3D.vcxproj.filters b/Aerofoil/Aerofoil.filters similarity index 96% rename from GpD3D/GpD3D.vcxproj.filters rename to Aerofoil/Aerofoil.filters index 019f16b..9d37172 100644 --- a/GpD3D/GpD3D.vcxproj.filters +++ b/Aerofoil/Aerofoil.filters @@ -202,7 +202,7 @@ - + Resource Files diff --git a/GpD3D/GpD3D.rc b/Aerofoil/Aerofoil.rc similarity index 100% rename from GpD3D/GpD3D.rc rename to Aerofoil/Aerofoil.rc diff --git a/GpD3D/GpD3D.vcxproj b/Aerofoil/Aerofoil.vcxproj similarity index 97% rename from GpD3D/GpD3D.vcxproj rename to Aerofoil/Aerofoil.vcxproj index a900af2..f3180f0 100644 --- a/GpD3D/GpD3D.vcxproj +++ b/Aerofoil/Aerofoil.vcxproj @@ -21,7 +21,7 @@ 15.0 {0E383EF0-CEF7-4733-87C6-5AC9844AA1EF} - GpD3D + Aerofoil 10.0.17763.0 @@ -225,7 +225,7 @@ - + diff --git a/GpD3D/ConvertedResources/Large128.ico b/Aerofoil/ConvertedResources/Large128.ico similarity index 100% rename from GpD3D/ConvertedResources/Large128.ico rename to Aerofoil/ConvertedResources/Large128.ico diff --git a/GpD3D/ConvertedResources/Large129.ico b/Aerofoil/ConvertedResources/Large129.ico similarity index 100% rename from GpD3D/ConvertedResources/Large129.ico rename to Aerofoil/ConvertedResources/Large129.ico diff --git a/GpD3D/ConvertedResources/Large130.ico b/Aerofoil/ConvertedResources/Large130.ico similarity index 100% rename from GpD3D/ConvertedResources/Large130.ico rename to Aerofoil/ConvertedResources/Large130.ico diff --git a/GpD3D/ConvertedResources/Large131.ico b/Aerofoil/ConvertedResources/Large131.ico similarity index 100% rename from GpD3D/ConvertedResources/Large131.ico rename to Aerofoil/ConvertedResources/Large131.ico diff --git a/GpD3D/ConvertedResources/Large132.ico b/Aerofoil/ConvertedResources/Large132.ico similarity index 100% rename from GpD3D/ConvertedResources/Large132.ico rename to Aerofoil/ConvertedResources/Large132.ico diff --git a/GpD3D/ConvertedResources/Large133.ico b/Aerofoil/ConvertedResources/Large133.ico similarity index 100% rename from GpD3D/ConvertedResources/Large133.ico rename to Aerofoil/ConvertedResources/Large133.ico diff --git a/GpD3D/ConvertedResources/Small128.ico b/Aerofoil/ConvertedResources/Small128.ico similarity index 100% rename from GpD3D/ConvertedResources/Small128.ico rename to Aerofoil/ConvertedResources/Small128.ico diff --git a/GpD3D/ConvertedResources/Small129.ico b/Aerofoil/ConvertedResources/Small129.ico similarity index 100% rename from GpD3D/ConvertedResources/Small129.ico rename to Aerofoil/ConvertedResources/Small129.ico diff --git a/GpD3D/ConvertedResources/Small130.ico b/Aerofoil/ConvertedResources/Small130.ico similarity index 100% rename from GpD3D/ConvertedResources/Small130.ico rename to Aerofoil/ConvertedResources/Small130.ico diff --git a/GpD3D/ConvertedResources/Small133.ico b/Aerofoil/ConvertedResources/Small133.ico similarity index 100% rename from GpD3D/ConvertedResources/Small133.ico rename to Aerofoil/ConvertedResources/Small133.ico diff --git a/GpD3D/GpAppEnvironment.cpp b/Aerofoil/GpAppEnvironment.cpp similarity index 100% rename from GpD3D/GpAppEnvironment.cpp rename to Aerofoil/GpAppEnvironment.cpp diff --git a/GpD3D/GpAppEnvironment.h b/Aerofoil/GpAppEnvironment.h similarity index 100% rename from GpD3D/GpAppEnvironment.h rename to Aerofoil/GpAppEnvironment.h diff --git a/GpD3D/GpAudioDriverFactory.cpp b/Aerofoil/GpAudioDriverFactory.cpp similarity index 100% rename from GpD3D/GpAudioDriverFactory.cpp rename to Aerofoil/GpAudioDriverFactory.cpp diff --git a/GpD3D/GpAudioDriverFactory.h b/Aerofoil/GpAudioDriverFactory.h similarity index 100% rename from GpD3D/GpAudioDriverFactory.h rename to Aerofoil/GpAudioDriverFactory.h diff --git a/GpD3D/GpColorCursor_Win32.cpp b/Aerofoil/GpColorCursor_Win32.cpp similarity index 100% rename from GpD3D/GpColorCursor_Win32.cpp rename to Aerofoil/GpColorCursor_Win32.cpp diff --git a/GpD3D/GpColorCursor_Win32.h b/Aerofoil/GpColorCursor_Win32.h similarity index 100% rename from GpD3D/GpColorCursor_Win32.h rename to Aerofoil/GpColorCursor_Win32.h diff --git a/GpD3D/GpDisplayDriverFactory.cpp b/Aerofoil/GpDisplayDriverFactory.cpp similarity index 100% rename from GpD3D/GpDisplayDriverFactory.cpp rename to Aerofoil/GpDisplayDriverFactory.cpp diff --git a/GpD3D/GpDisplayDriverFactory.h b/Aerofoil/GpDisplayDriverFactory.h similarity index 100% rename from GpD3D/GpDisplayDriverFactory.h rename to Aerofoil/GpDisplayDriverFactory.h diff --git a/GpD3D/GpFiberStarter.h b/Aerofoil/GpFiberStarter.h similarity index 100% rename from GpD3D/GpFiberStarter.h rename to Aerofoil/GpFiberStarter.h diff --git a/GpD3D/GpFiberStarter_Win32.cpp b/Aerofoil/GpFiberStarter_Win32.cpp similarity index 100% rename from GpD3D/GpFiberStarter_Win32.cpp rename to Aerofoil/GpFiberStarter_Win32.cpp diff --git a/GpD3D/GpFiber_Win32.cpp b/Aerofoil/GpFiber_Win32.cpp similarity index 100% rename from GpD3D/GpFiber_Win32.cpp rename to Aerofoil/GpFiber_Win32.cpp diff --git a/GpD3D/GpFiber_Win32.h b/Aerofoil/GpFiber_Win32.h similarity index 100% rename from GpD3D/GpFiber_Win32.h rename to Aerofoil/GpFiber_Win32.h diff --git a/GpD3D/GpFileStream_Win32.cpp b/Aerofoil/GpFileStream_Win32.cpp similarity index 100% rename from GpD3D/GpFileStream_Win32.cpp rename to Aerofoil/GpFileStream_Win32.cpp diff --git a/GpD3D/GpFileStream_Win32.h b/Aerofoil/GpFileStream_Win32.h similarity index 100% rename from GpD3D/GpFileStream_Win32.h rename to Aerofoil/GpFileStream_Win32.h diff --git a/GpD3D/GpFileSystem_Win32.cpp b/Aerofoil/GpFileSystem_Win32.cpp similarity index 100% rename from GpD3D/GpFileSystem_Win32.cpp rename to Aerofoil/GpFileSystem_Win32.cpp diff --git a/GpD3D/GpFileSystem_Win32.h b/Aerofoil/GpFileSystem_Win32.h similarity index 100% rename from GpD3D/GpFileSystem_Win32.h rename to Aerofoil/GpFileSystem_Win32.h diff --git a/GpD3D/GpFontHandlerFactory.cpp b/Aerofoil/GpFontHandlerFactory.cpp similarity index 100% rename from GpD3D/GpFontHandlerFactory.cpp rename to Aerofoil/GpFontHandlerFactory.cpp diff --git a/GpD3D/GpFontHandlerFactory.h b/Aerofoil/GpFontHandlerFactory.h similarity index 100% rename from GpD3D/GpFontHandlerFactory.h rename to Aerofoil/GpFontHandlerFactory.h diff --git a/GpD3D/GpFontHandler_FreeType2.cpp b/Aerofoil/GpFontHandler_FreeType2.cpp similarity index 100% rename from GpD3D/GpFontHandler_FreeType2.cpp rename to Aerofoil/GpFontHandler_FreeType2.cpp diff --git a/GpD3D/GpFontHandler_FreeType2.h b/Aerofoil/GpFontHandler_FreeType2.h similarity index 100% rename from GpD3D/GpFontHandler_FreeType2.h rename to Aerofoil/GpFontHandler_FreeType2.h diff --git a/GpD3D/GpGlobalConfig.cpp b/Aerofoil/GpGlobalConfig.cpp similarity index 100% rename from GpD3D/GpGlobalConfig.cpp rename to Aerofoil/GpGlobalConfig.cpp diff --git a/GpD3D/GpGlobalConfig.h b/Aerofoil/GpGlobalConfig.h similarity index 100% rename from GpD3D/GpGlobalConfig.h rename to Aerofoil/GpGlobalConfig.h diff --git a/GpD3D/GpInputDriverFactory.cpp b/Aerofoil/GpInputDriverFactory.cpp similarity index 100% rename from GpD3D/GpInputDriverFactory.cpp rename to Aerofoil/GpInputDriverFactory.cpp diff --git a/GpD3D/GpInputDriverFactory.h b/Aerofoil/GpInputDriverFactory.h similarity index 100% rename from GpD3D/GpInputDriverFactory.h rename to Aerofoil/GpInputDriverFactory.h diff --git a/GpD3D/GpMain.cpp b/Aerofoil/GpMain.cpp similarity index 100% rename from GpD3D/GpMain.cpp rename to Aerofoil/GpMain.cpp diff --git a/GpD3D/GpMain.h b/Aerofoil/GpMain.h similarity index 100% rename from GpD3D/GpMain.h rename to Aerofoil/GpMain.h diff --git a/GpD3D/GpMain_Win32.cpp b/Aerofoil/GpMain_Win32.cpp similarity index 100% rename from GpD3D/GpMain_Win32.cpp rename to Aerofoil/GpMain_Win32.cpp diff --git a/GpD3D/GpMemoryBuffer.cpp b/Aerofoil/GpMemoryBuffer.cpp similarity index 100% rename from GpD3D/GpMemoryBuffer.cpp rename to Aerofoil/GpMemoryBuffer.cpp diff --git a/GpD3D/GpMemoryBuffer.h b/Aerofoil/GpMemoryBuffer.h similarity index 100% rename from GpD3D/GpMemoryBuffer.h rename to Aerofoil/GpMemoryBuffer.h diff --git a/GpD3D/GpMutex_Win32.cpp b/Aerofoil/GpMutex_Win32.cpp similarity index 100% rename from GpD3D/GpMutex_Win32.cpp rename to Aerofoil/GpMutex_Win32.cpp diff --git a/GpD3D/GpMutex_Win32.h b/Aerofoil/GpMutex_Win32.h similarity index 100% rename from GpD3D/GpMutex_Win32.h rename to Aerofoil/GpMutex_Win32.h diff --git a/GpD3D/GpPLGlueAudioChannel.cpp b/Aerofoil/GpPLGlueAudioChannel.cpp similarity index 100% rename from GpD3D/GpPLGlueAudioChannel.cpp rename to Aerofoil/GpPLGlueAudioChannel.cpp diff --git a/GpD3D/GpPLGlueAudioChannel.h b/Aerofoil/GpPLGlueAudioChannel.h similarity index 100% rename from GpD3D/GpPLGlueAudioChannel.h rename to Aerofoil/GpPLGlueAudioChannel.h diff --git a/GpD3D/GpPLGlueAudioDriver.cpp b/Aerofoil/GpPLGlueAudioDriver.cpp similarity index 100% rename from GpD3D/GpPLGlueAudioDriver.cpp rename to Aerofoil/GpPLGlueAudioDriver.cpp diff --git a/GpD3D/GpPLGlueAudioDriver.h b/Aerofoil/GpPLGlueAudioDriver.h similarity index 100% rename from GpD3D/GpPLGlueAudioDriver.h rename to Aerofoil/GpPLGlueAudioDriver.h diff --git a/GpD3D/GpPLGlueDisplayDriver.cpp b/Aerofoil/GpPLGlueDisplayDriver.cpp similarity index 100% rename from GpD3D/GpPLGlueDisplayDriver.cpp rename to Aerofoil/GpPLGlueDisplayDriver.cpp diff --git a/GpD3D/GpPLGlueDisplayDriver.h b/Aerofoil/GpPLGlueDisplayDriver.h similarity index 100% rename from GpD3D/GpPLGlueDisplayDriver.h rename to Aerofoil/GpPLGlueDisplayDriver.h diff --git a/GpD3D/GpSystemServices_Win32.cpp b/Aerofoil/GpSystemServices_Win32.cpp similarity index 100% rename from GpD3D/GpSystemServices_Win32.cpp rename to Aerofoil/GpSystemServices_Win32.cpp diff --git a/GpD3D/GpSystemServices_Win32.h b/Aerofoil/GpSystemServices_Win32.h similarity index 100% rename from GpD3D/GpSystemServices_Win32.h rename to Aerofoil/GpSystemServices_Win32.h diff --git a/GpD3D/GpThreadEvent_Win32.cpp b/Aerofoil/GpThreadEvent_Win32.cpp similarity index 100% rename from GpD3D/GpThreadEvent_Win32.cpp rename to Aerofoil/GpThreadEvent_Win32.cpp diff --git a/GpD3D/GpThreadEvent_Win32.h b/Aerofoil/GpThreadEvent_Win32.h similarity index 100% rename from GpD3D/GpThreadEvent_Win32.h rename to Aerofoil/GpThreadEvent_Win32.h diff --git a/GpD3D/GpVOSEventQueue.cpp b/Aerofoil/GpVOSEventQueue.cpp similarity index 100% rename from GpD3D/GpVOSEventQueue.cpp rename to Aerofoil/GpVOSEventQueue.cpp diff --git a/GpD3D/GpVOSEventQueue.h b/Aerofoil/GpVOSEventQueue.h similarity index 100% rename from GpD3D/GpVOSEventQueue.h rename to Aerofoil/GpVOSEventQueue.h diff --git a/GpD3D/resource.h b/Aerofoil/resource.h similarity index 100% rename from GpD3D/resource.h rename to Aerofoil/resource.h diff --git a/ConvertColorCursors/ConvertColorCursors.cpp b/ConvertColorCursors/ConvertColorCursors.cpp index 19dc05d..0ef166e 100644 --- a/ConvertColorCursors/ConvertColorCursors.cpp +++ b/ConvertColorCursors/ConvertColorCursors.cpp @@ -273,7 +273,7 @@ void ConvertIconFamily(PortabilityLayer::ResourceFile *resFile, int32_t iconBitm } char outPath[256]; - sprintf_s(outPath, "GpD3D\\ConvertedResources\\%s%i.ico", prefix, resID); + sprintf_s(outPath, "Aerofoil\\ConvertedResources\\%s%i.ico", prefix, resID); FILE *outF = nullptr; errno_t outErr = fopen_s(&outF, outPath, "wb"); diff --git a/GlidePort/GlidePort.vcxproj b/GlidePort/GlidePort.vcxproj deleted file mode 100644 index ea335fd..0000000 --- a/GlidePort/GlidePort.vcxproj +++ /dev/null @@ -1,122 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - - 15.0 - {69C3CD2A-3114-4181-884A-C09A4C62FBE0} - GlidePort - 10.0.16299.0 - - - - Application - true - v141 - MultiByte - - - Application - false - v141 - true - MultiByte - - - Application - true - v141 - MultiByte - - - Application - false - v141 - true - MultiByte - - - - - - - - - - - - - - - - - - - - - - - Level3 - Disabled - true - true - - - - - Level3 - Disabled - true - true - - - - - Level3 - MaxSpeed - true - true - true - true - - - true - true - - - - - Level3 - MaxSpeed - true - true - true - true - - - true - true - - - - - - - - \ No newline at end of file diff --git a/GlidePort/GlidePort.vcxproj.filters b/GlidePort/GlidePort.vcxproj.filters deleted file mode 100644 index f81daba..0000000 --- a/GlidePort/GlidePort.vcxproj.filters +++ /dev/null @@ -1,17 +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 - - - \ No newline at end of file