r925 - trunk

[DONOTREPLY at icculus.org]

Author: icculus
Date: 2008-01-23 00:00:07 -0500 (Wed, 23 Jan 2008)
New Revision: 925

Modified:
   trunk/CHANGELOG.txt
   trunk/CMakeLists.txt
Log:
Updated for lzma changes.


Modified: trunk/CHANGELOG.txt
===================================================================
--- trunk/CHANGELOG.txt	2008-01-23 04:57:47 UTC (rev 924)
+++ trunk/CHANGELOG.txt	2008-01-23 05:00:07 UTC (rev 925)
@@ -2,6 +2,7 @@
  * CHANGELOG.
  */
 
+01222008 - Upgraded lzma sdk, lzma.c improvements (thanks, Dennis!).
 01212008 - Fixed HTTP header in physfshttpd.c. Fixed utf-8 to UCS-2 allocation
            size in Windows code.
 12112007 - Fixed incorrect directory test in Windows code (thanks, Buginator!).

Modified: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt	2008-01-23 04:57:47 UTC (rev 924)
+++ trunk/CMakeLists.txt	2008-01-23 05:00:07 UTC (rev 925)
@@ -86,16 +86,17 @@
 )
 
 SET(LZMA_SRCS
-    lzma/7zBuffer.c
-    lzma/7zCrc.c
-    lzma/7zDecode.c
-    lzma/7zExtract.c
-    lzma/7zHeader.c
-    lzma/7zIn.c
-    lzma/7zItem.c
-    lzma/7zMethodID.c
-    lzma/LzmaDecode.c
-    lzma/LzmaStateDecode.c
+    lzma/C/7zCrc.c
+    lzma/C/Archive/7z/7zBuffer.c
+    lzma/C/Archive/7z/7zDecode.c
+    lzma/C/Archive/7z/7zExtract.c
+    lzma/C/Archive/7z/7zHeader.c
+    lzma/C/Archive/7z/7zIn.c
+    lzma/C/Archive/7z/7zItem.c
+    lzma/C/Archive/7z/7zMethodID.c
+    lzma/C/Compress/Branch/BranchX86.c
+    lzma/C/Compress/Branch/BranchX86_2.c
+    lzma/C/Compress/Lzma/LzmaDecode.c
 )
 
 IF(BEOS)
@@ -210,11 +211,6 @@
     ADD_DEFINITIONS(-DPHYSFS_SUPPORTS_7Z=1)
     # !!! FIXME: rename to 7z.c?
     SET(PHYSFS_SRCS ${PHYSFS_SRCS} ${LZMA_SRCS})
-    INCLUDE_DIRECTORIES(lzma)
-    ADD_DEFINITIONS(-D_LZMA_IN_CB=1)
-    ADD_DEFINITIONS(-D_LZMA_PROB32=1)
-    ADD_DEFINITIONS(-D_LZMA_SYSTEM_SIZE_T=1)
-    ADD_DEFINITIONS(-D_SZ_ONE_DIRECTORY=1)
 ENDIF(PHYSFS_ARCHIVE_7Z)
 
 OPTION(PHYSFS_ARCHIVE_GRP "Enable Build Engine GRP support" TRUE)