From 5044a1d6c4557f9fdc40afa9d43b277a7ce425f7 Mon Sep 17 00:00:00 2001 From: malaterre Date: Thu, 27 Oct 2005 19:04:48 +0000 Subject: [PATCH] ENH: Trying to write the worse hack ever... --- src/gdcmmpeg2/src/mpeg2dec/CMakeLists.txt | 12 ++++++------ src/gdcmmpeg2/src/mpeg2dec/mpeg2dec.h | 2 ++ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/gdcmmpeg2/src/mpeg2dec/CMakeLists.txt b/src/gdcmmpeg2/src/mpeg2dec/CMakeLists.txt index e30205e9..5ca3699c 100644 --- a/src/gdcmmpeg2/src/mpeg2dec/CMakeLists.txt +++ b/src/gdcmmpeg2/src/mpeg2dec/CMakeLists.txt @@ -18,11 +18,11 @@ SET(GDCM_MPEG2DEC_SOURCES # verify.c ) -#ADD_LIBRARY(gdcmmpeg2 ${GDCM_MPEG2DEC_SOURCES} mpeg2dec.c) -#IF(UNIX) -# TARGET_LINK_LIBRARIES(gdcmmpeg2 -lm) -#ENDIF(UNIX) +ADD_LIBRARY(gdcmmpeg2 ${GDCM_MPEG2DEC_SOURCES} mpeg2dec.c) +IF(UNIX) + TARGET_LINK_LIBRARIES(gdcmmpeg2 -lm) +ENDIF(UNIX) #ADD_DEFINITIONS(-DGDCM_BUILD_MPEG2DEC) -ADD_EXECUTABLE(mpeg2decode ${GDCM_MPEG2DEC_SOURCES} mpeg2dec.c) -TARGET_LINK_LIBRARIES(mpeg2decode -lm) +#ADD_EXECUTABLE(mpeg2decode ${GDCM_MPEG2DEC_SOURCES} mpeg2dec.c) +#TARGET_LINK_LIBRARIES(mpeg2decode -lm) diff --git a/src/gdcmmpeg2/src/mpeg2dec/mpeg2dec.h b/src/gdcmmpeg2/src/mpeg2dec/mpeg2dec.h index 9613e479..d6f06b94 100644 --- a/src/gdcmmpeg2/src/mpeg2dec/mpeg2dec.h +++ b/src/gdcmmpeg2/src/mpeg2dec/mpeg2dec.h @@ -137,6 +137,7 @@ typedef int ssize_t; #define FILESTAR #include +#ifndef __cplusplus typedef struct { #ifdef FILESTAR @@ -145,6 +146,7 @@ typedef struct int InFd; #endif } istream; +#endif typedef struct { -- 2.48.1