diff options
| -rw-r--r-- | Makefile.linux | 4 | ||||
| -rw-r--r-- | StormLib_vs15.vcxproj | 2 | ||||
| -rw-r--r-- | test/StormTest.cpp | 10 |
3 files changed, 7 insertions, 9 deletions
diff --git a/Makefile.linux b/Makefile.linux index c588d61..ff81e98 100644 --- a/Makefile.linux +++ b/Makefile.linux @@ -265,6 +265,7 @@ COBJS = src/libtomcrypt/src/hashes/sha1.o \ LIB = libStorm.so SLIB = libStorm.a +SLIBA = $(SLIB) all: $(OBJS) $(COBJS) $(LIB) $(SLIB) @@ -272,7 +273,7 @@ $(LIB): $(OBJS) $(COBJS) $(C++) $(ARCH) -shared -o $(LIB) $(OBJS) $(COBJS) $(LFLAGS) $(SLIB): $(OBJS) $(COBJS) - $(AR) rcs $(SLIB) $(OBJS) $(COBJS) + $(AR) rcS $(SLIB) $(OBJS) $(COBJS) clean: rm -f $(OBJS) $(COBJS) $(LIB) @@ -286,6 +287,7 @@ $(COBJS): %.o: %.c $(LIB): $(OBJS) $(COBJS) all: $(LIB) + ranlib -c $(SLIB) install: $(LIB) install $(LIB) /usr/local/lib diff --git a/StormLib_vs15.vcxproj b/StormLib_vs15.vcxproj index 75d3b01..1f3b470 100644 --- a/StormLib_vs15.vcxproj +++ b/StormLib_vs15.vcxproj @@ -70,7 +70,7 @@ <ProjectName>StormLib</ProjectName> <ProjectGuid>{78424708-1F6E-4D4B-920C-FB6D26847055}</ProjectGuid> <RootNamespace>StormLib</RootNamespace> - <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion> + <WindowsTargetPlatformVersion>5.1</WindowsTargetPlatformVersion> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'" Label="Configuration"> diff --git a/test/StormTest.cpp b/test/StormTest.cpp index 2926f49..c6908dc 100644 --- a/test/StormTest.cpp +++ b/test/StormTest.cpp @@ -4287,11 +4287,7 @@ int main(int argc, char * argv[]) // Open an protected map
if(nError == ERROR_SUCCESS)
nError = TestOpenArchive("MPQ_2015_v1_flem1.w3x");
-*/
- // Open another protected map
- if(nError == ERROR_SUCCESS)
- nError = TestOpenArchive("MPQ_2016_v1_ProtectedMap_TableSizeOverflow.w3x");
-/*
+
// Open the multi-file archive with wrong prefix to see how StormLib deals with it
if(nError == ERROR_SUCCESS)
nError = TestOpenArchive_WillFail("flat-file://streaming/model.MPQ.0");
@@ -4307,7 +4303,7 @@ int main(int argc, char * argv[]) // Test on an archive that has been invalidated by extending an old valid MPQ
if(nError == ERROR_SUCCESS)
nError = TestOpenArchive_Corrupt("MPQ_2013_vX_Battle.net.MPQ");
-
+*/
// Open a patched archive
if(nError == ERROR_SUCCESS)
nError = TestOpenArchive_Patched(PatchList_WoW_OldWorld13286, "OldWorld\\World\\Model.blob", 2);
@@ -4347,7 +4343,7 @@ int main(int argc, char * argv[]) // Open a patched archive
if(nError == ERROR_SUCCESS)
nError = TestOpenArchive_Patched(PatchList_HS_6898_enGB, "Hearthstone_Data\\Managed\\Assembly-Csharp.dll", 10);
-
+/*
// Check the opening archive for read-only
if(nError == ERROR_SUCCESS)
nError = TestOpenArchive_ReadOnly("MPQ_1997_v1_Diablo1_DIABDAT.MPQ", true);
|