diff options
| -rw-r--r-- | StormLib.bat | 4 | ||||
| -rw-r--r-- | StormLib.vcxproj | 35 | ||||
| -rw-r--r-- | src/FileStream.cpp | 7 |
3 files changed, 21 insertions, 25 deletions
diff --git a/StormLib.bat b/StormLib.bat index 5228a26..65e8429 100644 --- a/StormLib.bat +++ b/StormLib.bat @@ -11,11 +11,11 @@ if x%1 == xx64 goto PlatformWin64 goto exit :PlatformWin32 -copy .\bin\Stormlib\%1\%2\*.lib ..\aaa\lib32 +copy .\bin\StormLib\%1\%2\*.lib ..\aaa\lib32 goto exit :PlatformWin64 -copy .\bin\Stormlib\%1\%2\*.lib ..\aaa\lib64 +copy .\bin\StormLib\%1\%2\*.lib ..\aaa\lib64 goto exit :exit diff --git a/StormLib.vcxproj b/StormLib.vcxproj index 8ee27bc..0d70b56 100644 --- a/StormLib.vcxproj +++ b/StormLib.vcxproj @@ -72,7 +72,6 @@ <RootNamespace>StormLib</RootNamespace> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'" Label="Configuration"> <ConfigurationType>StaticLibrary</ConfigurationType> <PlatformToolset>v110</PlatformToolset> @@ -233,7 +232,7 @@ <OutDir>./bin/$(ProjectName)/$(Platform)/$(Configuration)\</OutDir> <IntDir>./bin/$(ProjectName)/$(Platform)/$(Configuration)\</IntDir> <TargetName>$(ProjectName)DAD</TargetName> - </PropertyGroup> + </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugAS|Win32'"> <OutDir>./bin/$(ProjectName)/$(Platform)/$(Configuration)\</OutDir> <IntDir>./bin/$(ProjectName)/$(Platform)/$(Configuration)\</IntDir> @@ -316,7 +315,7 @@ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> </ClCompile> <Lib> - <OutputFile>./bin/$(Project)/$(Platform)/$(Configuration)/$(TargetName).lib</OutputFile> + <OutputFile>./bin/$(ProjectName)/$(Platform)/$(Configuration)/$(TargetName).lib</OutputFile> </Lib> <PostBuildEvent> <Command>StormLib.bat $(Platform) $(Configuration)</Command> @@ -337,7 +336,7 @@ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> </ClCompile> <Lib> - <OutputFile>./bin/$(Project)/$(Platform)/$(Configuration)/$(TargetName).lib</OutputFile> + <OutputFile>./bin/$(ProjectName)/$(Platform)/$(Configuration)/$(TargetName).lib</OutputFile> </Lib> <PostBuildEvent> <Command>StormLib.bat $(Platform) $(Configuration)</Command> @@ -355,7 +354,7 @@ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> </ClCompile> <Lib> - <OutputFile>./bin/$(Project)/$(Platform)/$(Configuration)/$(TargetName).lib</OutputFile> + <OutputFile>./bin/$(ProjectName)/$(Platform)/$(Configuration)/$(TargetName).lib</OutputFile> </Lib> <PostBuildEvent> <Command>StormLib.bat $(Platform) $(Configuration)</Command> @@ -376,7 +375,7 @@ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> </ClCompile> <Lib> - <OutputFile>./bin/$(Project)/$(Platform)/$(Configuration)/$(TargetName).lib</OutputFile> + <OutputFile>./bin/$(ProjectName)/$(Platform)/$(Configuration)/$(TargetName).lib</OutputFile> </Lib> <PostBuildEvent> <Command>StormLib.bat $(Platform) $(Configuration)</Command> @@ -392,7 +391,7 @@ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> </ClCompile> <Lib> - <OutputFile>./bin/$(Project)/$(Platform)/$(Configuration)/$(TargetName).lib</OutputFile> + <OutputFile>./bin/$(ProjectName)/$(Platform)/$(Configuration)/$(TargetName).lib</OutputFile> </Lib> <PostBuildEvent> <Command>StormLib.bat $(Platform) $(Configuration)</Command> @@ -411,7 +410,7 @@ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> </ClCompile> <Lib> - <OutputFile>./bin/$(Project)/$(Platform)/$(Configuration)/$(TargetName).lib</OutputFile> + <OutputFile>./bin/$(ProjectName)/$(Platform)/$(Configuration)/$(TargetName).lib</OutputFile> </Lib> <PostBuildEvent> <Command>StormLib.bat $(Platform) $(Configuration)</Command> @@ -427,7 +426,7 @@ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> </ClCompile> <Lib> - <OutputFile>./bin/$(Project)/$(Platform)/$(Configuration)/$(TargetName).lib</OutputFile> + <OutputFile>./bin/$(ProjectName)/$(Platform)/$(Configuration)/$(TargetName).lib</OutputFile> </Lib> <PostBuildEvent> <Command>StormLib.bat $(Platform) $(Configuration)</Command> @@ -446,7 +445,7 @@ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> </ClCompile> <Lib> - <OutputFile>./bin/$(Project)/$(Platform)/$(Configuration)/$(TargetName).lib</OutputFile> + <OutputFile>./bin/$(ProjectName)/$(Platform)/$(Configuration)/$(TargetName).lib</OutputFile> </Lib> <PostBuildEvent> <Command>StormLib.bat $(Platform) $(Configuration)</Command> @@ -464,7 +463,7 @@ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> </ClCompile> <Lib> - <OutputFile>./bin/$(Project)/$(Platform)/$(Configuration)/$(TargetName).lib</OutputFile> + <OutputFile>./bin/$(ProjectName)/$(Platform)/$(Configuration)/$(TargetName).lib</OutputFile> </Lib> <PostBuildEvent> <Command>StormLib.bat $(Platform) $(Configuration)</Command> @@ -485,7 +484,7 @@ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> </ClCompile> <Lib> - <OutputFile>./bin/$(Project)/$(Platform)/$(Configuration)/$(TargetName).lib</OutputFile> + <OutputFile>./bin/$(ProjectName)/$(Platform)/$(Configuration)/$(TargetName).lib</OutputFile> </Lib> <PostBuildEvent> <Command>StormLib.bat $(Platform) $(Configuration)</Command> @@ -503,7 +502,7 @@ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> </ClCompile> <Lib> - <OutputFile>./bin/$(Project)/$(Platform)/$(Configuration)/$(TargetName).lib</OutputFile> + <OutputFile>./bin/$(ProjectName)/$(Platform)/$(Configuration)/$(TargetName).lib</OutputFile> </Lib> <PostBuildEvent> <Command>StormLib.bat $(Platform) $(Configuration)</Command> @@ -524,7 +523,7 @@ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> </ClCompile> <Lib> - <OutputFile>./bin/$(Project)/$(Platform)/$(Configuration)/$(TargetName).lib</OutputFile> + <OutputFile>./bin/$(ProjectName)/$(Platform)/$(Configuration)/$(TargetName).lib</OutputFile> </Lib> <PostBuildEvent> <Command>StormLib.bat $(Platform) $(Configuration)</Command> @@ -540,7 +539,7 @@ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> </ClCompile> <Lib> - <OutputFile>./bin/$(Project)/$(Platform)/$(Configuration)/$(TargetName).lib</OutputFile> + <OutputFile>./bin/$(ProjectName)/$(Platform)/$(Configuration)/$(TargetName).lib</OutputFile> </Lib> <PostBuildEvent> <Command>StormLib.bat $(Platform) $(Configuration)</Command> @@ -559,7 +558,7 @@ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> </ClCompile> <Lib> - <OutputFile>./bin/$(Project)/$(Platform)/$(Configuration)/$(TargetName).lib</OutputFile> + <OutputFile>./bin/$(ProjectName)/$(Platform)/$(Configuration)/$(TargetName).lib</OutputFile> </Lib> <PostBuildEvent> <Command>StormLib.bat $(Platform) $(Configuration)</Command> @@ -575,7 +574,7 @@ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> </ClCompile> <Lib> - <OutputFile>./bin/$(Project)/$(Platform)/$(Configuration)/$(TargetName).lib</OutputFile> + <OutputFile>./bin/$(ProjectName)/$(Platform)/$(Configuration)/$(TargetName).lib</OutputFile> </Lib> <PostBuildEvent> <Command>StormLib.bat $(Platform) $(Configuration)</Command> @@ -594,7 +593,7 @@ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> </ClCompile> <Lib> - <OutputFile>./bin/$(Project)/$(Platform)/$(Configuration)/$(TargetName).lib</OutputFile> + <OutputFile>./bin/$(ProjectName)/$(Platform)/$(Configuration)/$(TargetName).lib</OutputFile> </Lib> <PostBuildEvent> <Command>StormLib.bat $(Platform) $(Configuration)</Command> diff --git a/src/FileStream.cpp b/src/FileStream.cpp index fdeb9dc..4310924 100644 --- a/src/FileStream.cpp +++ b/src/FileStream.cpp @@ -19,7 +19,8 @@ #include "FileStream.h" #ifdef _MSC_VER -#pragma comment(lib, "wininet.lib") +#pragma comment(lib, "wininet.lib") // Internet functions for HTTP stream +#pragma warning(disable: 4800) // 'BOOL' : forcing value to bool 'true' or 'false' (performance warning) #endif //----------------------------------------------------------------------------- @@ -29,10 +30,6 @@ #define INVALID_HANDLE_VALUE ((HANDLE)-1) #endif -#ifdef _MSC_VER -#pragma warning(disable: 4800) // 'BOOL' : forcing value to bool 'true' or 'false' (performance warning) -#endif - //----------------------------------------------------------------------------- // Local functions - platform-specific functions |