Fix linux|mingw shared|static build

This commit is contained in:
xantares
2014-04-09 10:33:22 +00:00
committed by erwincoumans
parent aa76b88936
commit 477cfc6fe6
12 changed files with 32 additions and 10 deletions

View File

@@ -17,7 +17,9 @@
#ifdef _WIN32
#define NOMINMAX
#ifndef NOMINMAX
#define NOMINMAX
#endif
#include <windows.h>
#define GwenUtil_VSNPrintFSafe( _DstBuf, _DstSize, _MaxCount, _Format, _ArgList ) vsnprintf_s( _DstBuf, _DstSize, _MaxCount, _Format, _ArgList )
@@ -79,4 +81,4 @@ namespace Gwen
}
}
#endif
#endif

View File

@@ -38,4 +38,12 @@ ENDIF()
ADD_LIBRARY(OpenGLWindow ${OpenGLWindow_SRCS} ${OpenGLWindow_HDRS})
if (UNIX AND NOT APPLE)
target_link_libraries(OpenGLWindow X11)
endif ()
if (BUILD_SHARED_LIBS)
target_link_libraries(OpenGLWindow Bullet3Common)
endif()
target_link_libraries(OpenGLWindow ${OPENGL_gl_LIBRARY})