From d6926cb7d3ca244e6010d0e3f72b0e893588b685 Mon Sep 17 00:00:00 2001 From: pogokeen Date: Sat, 17 Feb 2018 06:38:15 +0000 Subject: [PATCH] Fix building on Visual Studio after GLAD & Polymost changes git-svn-id: https://svn.eduke32.com/eduke32@6671 1a8010ca-5511-0410-912e-c29ae57300e0 --- platform/Windows/eduke32.vcxproj | 838 ++++----- platform/Windows/eduke32.vcxproj.filters | 2116 +++++++++++----------- platform/Windows/msvc.mak | 24 +- source/build/src/polymost.cpp | 22 +- 4 files changed, 1524 insertions(+), 1476 deletions(-) diff --git a/platform/Windows/eduke32.vcxproj b/platform/Windows/eduke32.vcxproj index 4f913d75c..a2987ee02 100644 --- a/platform/Windows/eduke32.vcxproj +++ b/platform/Windows/eduke32.vcxproj @@ -1,417 +1,421 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - Debug-SDL - Win32 - - - Release-SDL - Win32 - - - Debug-SDL - x64 - - - Release-SDL - x64 - - - - 15.0 - {8E7A6179-0B72-4073-8A4C-E8682D481DAE} - eduke32 - MakeFileProj - v140 - - - - - - - - - - - Makefile - .\..\..\ - .\..\..\ - $(NMakeIncludeSearchPath);..\..\source\build\include;..\..\source\mact\include;..\..\source\audiolib\include;..\..\source\enet\include;..\..\platform\windows\include - nmake /f msvc.mak DEBUG=1 WINBITS=32 - nmake /f msvc.mak veryclean all DEBUG=1 WINBITS=32 - nmake /f msvc.mak veryclean DEBUG=1 WINBITS=32 - USE_OPENGL;POLYMER - nmake /f msvc.mak WINBITS=32 - nmake /f msvc.mak veryclean all WINBITS=32 - nmake /f msvc.mak veryclean WINBITS=32 - USE_OPENGL;POLYMER - nmake /f msvc.mak DEBUG=1 WINBITS=64 - nmake /f msvc.mak veryclean all DEBUG=1 WINBITS=64 - nmake /f msvc.mak veryclean DEBUG=1 WINBITS=64 - USE_OPENGL;POLYMER;NOASM - nmake /f msvc.mak WINBITS=64 - nmake /f msvc.mak veryclean all WINBITS=64 - nmake /f msvc.mak veryclean WINBITS=64 - USE_OPENGL;POLYMER;NOASM - nmake /f msvc.mak DEBUG=1 WINBITS=32 RENDERTYPE=SDL - nmake /f msvc.mak veryclean all DEBUG=1 WINBITS=32 RENDERTYPE=SDL - nmake /f msvc.mak veryclean DEBUG=1 WINBITS=32 RENDERTYPE=SDL - USE_OPENGL;POLYMER;SDL_USEFOLDER;SDL_TARGET=2 - nmake /f msvc.mak WINBITS=32 RENDERTYPE=SDL - nmake /f msvc.mak veryclean all WINBITS=32 RENDERTYPE=SDL - nmake /f msvc.mak veryclean WINBITS=32 RENDERTYPE=SDL - USE_OPENGL;POLYMER;SDL_USEFOLDER;SDL_TARGET=2 - nmake /f msvc.mak DEBUG=1 WINBITS=64 RENDERTYPE=SDL - nmake /f msvc.mak veryclean all DEBUG=1 WINBITS=64 RENDERTYPE=SDL - nmake /f msvc.mak veryclean DEBUG=1 WINBITS=64 RENDERTYPE=SDL - USE_OPENGL;POLYMER;NOASM;SDL_USEFOLDER;SDL_TARGET=2 - nmake /f msvc.mak WINBITS=64 RENDERTYPE=SDL - nmake /f msvc.mak veryclean all WINBITS=64 RENDERTYPE=SDL - nmake /f msvc.mak veryclean WINBITS=64 RENDERTYPE=SDL - USE_OPENGL;POLYMER;NOASM;SDL_USEFOLDER;SDL_TARGET=2 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + Debug-SDL + Win32 + + + Release-SDL + Win32 + + + Debug-SDL + x64 + + + Release-SDL + x64 + + + + 15.0 + {8E7A6179-0B72-4073-8A4C-E8682D481DAE} + eduke32 + MakeFileProj + v140 + + + + + + + + + + + Makefile + .\..\..\ + .\..\..\ + $(NMakeIncludeSearchPath);..\..\source\build\include;..\..\source\mact\include;..\..\source\audiolib\include;..\..\source\enet\include;..\..\platform\windows\include + nmake /f msvc.mak DEBUG=1 WINBITS=32 + nmake /f msvc.mak veryclean all DEBUG=1 WINBITS=32 + nmake /f msvc.mak veryclean DEBUG=1 WINBITS=32 + USE_OPENGL;POLYMER + nmake /f msvc.mak WINBITS=32 + nmake /f msvc.mak veryclean all WINBITS=32 + nmake /f msvc.mak veryclean WINBITS=32 + USE_OPENGL;POLYMER + nmake /f msvc.mak DEBUG=1 WINBITS=64 + nmake /f msvc.mak veryclean all DEBUG=1 WINBITS=64 + nmake /f msvc.mak veryclean DEBUG=1 WINBITS=64 + USE_OPENGL;POLYMER;NOASM + nmake /f msvc.mak WINBITS=64 + nmake /f msvc.mak veryclean all WINBITS=64 + nmake /f msvc.mak veryclean WINBITS=64 + USE_OPENGL;POLYMER;NOASM + nmake /f msvc.mak DEBUG=1 WINBITS=32 RENDERTYPE=SDL + nmake /f msvc.mak veryclean all DEBUG=1 WINBITS=32 RENDERTYPE=SDL + nmake /f msvc.mak veryclean DEBUG=1 WINBITS=32 RENDERTYPE=SDL + USE_OPENGL;POLYMER;SDL_USEFOLDER;SDL_TARGET=2 + nmake /f msvc.mak WINBITS=32 RENDERTYPE=SDL + nmake /f msvc.mak veryclean all WINBITS=32 RENDERTYPE=SDL + nmake /f msvc.mak veryclean WINBITS=32 RENDERTYPE=SDL + USE_OPENGL;POLYMER;SDL_USEFOLDER;SDL_TARGET=2 + nmake /f msvc.mak DEBUG=1 WINBITS=64 RENDERTYPE=SDL + nmake /f msvc.mak veryclean all DEBUG=1 WINBITS=64 RENDERTYPE=SDL + nmake /f msvc.mak veryclean DEBUG=1 WINBITS=64 RENDERTYPE=SDL + USE_OPENGL;POLYMER;NOASM;SDL_USEFOLDER;SDL_TARGET=2 + nmake /f msvc.mak WINBITS=64 RENDERTYPE=SDL + nmake /f msvc.mak veryclean all WINBITS=64 RENDERTYPE=SDL + nmake /f msvc.mak veryclean WINBITS=64 RENDERTYPE=SDL + USE_OPENGL;POLYMER;NOASM;SDL_USEFOLDER;SDL_TARGET=2 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/platform/Windows/eduke32.vcxproj.filters b/platform/Windows/eduke32.vcxproj.filters index e59ee7fff..7e2ce7fd5 100644 --- a/platform/Windows/eduke32.vcxproj.filters +++ b/platform/Windows/eduke32.vcxproj.filters @@ -1,1046 +1,1070 @@ - - - - - {be808922-2ddf-4835-a57d-42e2f8d6e6d1} - - - {6b639a6d-6609-479e-bf61-3e2d3e4323e6} - - - {84e51a60-037b-40c6-933a-7001d46906ab} - - - {eb6a8145-04f6-4b81-b8eb-508836cfdc91} - - - {7f1918c8-1b71-43db-b2af-aefaf13d21ac} - - - {447f3e7e-c01b-4ec3-8427-36441da24049} - - - {da5afe7a-2de4-4594-b07f-69cd3d29cc1b} - - - {4386b181-dad1-4aaa-9395-b5b57e49bca1} - - - {647e88f0-5d39-46cc-9822-460f2db9dfe6} - - - {766da152-470f-4b3b-8c8c-8289206d0d4e} - - - {df162924-c116-4c59-a0f3-589ebfb0ca27} - - - {dd93df66-1ed9-4b54-bd54-18abf46d2773} - - - {82d4000f-cd8c-4737-88dc-4ada5775a68e} - - - {65030203-c837-4739-a552-281c7535372f} - - - {607ab16a-c3a5-4dad-b6ba-3393e6309d23} - - - {8a6aad55-a3bc-4e4f-a61d-4652c29d8b92} - - - {e8ea0b0a-e748-4c94-8d84-5062dd5b68a1} - - - {3477e5cd-29a4-42b2-8c3f-ca4618242526} - - - {a2f8f371-b34a-435c-9f36-efd473c9a6b0} - - - {a5111ba8-0086-4ec9-baac-a8e5f58faca5} - - - {3fea8854-df48-42c5-9bd9-8adbb29fac76} - - - {f1025787-c43f-43de-8b46-143ea0462fc1} - - - {52ce6149-4982-41a4-9adf-c7a9468421fd} - - - {d3b67b4f-6b78-43e0-88ab-f081b977499a} - - - {e7398716-03fa-4baf-b8dc-a8c734386ae7} - - - {503b9776-fb3e-4abe-a47c-11395b7f249a} - - - {ed032f74-5d34-4314-9579-6a031cf615f1} - - - - - build\headers - - - build\headers - - - build\headers - - - build\headers - - - build\headers - - - build\headers - - - build\headers - - - build\headers - - - build\headers - - - build\headers - - - build\headers - - - build\headers - - - build\headers - - - build\headers - - - build\headers - - - build\headers - - - build\headers - - - build\headers - - - build\headers - - - build\headers - - - build\headers - - - build\headers - - - build\headers - - - build\headers - - - build\headers - - - build\headers - - - build\headers\MSVC - - - build\headers\MSVC - - - eduke32\headers - - - eduke32\headers - - - eduke32\headers - - - eduke32\headers - - - eduke32\headers - - - eduke32\headers - - - eduke32\headers - - - eduke32\headers - - - eduke32\headers - - - eduke32\headers - - - eduke32\headers - - - eduke32\headers - - - eduke32\headers - - - eduke32\headers - - - eduke32\headers - - - eduke32\headers - - - eduke32\headers - - - eduke32\headers - - - eduke32\headers - - - eduke32\headers - - - audiolib\headers - - - audiolib\headers - - - audiolib\headers - - - audiolib\headers - - - audiolib\headers - - - audiolib\headers - - - audiolib\headers - - - audiolib\headers - - - mact\headers - - - mact\headers - - - mact\headers - - - mact\headers - - - mact\headers - - - mact\headers - - - mact\headers - - - mact\headers - - - enet\headers - - - enet\headers - - - enet\headers - - - enet\headers - - - enet\headers - - - enet\headers - - - enet\headers - - - enet\headers - - - enet\headers - - - build\headers - - - build\headers - - - build\headers - - - build\headers - - - eduke32\headers - - - eduke32\headers - - - eduke32\headers - - - eduke32\headers - - - eduke32\headers - - - eduke32\headers - - - eduke32\headers - - - eduke32\headers - - - eduke32\headers - - - eduke32\headers - - - eduke32\headers - - - eduke32\headers - - - eduke32\headers - - - eduke32\headers - - - eduke32\headers - - - eduke32\headers\editor - - - eduke32\headers\editor - - - eduke32\headers\editor - - - eduke32\headers - - - build\headers - - - build\headers - - - build\headers - - - build\headers - - - eduke32\headers - - - build\headers - - - build\headers - - - build\headers - - - build\headers - - - eduke32\source\lunatic\headers - - - eduke32\source\lunatic\headers - - - eduke32\headers\android - - - eduke32\headers - - - build\headers - - - build\headers - - - build\headers - - - build\headers - - - build\headers - - - build\headers - - - build\headers - - - build\headers - - - build\headers - - - touchcontrols\headers - - - touchcontrols\headers - - - touchcontrols\headers - - - touchcontrols\headers - - - touchcontrols\headers - - - touchcontrols\headers - - - touchcontrols\headers - - - touchcontrols\headers - - - touchcontrols\headers - - - touchcontrols\headers - - - touchcontrols\headers - - - touchcontrols\headers - - - touchcontrols\headers - - - touchcontrols\headers - - - touchcontrols\headers - - - build\headers - - - build\headers - - - audiolib\headers - - - build\headers - - - eduke32\headers - - - eduke32\headers - - - eduke32\headers - - - eduke32\headers - - - eduke32\headers - - - eduke32\headers - - - eduke32\headers - - - eduke32\headers - - - build\headers - - - build\headers - - - build\headers - - - build\headers - - - audiolib\headers - - - eduke32\headers\editor - - - build\headers - - - build\headers - - - build\headers - - - build\headers - - - - - build\source - - - build\source - - - build\source - - - build\source - - - build\source - - - build\source - - - build\source - - - build\source - - - build\source - - - build\source - - - build\source - - - build\source - - - build\source - - - build\source - - - build\source - - - build\source - - - build\source - - - build\source - - - build\source - - - build\source - - - build\source - - - build\source - - - build\source - - - build\source - - - build\source - - - build\source - - - build\source - - - build\source - - - eduke32\source - - - eduke32\source - - - eduke32\source - - - eduke32\source - - - eduke32\source - - - eduke32\source - - - eduke32\source - - - eduke32\source - - - eduke32\source - - - eduke32\source - - - eduke32\source - - - eduke32\source - - - eduke32\source - - - eduke32\source - - - eduke32\source - - - eduke32\source - - - eduke32\source - - - eduke32\source - - - eduke32\source - - - eduke32\source - - - eduke32\source - - - eduke32\source - - - eduke32\source - - - eduke32\source - - - eduke32\source - - - eduke32\source - - - eduke32\source - - - eduke32\source - - - eduke32\source - - - audiolib\source - - - audiolib\source - - - audiolib\source - - - audiolib\source - - - audiolib\source - - - audiolib\source - - - audiolib\source - - - audiolib\source - - - audiolib\source - - - audiolib\source - - - mact\source - - - mact\source - - - mact\source - - - mact\source - - - mact\source - - - enet\source - - - enet\source - - - enet\source - - - enet\source - - - enet\source - - - enet\source - - - enet\source - - - enet\source - - - build\source - - - build\source - - - eduke32\source - - - eduke32\source - - - eduke32\source\editor - - - eduke32\source\editor - - - eduke32\source\editor - - - eduke32\source\editor - - - eduke32\source\editor - - - eduke32\source\editor - - - eduke32\source - - - build\source - - - enet\source - - - eduke32\source - - - build\source - - - build\source - - - build\source - - - eduke32\source\lunatic\source - - - eduke32\source\lunatic\source - - - eduke32\source\android - - - build\source - - - eduke32\source\editor - - - build\source - - - touchcontrols\source - - - touchcontrols\source - - - touchcontrols\source - - - touchcontrols\source - - - touchcontrols\source - - - touchcontrols\source - - - touchcontrols\source - - - touchcontrols\source - - - touchcontrols\source - - - touchcontrols\source - - - touchcontrols\source - - - touchcontrols\source - - - touchcontrols\source - - - build\source - - - build\source - - - audiolib\source - - - audiolib\source - - - audiolib\source - - - build\source - - - build\source - - - build\source - - - eduke32\source - - - eduke32\source - - - eduke32\source - - - eduke32\source - - - eduke32\source - - - build\source - - - build\source - - - build\source - - - build\source - - - build\source - - - build\source - - - build\source - - - build\source - - - build\source - - - - - eduke32 - - - eduke32\source\lunatic - - - eduke32\source\lunatic - - - eduke32\source\lunatic - - - eduke32\source\lunatic\lua - - - eduke32\source\lunatic\lua - - - eduke32\source\lunatic\lua - - - eduke32\source\lunatic\lua - - - eduke32\source\lunatic\lua - - - eduke32\source\lunatic\lua - - - eduke32\source\lunatic\lua - - - eduke32\source\lunatic\lua - - - eduke32\source\lunatic\lua - - - eduke32\source\lunatic\lua - - - eduke32\source\lunatic\lua - - - eduke32\source\lunatic\lua - - - eduke32\source\lunatic\lua - - - eduke32\source\lunatic\lua - - - eduke32\source\lunatic\lua - - - eduke32\source\lunatic\lua - - - eduke32\source\lunatic\lua - - - eduke32\source\lunatic\lua - - - eduke32\source\lunatic\lua - - - eduke32\source\lunatic\lua - - - eduke32\source\lunatic\lua - - - + + + + + {be808922-2ddf-4835-a57d-42e2f8d6e6d1} + + + {6b639a6d-6609-479e-bf61-3e2d3e4323e6} + + + {84e51a60-037b-40c6-933a-7001d46906ab} + + + {eb6a8145-04f6-4b81-b8eb-508836cfdc91} + + + {7f1918c8-1b71-43db-b2af-aefaf13d21ac} + + + {447f3e7e-c01b-4ec3-8427-36441da24049} + + + {da5afe7a-2de4-4594-b07f-69cd3d29cc1b} + + + {4386b181-dad1-4aaa-9395-b5b57e49bca1} + + + {647e88f0-5d39-46cc-9822-460f2db9dfe6} + + + {766da152-470f-4b3b-8c8c-8289206d0d4e} + + + {df162924-c116-4c59-a0f3-589ebfb0ca27} + + + {dd93df66-1ed9-4b54-bd54-18abf46d2773} + + + {82d4000f-cd8c-4737-88dc-4ada5775a68e} + + + {65030203-c837-4739-a552-281c7535372f} + + + {607ab16a-c3a5-4dad-b6ba-3393e6309d23} + + + {8a6aad55-a3bc-4e4f-a61d-4652c29d8b92} + + + {e8ea0b0a-e748-4c94-8d84-5062dd5b68a1} + + + {3477e5cd-29a4-42b2-8c3f-ca4618242526} + + + {a2f8f371-b34a-435c-9f36-efd473c9a6b0} + + + {a5111ba8-0086-4ec9-baac-a8e5f58faca5} + + + {3fea8854-df48-42c5-9bd9-8adbb29fac76} + + + {f1025787-c43f-43de-8b46-143ea0462fc1} + + + {52ce6149-4982-41a4-9adf-c7a9468421fd} + + + {d3b67b4f-6b78-43e0-88ab-f081b977499a} + + + {e7398716-03fa-4baf-b8dc-a8c734386ae7} + + + {503b9776-fb3e-4abe-a47c-11395b7f249a} + + + {ed032f74-5d34-4314-9579-6a031cf615f1} + + + {7cc363ab-f5ca-4caa-b082-a4b7b19a4b04} + + + {965e9834-14d4-48c6-a5b4-016d0bb5290e} + + + {46fa3902-239e-408c-ad6d-29fb433f50f2} + + + {51aa430b-dee3-4d5a-b657-6b829491fcdc} + + + + + build\headers + + + build\headers + + + build\headers + + + build\headers + + + build\headers + + + build\headers + + + build\headers + + + build\headers + + + build\headers + + + build\headers + + + build\headers + + + build\headers + + + build\headers + + + build\headers + + + build\headers + + + build\headers + + + build\headers + + + build\headers + + + build\headers + + + build\headers + + + build\headers + + + build\headers + + + build\headers + + + build\headers + + + build\headers + + + build\headers + + + build\headers\MSVC + + + build\headers\MSVC + + + eduke32\headers + + + eduke32\headers + + + eduke32\headers + + + eduke32\headers + + + eduke32\headers + + + eduke32\headers + + + eduke32\headers + + + eduke32\headers + + + eduke32\headers + + + eduke32\headers + + + eduke32\headers + + + eduke32\headers + + + eduke32\headers + + + eduke32\headers + + + eduke32\headers + + + eduke32\headers + + + eduke32\headers + + + eduke32\headers + + + eduke32\headers + + + eduke32\headers + + + audiolib\headers + + + audiolib\headers + + + audiolib\headers + + + audiolib\headers + + + audiolib\headers + + + audiolib\headers + + + audiolib\headers + + + audiolib\headers + + + mact\headers + + + mact\headers + + + mact\headers + + + mact\headers + + + mact\headers + + + mact\headers + + + mact\headers + + + mact\headers + + + enet\headers + + + enet\headers + + + enet\headers + + + enet\headers + + + enet\headers + + + enet\headers + + + enet\headers + + + enet\headers + + + enet\headers + + + build\headers + + + build\headers + + + build\headers + + + build\headers + + + eduke32\headers + + + eduke32\headers + + + eduke32\headers + + + eduke32\headers + + + eduke32\headers + + + eduke32\headers + + + eduke32\headers + + + eduke32\headers + + + eduke32\headers + + + eduke32\headers + + + eduke32\headers + + + eduke32\headers + + + eduke32\headers + + + eduke32\headers + + + eduke32\headers + + + eduke32\headers\editor + + + eduke32\headers\editor + + + eduke32\headers\editor + + + eduke32\headers + + + build\headers + + + build\headers + + + build\headers + + + build\headers + + + eduke32\headers + + + build\headers + + + build\headers + + + build\headers + + + build\headers + + + eduke32\source\lunatic\headers + + + eduke32\source\lunatic\headers + + + eduke32\headers\android + + + eduke32\headers + + + build\headers + + + build\headers + + + build\headers + + + build\headers + + + build\headers + + + build\headers + + + build\headers + + + build\headers + + + build\headers + + + touchcontrols\headers + + + touchcontrols\headers + + + touchcontrols\headers + + + touchcontrols\headers + + + touchcontrols\headers + + + touchcontrols\headers + + + touchcontrols\headers + + + touchcontrols\headers + + + touchcontrols\headers + + + touchcontrols\headers + + + touchcontrols\headers + + + touchcontrols\headers + + + touchcontrols\headers + + + touchcontrols\headers + + + touchcontrols\headers + + + build\headers + + + build\headers + + + audiolib\headers + + + build\headers + + + eduke32\headers + + + eduke32\headers + + + eduke32\headers + + + eduke32\headers + + + eduke32\headers + + + eduke32\headers + + + eduke32\headers + + + eduke32\headers + + + build\headers + + + build\headers + + + build\headers + + + build\headers + + + audiolib\headers + + + eduke32\headers\editor + + + build\headers + + + build\headers + + + build\headers + + + build\headers + + + glad\headers\glad + + + glad\headers\glad + + + + + build\source + + + build\source + + + build\source + + + build\source + + + build\source + + + build\source + + + build\source + + + build\source + + + build\source + + + build\source + + + build\source + + + build\source + + + build\source + + + build\source + + + build\source + + + build\source + + + build\source + + + build\source + + + build\source + + + build\source + + + build\source + + + build\source + + + build\source + + + build\source + + + build\source + + + build\source + + + build\source + + + build\source + + + eduke32\source + + + eduke32\source + + + eduke32\source + + + eduke32\source + + + eduke32\source + + + eduke32\source + + + eduke32\source + + + eduke32\source + + + eduke32\source + + + eduke32\source + + + eduke32\source + + + eduke32\source + + + eduke32\source + + + eduke32\source + + + eduke32\source + + + eduke32\source + + + eduke32\source + + + eduke32\source + + + eduke32\source + + + eduke32\source + + + eduke32\source + + + eduke32\source + + + eduke32\source + + + eduke32\source + + + eduke32\source + + + eduke32\source + + + eduke32\source + + + eduke32\source + + + eduke32\source + + + audiolib\source + + + audiolib\source + + + audiolib\source + + + audiolib\source + + + audiolib\source + + + audiolib\source + + + audiolib\source + + + audiolib\source + + + audiolib\source + + + audiolib\source + + + mact\source + + + mact\source + + + mact\source + + + mact\source + + + mact\source + + + enet\source + + + enet\source + + + enet\source + + + enet\source + + + enet\source + + + enet\source + + + enet\source + + + enet\source + + + build\source + + + build\source + + + eduke32\source + + + eduke32\source + + + eduke32\source\editor + + + eduke32\source\editor + + + eduke32\source\editor + + + eduke32\source\editor + + + eduke32\source\editor + + + eduke32\source\editor + + + eduke32\source + + + build\source + + + enet\source + + + eduke32\source + + + build\source + + + build\source + + + build\source + + + eduke32\source\lunatic\source + + + eduke32\source\lunatic\source + + + eduke32\source\android + + + build\source + + + eduke32\source\editor + + + build\source + + + touchcontrols\source + + + touchcontrols\source + + + touchcontrols\source + + + touchcontrols\source + + + touchcontrols\source + + + touchcontrols\source + + + touchcontrols\source + + + touchcontrols\source + + + touchcontrols\source + + + touchcontrols\source + + + touchcontrols\source + + + touchcontrols\source + + + touchcontrols\source + + + build\source + + + build\source + + + audiolib\source + + + audiolib\source + + + audiolib\source + + + build\source + + + build\source + + + build\source + + + eduke32\source + + + eduke32\source + + + eduke32\source + + + eduke32\source + + + eduke32\source + + + build\source + + + build\source + + + build\source + + + build\source + + + build\source + + + build\source + + + build\source + + + build\source + + + build\source + + + glad\source + + + glad\source + + + + + eduke32 + + + eduke32\source\lunatic + + + eduke32\source\lunatic + + + eduke32\source\lunatic + + + eduke32\source\lunatic\lua + + + eduke32\source\lunatic\lua + + + eduke32\source\lunatic\lua + + + eduke32\source\lunatic\lua + + + eduke32\source\lunatic\lua + + + eduke32\source\lunatic\lua + + + eduke32\source\lunatic\lua + + + eduke32\source\lunatic\lua + + + eduke32\source\lunatic\lua + + + eduke32\source\lunatic\lua + + + eduke32\source\lunatic\lua + + + eduke32\source\lunatic\lua + + + eduke32\source\lunatic\lua + + + eduke32\source\lunatic\lua + + + eduke32\source\lunatic\lua + + + eduke32\source\lunatic\lua + + + eduke32\source\lunatic\lua + + + eduke32\source\lunatic\lua + + + eduke32\source\lunatic\lua + + + eduke32\source\lunatic\lua + + + eduke32\source\lunatic\lua + + + \ No newline at end of file diff --git a/platform/Windows/msvc.mak b/platform/Windows/msvc.mak index 6c2504bb5..beeb5f235 100644 --- a/platform/Windows/msvc.mak +++ b/platform/Windows/msvc.mak @@ -35,6 +35,12 @@ ENET_OBJ=$(obj)\$(ENET) ENET_INC=$(ENET_ROOT)\include ENET_SRC=$(ENET_ROOT)\src +GLAD=glad +GLAD_ROOT=$(source)\$(GLAD) +GLAD_OBJ=$(obj)\$(GLAD) +GLAD_INC=$(GLAD_ROOT)\include +GLAD_SRC=$(GLAD_ROOT)\src + LIBXMPLITE=libxmp-lite LIBXMPLITE_ROOT=$(source)\$(LIBXMPLITE) LIBXMPLITE_OBJ=$(obj)\$(LIBXMPLITE) @@ -101,7 +107,7 @@ AS=ml LINK=link /nologo /opt:ref MT=mt CFLAGS= /MT /J /nologo /std:c++latest $(flags_cl) \ - /I$(DUKE3D_SRC) /I$(ENGINE_INC)\msvc /I$(ENGINE_INC) /I$(MACT_INC) /I$(AUDIOLIB_INC) /I$(ENET_INC) /I$(LIBXMPLITE_INC) \ + /I$(DUKE3D_SRC) /I$(ENGINE_INC)\msvc /I$(ENGINE_INC) /I$(MACT_INC) /I$(AUDIOLIB_INC) /I$(ENET_INC) /I$(GLAD_INC) /I$(LIBXMPLITE_INC) \ /W2 $(ENGINEOPTS) \ /I$(PLATFORM)\include /DRENDERTYPE$(RENDERTYPE)=1 /DMIXERTYPE$(MIXERTYPE)=1 /DSDL_USEFOLDER /DSDL_TARGET=2 @@ -194,6 +200,11 @@ ENET_OBJS=$(ENET_OBJ)\callbacks.$o \ $(ENET_OBJ)\win32.$o \ $(ENET_OBJ)\compress.$o +GLAD_OBJS=$(GLAD_OBJ)\glad.$o \ +!if ("$(RENDERTYPE)"=="WIN") + $(GLAD_OBJ)\glad_wgl.$o +!endif + LIBXMPLITE_OBJS=$(LIBXMPLITE_OBJ)\control.$o \ $(LIBXMPLITE_OBJ)\dataio.$o \ $(LIBXMPLITE_OBJ)\effects.$o \ @@ -315,6 +326,7 @@ DUKE3D_EDITOR_OBJS=$(DUKE3D_EDITOR_OBJS) $(MUSICOBJ) CHECKDIR_ENGINE=@if not exist "$(ENGINE_OBJ)" mkdir "$(ENGINE_OBJ)" CHECKDIR_DUKE3D=@if not exist "$(DUKE3D_OBJ)" mkdir "$(DUKE3D_OBJ)" CHECKDIR_ENET=@if not exist "$(ENET_OBJ)" mkdir "$(ENET_OBJ)" +CHECKDIR_GLAD=@if not exist "$(GLAD_OBJ)" mkdir "$(GLAD_OBJ)" CHECKDIR_MACT=@if not exist "$(MACT_OBJ)" mkdir "$(MACT_OBJ)" CHECKDIR_AUDIOLIB=@if not exist "$(AUDIOLIB_OBJ)" mkdir "$(AUDIOLIB_OBJ)" CHECKDIR_LIBXMPLITE=@if not exist "$(LIBXMPLITE_OBJ)" mkdir "$(LIBXMPLITE_OBJ)" @@ -341,6 +353,10 @@ MAPSTER32_TARGET=$(root)\mapster32$(EXESUFFIX) $(CHECKDIR_ENET) $(CC) /c $(CFLAGS) $(ENET_CFLAGS) /Fo$@ $< +{$(GLAD_SRC)}.c{$(GLAD_OBJ)}.$o: + $(CHECKDIR_GLAD) + $(CC) /c $(CFLAGS) /Fo$@ $< + {$(LIBXMPLITE_SRC)}.c{$(LIBXMPLITE_OBJ)}.$o: $(CHECKDIR_LIBXMPLITE) $(CC) /c $(CFLAGS) $(LIBXMPLITE_CFLAGS) /Fo$@ $< @@ -371,11 +387,11 @@ MAPSTER32_TARGET=$(root)\mapster32$(EXESUFFIX) all: $(EDUKE32_TARGET) $(MAPSTER32_TARGET) -$(EDUKE32_TARGET): $(DUKE3D_OBJS) $(ENGINE_OBJS) $(AUDIOLIB_OBJS) $(MACT_OBJS) $(ENET_OBJS) $(LIBXMPLITE_OBJS) +$(EDUKE32_TARGET): $(DUKE3D_OBJS) $(ENGINE_OBJS) $(AUDIOLIB_OBJS) $(MACT_OBJS) $(ENET_OBJS) $(GLAD_OBJS) $(LIBXMPLITE_OBJS) $(LINK) /OUT:$@ /SUBSYSTEM:WINDOWS $(WINMACHINE) /LIBPATH:$(PLATFORM)\lib$(WINLIB) $(flags_link) /MAP $** $(LIBS) $(MT) -manifest $(DUKE3D_RSRC)\manifest.game.xml -hashupdate -outputresource:$@ -out:$@.manifest -$(MAPSTER32_TARGET): $(DUKE3D_EDITOR_OBJS) $(ENGINE_OBJS) $(ENGINE_EDITOR_OBJS) $(AUDIOLIB_OBJS) +$(MAPSTER32_TARGET): $(DUKE3D_EDITOR_OBJS) $(ENGINE_OBJS) $(ENGINE_EDITOR_OBJS) $(AUDIOLIB_OBJS) $(GLAD_OBJS) $(LINK) /OUT:$@ /SUBSYSTEM:WINDOWS $(WINMACHINE) /LIBPATH:$(PLATFORM)\lib$(WINLIB) $(flags_link) /MAP $** $(LIBS) $(MT) -manifest $(DUKE3D_RSRC)\manifest.build.xml -hashupdate -outputresource:$@ -out:$@.manifest @@ -386,5 +402,5 @@ $(MAPSTER32_TARGET): $(DUKE3D_EDITOR_OBJS) $(ENGINE_OBJS) $(ENGINE_EDITOR_OBJS) clean: -del /Q $(EDUKE32_TARGET) $(MAPSTER32_TARGET) $(DUKE3D_OBJS) $(DUKE3D_EDITOR_OBJS) $(ENGINE_OBJS) $(ENGINE_EDITOR_OBJS) *.pdb $(root)\*.pdb $(root)\*.map $(root)\*.manifest - -del /Q $(ENET_OBJS) $(LIBXMPLITE_OBJS) $(MACT_OBJS) $(AUDIOLIB_OBJS) + -del /Q $(ENET_OBJS) $(LIBXMPLITE_OBJS) $(MACT_OBJS) $(AUDIOLIB_OBJS) $(GLAD_OBJS) veryclean: clean diff --git a/source/build/src/polymost.cpp b/source/build/src/polymost.cpp index 478ee06f3..2757c457c 100644 --- a/source/build/src/polymost.cpp +++ b/source/build/src/polymost.cpp @@ -385,17 +385,21 @@ static GLuint polymost2_compileShader(GLenum shaderType, const char* const sourc NULL); glCompileShader(shaderID); - int compileStatus[1]; - glGetShaderiv(shaderID, GL_COMPILE_STATUS, compileStatus); - OSD_Printf("Compile Status: %u\n", compileStatus[0]); + GLint compileStatus; + glGetShaderiv(shaderID, GL_COMPILE_STATUS, &compileStatus); + OSD_Printf("Compile Status: %u\n", compileStatus); - int logLength[1]; - glGetShaderiv(shaderID, GL_INFO_LOG_LENGTH, logLength); - if (logLength[0] > 0) + if (!compileStatus) { - char infoLog[logLength[0]]; - glGetShaderInfoLog(shaderID, logLength[0], NULL, infoLog); - OSD_Printf("Log:\n%s\n", infoLog); + GLint logLength; + glGetShaderiv(shaderID, GL_INFO_LOG_LENGTH, &logLength); + if (logLength > 0) + { + char *infoLog = (char*) malloc(logLength); + glGetShaderInfoLog(shaderID, logLength, &logLength, infoLog); + OSD_Printf("Log:\n%s\n", infoLog); + free(infoLog); + } } return shaderID;