zdoom/gzdoom-last-svn
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-last-svn.git synced 2025-06-01 17:52:05 +00:00
Code Issues Projects Releases Packages Wiki Activity

- some missed updates from ZDoom in a few library directories.

Browse source 
git-svn-id: http://mancubus.net/svn/hosted/gzdoom/trunk@851 b0f79afe-0144-0410-b225-9a4edf0717df
This commit is contained in:
Christoph Oelckers 2010-07-24 09:59:17 +00:00
parent 0a35f861ce
commit 2f6ce60d85
7 changed files with 30 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
bzip2/CMakeLists.txt
View file

@ -5,7 +5,7 @@ if( CMAKE_COMPILER_IS_GNUC )
endif( CMAKE_COMPILER_IS_GNUC ) endif( CMAKE_COMPILER_IS_GNUC )
add_definitions( -DBZ_NO_STDIO ) add_definitions( -DBZ_NO_STDIO )
add_library( bzip2 add_library( bz2
blocksort.c blocksort.c
bzlib.c bzlib.c
compress.c compress.c
@ -13,4 +13,4 @@ add_library( bzip2
decompress.c decompress.c
huffman.c huffman.c
randtable.c ) randtable.c )
target_link_libraries( bzip2 ) target_link_libraries( bz2 )

2
dumb/include/internal/it.h
View file

@ -666,8 +666,8 @@ struct DUMB_IT_SIGRENDERER
unsigned char globalvolume; unsigned char globalvolume;
signed char globalvolslide; signed char globalvolslide;
unsigned char tempo;
signed char temposlide; signed char temposlide;
unsigned short tempo;
IT_CHANNEL channel[DUMB_IT_N_CHANNELS]; IT_CHANNEL channel[DUMB_IT_N_CHANNELS];

4
dumb/vc6/dumb_static/dumb_static.vcproj
View file

@ -1970,6 +1970,10 @@
</File> </File>
</Filter> </Filter>
</Filter> </Filter>
<File
RelativePath="..\..\CMakeLists.txt"
>
</File>
</Files> </Files>
<Globals> <Globals>
</Globals> </Globals>

4
game-music-emu/CMakeLists.txt
View file

@ -2,7 +2,9 @@ cmake_minimum_required( VERSION 2.4 )
include( CheckCXXCompilerFlag ) include( CheckCXXCompilerFlag )
# I don't plan on debugging this, so make it a release build. # I don't plan on debugging this, so make it a release build.
set( CMAKE_BUILD_TYPE "RelWithDebInfo" ) if( NOT CMAKE_BUILD_TYPE MATCHES "Release" )
set( CMAKE_BUILD_TYPE "RelWithDebInfo" )
endif( NOT CMAKE_BUILD_TYPE MATCHES "Release" )
if( CMAKE_COMPILER_IS_GNUCXX ) if( CMAKE_COMPILER_IS_GNUCXX )
set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall" ) set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall" )

2
lzma/C/CpuArch.h
View file

@ -47,6 +47,8 @@ about these properties of platform.
#if defined(LITTLE_ENDIAN_UNALIGN) && defined(_WIN64) && (_MSC_VER >= 1300) #if defined(LITTLE_ENDIAN_UNALIGN) && defined(_WIN64) && (_MSC_VER >= 1300)
unsigned long _byteswap_ulong(unsigned long);
unsigned __int64 _byteswap_uint64(unsigned __int64);
#pragma intrinsic(_byteswap_ulong) #pragma intrinsic(_byteswap_ulong)
#pragma intrinsic(_byteswap_uint64) #pragma intrinsic(_byteswap_uint64)
#define GetBe32(p) _byteswap_ulong(*(const UInt32 *)(const Byte *)(p)) #define GetBe32(p) _byteswap_ulong(*(const UInt32 *)(const Byte *)(p))

4
lzma/C/Types.h
View file

@ -34,6 +34,10 @@ typedef int SRes;
#define RINOK(x) { int __result__ = (x); if (__result__ != 0) return __result__; } #define RINOK(x) { int __result__ = (x); if (__result__ != 0) return __result__; }
#endif #endif
#if defined(__APPLE__) && !__LP64__
#define _LZMA_UINT32_IS_ULONG
#endif
#ifndef ZCONF_H #ifndef ZCONF_H
typedef unsigned char Byte; typedef unsigned char Byte;
#endif #endif

22
tools/updaterevision/updaterevision.c
View file

@ -30,15 +30,21 @@ int main(int argc, char **argv)
// Use svnversion to get the revision number. If that fails, pretend it's // Use svnversion to get the revision number. If that fails, pretend it's
// revision 0. Note that this requires you have the command-line svn tools installed. // revision 0. Note that this requires you have the command-line svn tools installed.
sprintf (run, "svnversion -cn %s", argv[1]); sprintf (run, "svnversion -cn %s", argv[1]);
if ((name = tempnam(NULL, "svnout")) != NULL && if ((name = tempnam(NULL, "svnout")) != NULL)
(stream = freopen(name, "w+b", stdout)) != NULL &&
system(run) == 0 &&
errno == 0 &&
fseek(stream, 0, SEEK_SET) == 0 &&
fgets(currev, sizeof currev, stream) == currev &&
(isdigit(currev[0]) || (currev[0] == '-' && currev[1] == '1')))
{ {
gotrev = 1; #ifdef __APPLE__
// tempnam will return errno of 2 even though it is successful for our purposes.
errno = 0;
#endif
if((stream = freopen(name, "w+b", stdout)) != NULL &&
system(run) == 0 &&
errno == 0 &&
fseek(stream, 0, SEEK_SET) == 0 &&
fgets(currev, sizeof currev, stream) == currev &&
(isdigit(currev[0]) || (currev[0] == '-' && currev[1] == '1')))
{
gotrev = 1;
}
} }
if (stream != NULL) if (stream != NULL)
{ {