id/doom3-bfg
0
0
Fork 0
mirror of https://github.com/id-Software/DOOM-3-BFG.git synced 2024-12-03 09:22:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

Moved minizip contrib code to libs/zlib/minizip/

Browse source
This commit is contained in:
Robert Beckebans 2013-01-02 17:09:45 +01:00
parent 3830118767
commit 946768ad9f
11 changed files with 19 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
neo/CMakeLists.txt
View file

@ -123,8 +123,8 @@ file(GLOB AAS_SOURCES aas/*.cpp)
file(GLOB_RECURSE CM_INCLUDES cm/*.h)
file(GLOB_RECURSE CM_SOURCES cm/*.cpp)
file(GLOB FRAMEWORK_INCLUDES framework/*.h framework/minizip/*.h)
file(GLOB FRAMEWORK_SOURCES framework/*.cpp framework/minizip/*.c framework/minizip/*.cpp)
file(GLOB FRAMEWORK_INCLUDES framework/*.h)
file(GLOB FRAMEWORK_SOURCES framework/*.cpp)
file(GLOB FRAMEWORK_ASYNC_INCLUDES framework/async/*.h)
file(GLOB FRAMEWORK_ASYNC_SOURCES framework/async/*.cpp)
@ -303,6 +303,9 @@ file(GLOB PNG_SOURCES libs/png/*.c)
file(GLOB ZLIB_INCLUDES libs/zlib/*.h)
file(GLOB ZLIB_SOURCES libs/zlib/*.c)
file(GLOB MINIZIP_INCLUDES libs/zlib/minizip/*.h)
file(GLOB MINIZIP_SOURCES libs/zlib/minizip/*.c libs/zlib/minizip/*.cpp)
set(GLEW_INCLUDES
libs/glew/include/GL/glew.h)
@ -781,6 +784,9 @@ source_group("libs\\png" FILES ${PNG_SOURCES})
source_group("libs\\zlib" FILES ${ZLIB_INCLUDES})
source_group("libs\\zlib" FILES ${ZLIB_SOURCES})
source_group("libs\\zlib\\minizip" FILES ${MINIZIP_INCLUDES})
source_group("libs\\zlib\\minizip" FILES ${MINIZIP_SOURCES})
source_group("libs\\glew" FILES ${GLEW_INCLUDES})
source_group("libs\\glew" FILES ${GLEW_SOURCES})
@ -915,6 +921,7 @@ set(RBDOOM3_INCLUDES
${JPEG_INCLUDES}
#${PNG_INCLUDES}
${ZLIB_INCLUDES}
${MINIZIP_INCLUDES}
#${GLEW_INCLUDES}
#${FREETYPE_SOURCES}
${SOUND_INCLUDES}
@ -939,6 +946,7 @@ set(RBDOOM3_SOURCES
${JPEG_SOURCES}
#${PNG_SOURCES}
${ZLIB_SOURCES}
${MINIZIP_SOURCES}
#${GLEW_SOURCES}
#${FREETYPE_SOURCES}
${SOUND_SOURCES}
@ -1062,7 +1070,7 @@ if(MSVC)
set(RBDOOM3_PRECOMPILED_SOURCES ${RBDOOM3_SOURCES})
list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES ${TIMIDITY_SOURCES} ${JPEG_SOURCES} ${ZLIB_SOURCES})
list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/framework/minizip/ioapi.c)
list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/libs/zlib/minizip/ioapi.c)
list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/renderer/DXT/DXTDecoder.cpp)
list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/renderer/DXT/DXTEncoder.cpp)
list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/renderer/DXT/DXTEncoder_SSE2.cpp)
@ -1075,7 +1083,7 @@ if(MSVC)
list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/../doomclassic/doom/i_sound_win32.cpp)
foreach( src_file ${RBDOOM3_PRECOMPILED_SOURCES} )
message(STATUS "/Yuprecompiled.h for ${src_file}")
#message(STATUS "/Yuprecompiled.h for ${src_file}")
set_source_files_properties(
${src_file}
PROPERTIES

4
neo/astyle-code.bat
View file

@ -1,4 +1,4 @@
astyle.exe -v --options=astyle-options.ini --exclude="libs" --exclude="framework/minizip" --recursive *.h
astyle.exe -v --options=astyle-options.ini --exclude="libs" --exclude="framework/minizip" --exclude="idlib/math/Simd.cpp" --exclude="d3xp/gamesys/SysCvar.cpp" --exclude="d3xp/gamesys/Callbacks.cpp" --exclude="sys/win32/win_cpu.cpp" --exclude="sys/win32/win_main.cpp" --recursive *.cpp
astyle.exe -v --options=astyle-options.ini --exclude="libs" --recursive *.h
astyle.exe -v --options=astyle-options.ini --exclude="libs" --exclude="idlib/math/Simd.cpp" --exclude="d3xp/gamesys/SysCvar.cpp" --exclude="d3xp/gamesys/Callbacks.cpp" --exclude="sys/win32/win_cpu.cpp" --exclude="sys/win32/win_main.cpp" --recursive *.cpp
pause

4
neo/astyle-code.sh
View file

@ -1,5 +1,5 @@
#!/bin/sh
./astyle.exe -v --options=astyle-options.ini --exclude="libs" --exclude="framework/minizip" --recursive *.h
./astyle.exe -v --options=astyle-options.ini --exclude="libs" --exclude="framework/minizip" --exclude="idlib/math/Simd.cpp" --exclude="d3xp/gamesys/SysCvar.cpp" --exclude="d3xp/gamesys/Callbacks.cpp" --exclude="sys/win32/win_cpu.cpp" --exclude="sys/win32/win_main.cpp" --recursive *.cpp
./astyle.exe -v --options=astyle-options.ini --exclude="libs" --recursive *.h
./astyle.exe -v --options=astyle-options.ini --exclude="libs" --exclude="idlib/math/Simd.cpp" --exclude="d3xp/gamesys/SysCvar.cpp" --exclude="d3xp/gamesys/Callbacks.cpp" --exclude="sys/win32/win_cpu.cpp" --exclude="sys/win32/win_main.cpp" --recursive *.cpp
#pause

2
neo/framework/Unzip.h
View file

@ -37,7 +37,7 @@
#ifndef __UNZIP_H__
#define __UNZIP_H__
#include "minizip/unzip.h"
#include "../libs/zlib/minizip/unzip.h"
/*
* DG: all unzip code has been moved to minizip/

0
neo/framework/minizip/MiniZip64_info.txt → neo/libs/zlib/minizip/MiniZip64_info.txt
View file

0
neo/framework/minizip/ioapi.c → neo/libs/zlib/minizip/ioapi.c
View file

2
neo/framework/minizip/ioapi.h → neo/libs/zlib/minizip/ioapi.h
View file

@ -46,7 +46,7 @@
#include <stdio.h>
#include <stdlib.h>
#include "../../libs/zlib/zlib.h"
#include "../zlib.h"
#if defined(USE_FILE32API)
#define fopen64 fopen

0
neo/framework/minizip/unzip.cpp → neo/libs/zlib/minizip/unzip.cpp
View file

2
neo/framework/minizip/unzip.h → neo/libs/zlib/minizip/unzip.h
View file

@ -51,7 +51,7 @@ extern "C" {
#endif
#ifndef _ZLIB_H
#include "../../libs/zlib/zlib.h"
#include "../zlib.h"
#endif
#include "ioapi.h"

0
neo/framework/minizip/zip.cpp → neo/libs/zlib/minizip/zip.cpp
View file

0
neo/framework/minizip/zip.h → neo/libs/zlib/minizip/zip.h
View file