applied fixes for windows compatibility, needs cleanup

This commit is contained in:
2010-11-28 23:08:52 +01:00
parent 0e77645776
commit 1a0da37a4c
8 changed files with 28 additions and 6 deletions
+1 -1
View File
@@ -17,5 +17,5 @@ SET_TARGET_PROPERTIES ( ${PROJECT_EXECUTABLES} PROPERTIES
SUBDIRS (tests)
ADD_LIBRARY ( coll2d SHARED ${COLL2D_SRCS} )
ADD_LIBRARY ( coll2d STATIC ${COLL2D_SRCS} )
+1 -1
View File
@@ -6,4 +6,4 @@ SET ( SRCS
mathlib.cc
main.cc
)
ADD_LIBRARY ( mathlib SHARED mathlib.cc mathlib.h)
ADD_LIBRARY ( mathlib STATIC mathlib.cc mathlib.h)
@@ -23,7 +23,7 @@ IF( WIN32 )
ADD_DEFINITIONS( -DOGLFT_BUILD )
ENDIF( WIN32 )
ADD_LIBRARY( oglft SHARED ${sources} )
ADD_LIBRARY( oglft STATIC ${sources} )
TARGET_LINK_LIBRARIES(
oglft
${FREETYPE2_LIBRARIES}
@@ -31,6 +31,14 @@
#include <assert.h>
// Evil hack to get the callback typedef correct on MSVC9 (see also in
// http://www.gamedev.net/community/forums/topic.asp?topic_id=293825
#ifdef WIN32
#undef GLUTessCallback
typedef void (__stdcall *TESSCALLBACK)(void);
#define GLUTessCallback TESSCALLBACK
#endif
namespace OGLFT {
// This is the static instance of the FreeType library wrapper ...