From e47e510aa539b6958670a69d43d0affcbbe83b83 Mon Sep 17 00:00:00 2001 From: nillerusr Date: Thu, 22 Oct 2020 19:51:33 +0300 Subject: [PATCH] fix togl build --- togl/linuxwin/glmgrbasics.cpp | 6 +++++- togl/togl.vpc | 2 +- vstdlib/vstdlib.vpc | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/togl/linuxwin/glmgrbasics.cpp b/togl/linuxwin/glmgrbasics.cpp index 5a19cccb..adf60714 100644 --- a/togl/linuxwin/glmgrbasics.cpp +++ b/togl/linuxwin/glmgrbasics.cpp @@ -2628,7 +2628,11 @@ bool GLMDetectOGLP( void ) #include #ifndef _WIN32 #include - #include +#ifdef LINUX +#include +#else +#include +#endif #endif // From Technical Q&A QA1361 diff --git a/togl/togl.vpc b/togl/togl.vpc index d1208795..fe423b46 100644 --- a/togl/togl.vpc +++ b/togl/togl.vpc @@ -6,7 +6,7 @@ $Macro SRCDIR ".." [$WIN32] $Macro SRCDIR ".." [!$WIN32] -$Macro OUTBINDIR "$SRCDIR\..\game\bin" +$Macro OUTBINDIR $LIBPUBLIC $Macro OUTBINNAME "togl" $Macro TOGL_SRCDIR "$SRCDIR/togl/linuxwin" $Macro TOGL_INCDIR "$SRCDIR/public/togl/linuxwin" diff --git a/vstdlib/vstdlib.vpc b/vstdlib/vstdlib.vpc index 89c2214f..6de75ca8 100644 --- a/vstdlib/vstdlib.vpc +++ b/vstdlib/vstdlib.vpc @@ -5,7 +5,7 @@ //----------------------------------------------------------------------------- $Macro SRCDIR ".." -$Macro OUTBINDIR "$SRCDIR\..\game\bin" +$Macro OUTBINDIR "$LIBPUBLIC" $include "$SRCDIR\vpc_scripts\source_dll_base.vpc"