2011-03-29 04:44:38 +00:00
|
|
|
cmake_minimum_required(VERSION 2.4.4)
|
|
|
|
set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS ON)
|
About a week's worth of changes here. As a heads-up, I wouldn't be
surprised if this doesn't build in Linux right now. The CMakeLists.txt
were checked with MinGW and NMake, but how they fair under Linux is an
unknown to me at this time.
- Converted most sprintf (and all wsprintf) calls to either mysnprintf or
FStrings, depending on the situation.
- Changed the strings in the wbstartstruct to be FStrings.
- Changed myvsnprintf() to output nothing if count is greater than INT_MAX.
This is so that I can use a series of mysnprintf() calls and advance the
pointer for each one. Once the pointer goes beyond the end of the buffer,
the count will go negative, but since it's an unsigned type it will be
seen as excessively huge instead. This should not be a problem, as there's
no reason for ZDoom to be using text buffers larger than 2 GB anywhere.
- Ripped out the disabled bit from FGameConfigFile::MigrateOldConfig().
- Changed CalcMapName() to return an FString instead of a pointer to a static
buffer.
- Changed startmap in d_main.cpp into an FString.
- Changed CheckWarpTransMap() to take an FString& as the first argument.
- Changed d_mapname in g_level.cpp into an FString.
- Changed DoSubstitution() in ct_chat.cpp to place the substitutions in an
FString.
- Fixed: The MAPINFO parser wrote into the string buffer to construct a map
name when given a Hexen map number. This was fine with the old scanner
code, but only a happy coincidence prevents it from crashing with the new
code
- Added the 'B' conversion specifier to StringFormat::VWorker() for printing
binary numbers.
- Added CMake support for building with MinGW, MSYS, and NMake. Linux support
is probably broken until I get around to booting into Linux again. Niceties
provided over the existing Makefiles they're replacing:
* All command-line builds can use the same build system, rather than having
a separate one for MinGW and another for Linux.
* Microsoft's NMake tool is supported as a target.
* Progress meters.
* Parallel makes work from a fresh checkout without needing to be primed
first with a single-threaded make.
* Porting to other architectures should be simplified, whenever that day
comes.
- Replaced the makewad tool with zipdir. This handles the dependency tracking
itself instead of generating an external makefile to do it, since I couldn't
figure out how to generate a makefile with an external tool and include it
with a CMake-generated makefile. Where makewad used a master list of files
to generate the package file, zipdir just zips the entire contents of one or
more directories.
- Added the gdtoa package from netlib's fp library so that ZDoom's printf-style
formatting can be entirely independant of the CRT.
SVN r1082 (trunk)
2008-07-23 04:57:26 +00:00
|
|
|
|
2011-03-29 04:44:38 +00:00
|
|
|
project(zlib C)
|
About a week's worth of changes here. As a heads-up, I wouldn't be
surprised if this doesn't build in Linux right now. The CMakeLists.txt
were checked with MinGW and NMake, but how they fair under Linux is an
unknown to me at this time.
- Converted most sprintf (and all wsprintf) calls to either mysnprintf or
FStrings, depending on the situation.
- Changed the strings in the wbstartstruct to be FStrings.
- Changed myvsnprintf() to output nothing if count is greater than INT_MAX.
This is so that I can use a series of mysnprintf() calls and advance the
pointer for each one. Once the pointer goes beyond the end of the buffer,
the count will go negative, but since it's an unsigned type it will be
seen as excessively huge instead. This should not be a problem, as there's
no reason for ZDoom to be using text buffers larger than 2 GB anywhere.
- Ripped out the disabled bit from FGameConfigFile::MigrateOldConfig().
- Changed CalcMapName() to return an FString instead of a pointer to a static
buffer.
- Changed startmap in d_main.cpp into an FString.
- Changed CheckWarpTransMap() to take an FString& as the first argument.
- Changed d_mapname in g_level.cpp into an FString.
- Changed DoSubstitution() in ct_chat.cpp to place the substitutions in an
FString.
- Fixed: The MAPINFO parser wrote into the string buffer to construct a map
name when given a Hexen map number. This was fine with the old scanner
code, but only a happy coincidence prevents it from crashing with the new
code
- Added the 'B' conversion specifier to StringFormat::VWorker() for printing
binary numbers.
- Added CMake support for building with MinGW, MSYS, and NMake. Linux support
is probably broken until I get around to booting into Linux again. Niceties
provided over the existing Makefiles they're replacing:
* All command-line builds can use the same build system, rather than having
a separate one for MinGW and another for Linux.
* Microsoft's NMake tool is supported as a target.
* Progress meters.
* Parallel makes work from a fresh checkout without needing to be primed
first with a single-threaded make.
* Porting to other architectures should be simplified, whenever that day
comes.
- Replaced the makewad tool with zipdir. This handles the dependency tracking
itself instead of generating an external makefile to do it, since I couldn't
figure out how to generate a makefile with an external tool and include it
with a CMake-generated makefile. Where makewad used a master list of files
to generate the package file, zipdir just zips the entire contents of one or
more directories.
- Added the gdtoa package from netlib's fp library so that ZDoom's printf-style
formatting can be entirely independant of the CRT.
SVN r1082 (trunk)
2008-07-23 04:57:26 +00:00
|
|
|
|
2011-03-29 04:44:38 +00:00
|
|
|
if(NOT DEFINED BUILD_SHARED_LIBS)
|
|
|
|
option(BUILD_SHARED_LIBS "Build a shared library form of zlib" OFF)
|
|
|
|
endif()
|
|
|
|
|
|
|
|
set(ZLIBNAME z)
|
|
|
|
|
|
|
|
include(CheckTypeSize)
|
|
|
|
include(CheckFunctionExists)
|
|
|
|
include(CheckIncludeFile)
|
|
|
|
include(CheckCSourceCompiles)
|
|
|
|
enable_testing()
|
|
|
|
|
|
|
|
check_include_file(sys/types.h HAVE_SYS_TYPES_H)
|
|
|
|
check_include_file(stdint.h HAVE_STDINT_H)
|
|
|
|
check_include_file(stddef.h HAVE_STDDEF_H)
|
|
|
|
|
|
|
|
#
|
|
|
|
# Check to see if we have large file support
|
|
|
|
#
|
|
|
|
set(CMAKE_REQUIRED_DEFINITIONS -D_LARGEFILE64_SOURCE=1)
|
|
|
|
# We add these other definitions here because CheckTypeSize.cmake
|
|
|
|
# in CMake 2.4.x does not automatically do so and we want
|
|
|
|
# compatibility with CMake 2.4.x.
|
|
|
|
if(HAVE_SYS_TYPES_H)
|
|
|
|
list(APPEND CMAKE_REQUIRED_DEFINITIONS -DHAVE_SYS_TYPES_H)
|
|
|
|
endif()
|
|
|
|
if(HAVE_STDINT_H)
|
|
|
|
list(APPEND CMAKE_REQUIRED_DEFINITIONS -DHAVE_STDINT_H)
|
|
|
|
endif()
|
|
|
|
if(HAVE_STDDEF_H)
|
|
|
|
list(APPEND CMAKE_REQUIRED_DEFINITIONS -DHAVE_STDDEF_H)
|
|
|
|
endif()
|
|
|
|
check_type_size(off64_t OFF64_T)
|
|
|
|
if(HAVE_OFF64_T)
|
|
|
|
add_definitions(-D_LARGEFILE64_SOURCE=1)
|
|
|
|
endif()
|
|
|
|
set(CMAKE_REQUIRED_DEFINITIONS) # clear variable
|
|
|
|
|
|
|
|
#
|
|
|
|
# Check for fseeko
|
|
|
|
#
|
|
|
|
check_function_exists(fseeko HAVE_FSEEKO)
|
|
|
|
if(NOT HAVE_FSEEKO)
|
|
|
|
add_definitions(-DNO_FSEEKO)
|
|
|
|
endif()
|
|
|
|
|
|
|
|
#
|
|
|
|
# Check for unistd.h
|
|
|
|
#
|
|
|
|
check_include_file(unistd.h Z_HAVE_UNISTD_H)
|
|
|
|
|
|
|
|
if(MSVC)
|
|
|
|
set(CMAKE_DEBUG_POSTFIX "d")
|
|
|
|
add_definitions(-D_CRT_SECURE_NO_DEPRECATE)
|
|
|
|
add_definitions(-D_CRT_NONSTDC_NO_DEPRECATE)
|
|
|
|
endif()
|
|
|
|
|
|
|
|
#if(NOT CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_CURRENT_BINARY_DIR)
|
|
|
|
# # If we're doing an out of source build and the user has a zconf.h
|
|
|
|
# # in their source tree...
|
|
|
|
# if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/zconf.h)
|
|
|
|
# message(FATAL_ERROR
|
|
|
|
# "You must remove ${CMAKE_CURRENT_SOURCE_DIR}/zconf.h "
|
|
|
|
# "from the source tree. This file is included with zlib "
|
|
|
|
# "but CMake generates this file for you automatically "
|
|
|
|
# "in the build directory.")
|
|
|
|
# endif()
|
|
|
|
#endif()
|
|
|
|
#
|
|
|
|
#configure_file(${CMAKE_CURRENT_SOURCE_DIR}/zconf.h.cmakein
|
|
|
|
# ${CMAKE_CURRENT_BINARY_DIR}/zconf.h @ONLY)
|
|
|
|
#include_directories(${CMAKE_CURRENT_BINARY_DIR})
|
|
|
|
|
|
|
|
|
|
|
|
#============================================================================
|
|
|
|
# zlib
|
|
|
|
#============================================================================
|
|
|
|
|
|
|
|
set(ZLIB_PUBLIC_HDRS
|
|
|
|
${CMAKE_CURRENT_BINARY_DIR}/zconf.h
|
|
|
|
zlib.h
|
|
|
|
)
|
|
|
|
set(ZLIB_PRIVATE_HDRS
|
|
|
|
crc32.h
|
|
|
|
deflate.h
|
|
|
|
# gzguts.h
|
|
|
|
inffast.h
|
|
|
|
inffixed.h
|
|
|
|
inflate.h
|
|
|
|
inftrees.h
|
|
|
|
trees.h
|
|
|
|
zutil.h
|
|
|
|
)
|
|
|
|
set(ZLIB_SRCS
|
About a week's worth of changes here. As a heads-up, I wouldn't be
surprised if this doesn't build in Linux right now. The CMakeLists.txt
were checked with MinGW and NMake, but how they fair under Linux is an
unknown to me at this time.
- Converted most sprintf (and all wsprintf) calls to either mysnprintf or
FStrings, depending on the situation.
- Changed the strings in the wbstartstruct to be FStrings.
- Changed myvsnprintf() to output nothing if count is greater than INT_MAX.
This is so that I can use a series of mysnprintf() calls and advance the
pointer for each one. Once the pointer goes beyond the end of the buffer,
the count will go negative, but since it's an unsigned type it will be
seen as excessively huge instead. This should not be a problem, as there's
no reason for ZDoom to be using text buffers larger than 2 GB anywhere.
- Ripped out the disabled bit from FGameConfigFile::MigrateOldConfig().
- Changed CalcMapName() to return an FString instead of a pointer to a static
buffer.
- Changed startmap in d_main.cpp into an FString.
- Changed CheckWarpTransMap() to take an FString& as the first argument.
- Changed d_mapname in g_level.cpp into an FString.
- Changed DoSubstitution() in ct_chat.cpp to place the substitutions in an
FString.
- Fixed: The MAPINFO parser wrote into the string buffer to construct a map
name when given a Hexen map number. This was fine with the old scanner
code, but only a happy coincidence prevents it from crashing with the new
code
- Added the 'B' conversion specifier to StringFormat::VWorker() for printing
binary numbers.
- Added CMake support for building with MinGW, MSYS, and NMake. Linux support
is probably broken until I get around to booting into Linux again. Niceties
provided over the existing Makefiles they're replacing:
* All command-line builds can use the same build system, rather than having
a separate one for MinGW and another for Linux.
* Microsoft's NMake tool is supported as a target.
* Progress meters.
* Parallel makes work from a fresh checkout without needing to be primed
first with a single-threaded make.
* Porting to other architectures should be simplified, whenever that day
comes.
- Replaced the makewad tool with zipdir. This handles the dependency tracking
itself instead of generating an external makefile to do it, since I couldn't
figure out how to generate a makefile with an external tool and include it
with a CMake-generated makefile. Where makewad used a master list of files
to generate the package file, zipdir just zips the entire contents of one or
more directories.
- Added the gdtoa package from netlib's fp library so that ZDoom's printf-style
formatting can be entirely independant of the CRT.
SVN r1082 (trunk)
2008-07-23 04:57:26 +00:00
|
|
|
adler32.c
|
|
|
|
compress.c
|
|
|
|
crc32.c
|
|
|
|
deflate.c
|
2011-03-29 04:44:38 +00:00
|
|
|
# gzclose.c
|
|
|
|
# gzlib.c
|
|
|
|
# gzread.c
|
|
|
|
# gzwrite.c
|
About a week's worth of changes here. As a heads-up, I wouldn't be
surprised if this doesn't build in Linux right now. The CMakeLists.txt
were checked with MinGW and NMake, but how they fair under Linux is an
unknown to me at this time.
- Converted most sprintf (and all wsprintf) calls to either mysnprintf or
FStrings, depending on the situation.
- Changed the strings in the wbstartstruct to be FStrings.
- Changed myvsnprintf() to output nothing if count is greater than INT_MAX.
This is so that I can use a series of mysnprintf() calls and advance the
pointer for each one. Once the pointer goes beyond the end of the buffer,
the count will go negative, but since it's an unsigned type it will be
seen as excessively huge instead. This should not be a problem, as there's
no reason for ZDoom to be using text buffers larger than 2 GB anywhere.
- Ripped out the disabled bit from FGameConfigFile::MigrateOldConfig().
- Changed CalcMapName() to return an FString instead of a pointer to a static
buffer.
- Changed startmap in d_main.cpp into an FString.
- Changed CheckWarpTransMap() to take an FString& as the first argument.
- Changed d_mapname in g_level.cpp into an FString.
- Changed DoSubstitution() in ct_chat.cpp to place the substitutions in an
FString.
- Fixed: The MAPINFO parser wrote into the string buffer to construct a map
name when given a Hexen map number. This was fine with the old scanner
code, but only a happy coincidence prevents it from crashing with the new
code
- Added the 'B' conversion specifier to StringFormat::VWorker() for printing
binary numbers.
- Added CMake support for building with MinGW, MSYS, and NMake. Linux support
is probably broken until I get around to booting into Linux again. Niceties
provided over the existing Makefiles they're replacing:
* All command-line builds can use the same build system, rather than having
a separate one for MinGW and another for Linux.
* Microsoft's NMake tool is supported as a target.
* Progress meters.
* Parallel makes work from a fresh checkout without needing to be primed
first with a single-threaded make.
* Porting to other architectures should be simplified, whenever that day
comes.
- Replaced the makewad tool with zipdir. This handles the dependency tracking
itself instead of generating an external makefile to do it, since I couldn't
figure out how to generate a makefile with an external tool and include it
with a CMake-generated makefile. Where makewad used a master list of files
to generate the package file, zipdir just zips the entire contents of one or
more directories.
- Added the gdtoa package from netlib's fp library so that ZDoom's printf-style
formatting can be entirely independant of the CRT.
SVN r1082 (trunk)
2008-07-23 04:57:26 +00:00
|
|
|
inflate.c
|
|
|
|
infback.c
|
|
|
|
inftrees.c
|
2011-03-29 04:44:38 +00:00
|
|
|
inffast.c
|
|
|
|
trees.c
|
|
|
|
uncompr.c
|
|
|
|
zutil.c
|
|
|
|
win32/zlib1.rc
|
|
|
|
)
|
|
|
|
|
|
|
|
# parse the full version number from zlib.h and include in ZLIB_FULL_VERSION
|
|
|
|
file(READ ${CMAKE_CURRENT_SOURCE_DIR}/zlib.h _zlib_h_contents)
|
|
|
|
string(REGEX REPLACE ".*#define[ \t]+ZLIB_VERSION[ \t]+\"([0-9A-Za-z.]+)\".*"
|
|
|
|
"\\1" ZLIB_FULL_VERSION ${_zlib_h_contents})
|
|
|
|
|
|
|
|
if(MINGW)
|
|
|
|
# This gets us DLL resource information when compiling on MinGW.
|
|
|
|
add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj
|
|
|
|
COMMAND windres.exe
|
|
|
|
-D GCC_WINDRES
|
|
|
|
-I ${CMAKE_CURRENT_SOURCE_DIR}
|
|
|
|
-I ${CMAKE_CURRENT_BINARY_DIR}
|
|
|
|
-o ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj
|
|
|
|
-i ${CMAKE_CURRENT_SOURCE_DIR}/win32/zlib1.rc)
|
|
|
|
set(ZLIB_SRCS ${ZLIB_SRCS} ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj)
|
|
|
|
endif(MINGW)
|
|
|
|
|
|
|
|
add_library(${ZLIBNAME} ${ZLIB_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
|
|
|
|
set_target_properties(${ZLIBNAME} PROPERTIES DEFINE_SYMBOL ZLIB_DLL)
|
|
|
|
|
|
|
|
set_target_properties(${ZLIBNAME} PROPERTIES SOVERSION 1)
|
|
|
|
|
|
|
|
if(NOT CYGWIN)
|
|
|
|
# This property causes shared libraries on Linux to have the full version
|
|
|
|
# encoded into their final filename. We disable this on Cygwin because
|
|
|
|
# it causes cygz-${ZLIB_FULL_VERSION}.dll to be created when cygz.dll
|
|
|
|
# seems to be the default.
|
|
|
|
#
|
|
|
|
# This has no effect with MSVC, on that platform the version info for
|
|
|
|
# the DLL comes from the resource file win32/zlib1.rc
|
|
|
|
set_target_properties(${ZLIBNAME} PROPERTIES VERSION ${ZLIB_FULL_VERSION})
|
|
|
|
endif()
|
|
|
|
|
|
|
|
if(BUILD_SHARED_LIBS AND WIN32)
|
|
|
|
# Creates zlib1.dll when building shared library version
|
|
|
|
set_target_properties(${ZLIBNAME} PROPERTIES SUFFIX "1.dll")
|
|
|
|
else()
|
|
|
|
# On unix-like platforms the library is almost always called libz
|
|
|
|
set_target_properties(${ZLIBNAME} PROPERTIES OUTPUT_NAME z)
|
|
|
|
endif()
|
|
|
|
|
|
|
|
if(NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL )
|
|
|
|
install(TARGETS ${ZLIBNAME}
|
|
|
|
RUNTIME DESTINATION bin
|
|
|
|
ARCHIVE DESTINATION lib
|
|
|
|
LIBRARY DESTINATION lib )
|
|
|
|
endif()
|
|
|
|
if(NOT SKIP_INSTALL_HEADERS AND NOT SKIP_INSTALL_ALL )
|
|
|
|
install(FILES ${ZLIB_PUBLIC_HDRS} DESTINATION include)
|
|
|
|
endif()
|
|
|
|
if(NOT SKIP_INSTALL_FILES AND NOT SKIP_INSTALL_ALL )
|
|
|
|
install(FILES zlib.3 DESTINATION share/man/man3)
|
|
|
|
endif()
|
|
|
|
|
|
|
|
#============================================================================
|
|
|
|
# Example binaries
|
|
|
|
#============================================================================
|
|
|
|
|
|
|
|
#add_executable(example example.c)
|
|
|
|
#target_link_libraries(example ${ZLIBNAME})
|
|
|
|
#add_test(example example)
|
|
|
|
|
|
|
|
#add_executable(minigzip minigzip.c)
|
|
|
|
#target_link_libraries(minigzip ${ZLIBNAME})
|
|
|
|
|
|
|
|
#if(HAVE_OFF64_T)
|
|
|
|
# add_executable(example64 example.c)
|
|
|
|
# target_link_libraries(example64 ${ZLIBNAME})
|
|
|
|
# set_target_properties(example64 PROPERTIES COMPILE_FLAGS "-D_FILE_OFFSET_BITS=64")
|
|
|
|
# add_test(example64 example64)
|
|
|
|
#
|
|
|
|
# add_executable(minigzip64 minigzip.c)
|
|
|
|
# target_link_libraries(minigzip64 ${ZLIBNAME})
|
|
|
|
# set_target_properties(minigzip64 PROPERTIES COMPILE_FLAGS "-D_FILE_OFFSET_BITS=64")
|
|
|
|
#endif()
|