diff options
| -rw-r--r-- | CMakeLists.txt | 1 | ||||
| -rw-r--r-- | addon/doxyapp/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | addon/doxyparse/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | liblodepng/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | liblodepng/lodepng.cpp (renamed from src/lodepng.cpp) | 7 | ||||
| -rw-r--r-- | liblodepng/lodepng.h (renamed from src/lodepng.h) | 8 | ||||
| -rw-r--r-- | libmd5/Makefile.in | 18 | ||||
| -rw-r--r-- | libmd5/libmd5.pro.in | 10 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 3 |
9 files changed, 21 insertions, 31 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 6bf9246..18265b7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -143,6 +143,7 @@ endif() add_subdirectory(libmd5) +add_subdirectory(liblodepng) add_subdirectory(qtools) add_subdirectory(vhdlparser) add_subdirectory(src) diff --git a/addon/doxyapp/CMakeLists.txt b/addon/doxyapp/CMakeLists.txt index 0aaf465..88bbbda 100644 --- a/addon/doxyapp/CMakeLists.txt +++ b/addon/doxyapp/CMakeLists.txt @@ -20,6 +20,7 @@ target_link_libraries(doxyapp _doxygen qtools md5 +lodepng doxycfg vhdlparser ${ICONV_LIBRARIES} diff --git a/addon/doxyparse/CMakeLists.txt b/addon/doxyparse/CMakeLists.txt index 1620c72..993aeda 100644 --- a/addon/doxyparse/CMakeLists.txt +++ b/addon/doxyparse/CMakeLists.txt @@ -20,6 +20,7 @@ target_link_libraries(doxyparse _doxygen qtools md5 +lodepng doxycfg vhdlparser ${ICONV_LIBRARIES} diff --git a/liblodepng/CMakeLists.txt b/liblodepng/CMakeLists.txt new file mode 100644 index 0000000..e62835f --- /dev/null +++ b/liblodepng/CMakeLists.txt @@ -0,0 +1,3 @@ +add_library(lodepng STATIC +lodepng.cpp +) diff --git a/src/lodepng.cpp b/liblodepng/lodepng.cpp index 1906f09..249546a 100644 --- a/src/lodepng.cpp +++ b/liblodepng/lodepng.cpp @@ -29,7 +29,6 @@ You are free to name this file lodepng.cpp or lodepng.c depending on your usage. */ #include "lodepng.h" -#include "portable.h" #define USE_BRUTE_FORCE_ENCODING 1 @@ -2436,7 +2435,11 @@ void LodePNG_Encoder_copy(LodePNG_Encoder* dest, const LodePNG_Encoder* source) unsigned LodePNG_saveFile(const unsigned char* buffer, size_t buffersize, const char* filename) { FILE* file; - file = portable_fopen(filename, "wb" ); +#if defined(_WIN32) && !defined(__CYGWIN__) + file = _fopen(filename,"wb"); +#else + file = fopen(filename,"wb"); +#endif if(!file) return 79; fwrite((char*)buffer , 1 , buffersize, file); fclose(file); diff --git a/src/lodepng.h b/liblodepng/lodepng.h index fb079cc..36d0e68 100644 --- a/src/lodepng.h +++ b/liblodepng/lodepng.h @@ -32,6 +32,10 @@ freely, subject to the following restrictions: #include <stdlib.h> #include <string.h> +#ifdef __cplusplus +extern "C" { +#endif + /* ////////////////////////////////////////////////////////////////////////// */ /* LodeFlate & LodeZlib Setting structs */ /* ////////////////////////////////////////////////////////////////////////// */ @@ -115,5 +119,9 @@ void LodePNG_encode(LodePNG_Encoder* encoder, unsigned char** out, size_t* outsi //unsigned LodePNG_loadFile(unsigned char** out, size_t* outsize, const char* filename); unsigned LodePNG_saveFile(const unsigned char* buffer, size_t buffersize, const char* filename); +#ifdef __cplusplus +} +#endif + #endif diff --git a/libmd5/Makefile.in b/libmd5/Makefile.in deleted file mode 100644 index 08c03b8..0000000 --- a/libmd5/Makefile.in +++ /dev/null @@ -1,18 +0,0 @@ -all: Makefile.libmd5 - $(MAKE) -f Makefile.libmd5 - -clean: Makefile.libmd5 - $(MAKE) -f Makefile.libmd5 clean - -distclean: clean - $(RM) -f Makefile.libmd5 libmd5.pro Makefile - -realclean: distclean - -tmake: - $(ENV) $(PERL) "$(TMAKE)" libmd5.pro >Makefile.libmd5 - -Makefile.libmd5: libmd5.pro - $(ENV) $(PERL) "$(TMAKE)" libmd5.pro >Makefile.libmd5 - -install: diff --git a/libmd5/libmd5.pro.in b/libmd5/libmd5.pro.in deleted file mode 100644 index 5516174..0000000 --- a/libmd5/libmd5.pro.in +++ /dev/null @@ -1,10 +0,0 @@ -TEMPLATE = lib -CONFIG = warn_on staticlib $extraopts -HEADERS = md5.h md5_loc.h -SOURCES = md5.c -win32:INCLUDEPATH += . -win32-g++:TMAKE_CFLAGS += -D__CYGWIN__ -DALL_STATIC -DESTDIR = ../lib -TARGET = md5 -OBJECTS_DIR = ../objects/md5 - diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index cb1fa22..0e3265d 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -3,6 +3,7 @@ include_directories( ${CMAKE_SOURCE_DIR}/qtools ${CMAKE_SOURCE_DIR}/libmd5 + ${CMAKE_SOURCE_DIR}/liblodepng ${CMAKE_SOURCE_DIR}/vhdlparser/ ${CMAKE_SOURCE_DIR}/src ${CLANG_INCLUDEDIR} @@ -217,7 +218,6 @@ add_library(_doxygen STATIC latexdocvisitor.cpp latexgen.cpp layout.cpp - lodepng.cpp mandocvisitor.cpp mangen.cpp sqlite3gen.cpp @@ -282,6 +282,7 @@ target_link_libraries(doxygen doxycfg qtools md5 + lodepng vhdlparser ${SQLITE3_LIBRARIES} ${ICONV_LIBRARIES} |