Adjusted Visual Studio solution to PackMP3

Also modified bitops.cpp from PackJPG to compile using MSVC again
schnaader · Jan 16, 2016 · cc0ca60 · cc0ca60
1 parent 6162c0a
commit cc0ca60
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 5 deletions.
diff --git a/contrib/packjpg/bitops.cpp b/contrib/packjpg/bitops.cpp
@@ -7,7 +7,10 @@ reading and writing of arrays
 #include <string.h>
 #include <fcntl.h>
 #include "bitops.h"
-
+#ifdef _MSC_VER // Changed by schnaader to enable compilation by MSVC
+#include <io.h>
+#define setmode _setmode
+#endif
 #define BUFFER_SIZE 1024 * 1024
 
 

diff --git a/vs2012/Precomp/Precomp.vcxproj b/vs2012/Precomp/Precomp.vcxproj
@@ -90,6 +90,8 @@
     <ClCompile Include="..\..\contrib\packjpg\aricoder.cpp" />
     <ClCompile Include="..\..\contrib\packjpg\bitops.cpp" />
     <ClCompile Include="..\..\contrib\packjpg\packjpg.cpp" />
+    <ClCompile Include="..\..\contrib\packmp3\huffmp3.cpp" />
+    <ClCompile Include="..\..\contrib\packmp3\packmp3.cpp" />
     <ClCompile Include="..\..\contrib\zlib\adler32.c" />
     <ClCompile Include="..\..\contrib\zlib\crc32.c" />
     <ClCompile Include="..\..\contrib\zlib\deflate.c" />
@@ -109,8 +111,12 @@
     <ClInclude Include="..\..\contrib\packjpg\bitops.h" />
     <ClInclude Include="..\..\contrib\packjpg\dct8x8.h" />
     <ClInclude Include="..\..\contrib\packjpg\htables.h" />
-    <ClInclude Include="..\..\contrib\packjpg\packJPGdll.h" />
     <ClInclude Include="..\..\contrib\packjpg\packJPGlib.h" />
+    <ClInclude Include="..\..\contrib\packmp3\huffmp3.h" />
+    <ClInclude Include="..\..\contrib\packmp3\huffmp3tbl.h" />
+    <ClInclude Include="..\..\contrib\packmp3\packmp3lib.h" />
+    <ClInclude Include="..\..\contrib\packmp3\pmp3bitlen.h" />
+    <ClInclude Include="..\..\contrib\packmp3\pmp3tbl.h" />
     <ClInclude Include="..\..\contrib\zlib\crc32.h" />
     <ClInclude Include="..\..\contrib\zlib\deflate.h" />
     <ClInclude Include="..\..\contrib\zlib\inffast.h" />

diff --git a/vs2012/Precomp/Precomp.vcxproj.filters b/vs2012/Precomp/Precomp.vcxproj.filters
@@ -84,6 +84,12 @@
     <ClCompile Include="..\..\contrib\zlib\zutil.c">
       <Filter>Quelldateien</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\contrib\packmp3\huffmp3.cpp">
+      <Filter>Quelldateien</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\contrib\packmp3\packmp3.cpp">
+      <Filter>Quelldateien</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\contrib\bzip2\bzlib.h">
@@ -110,9 +116,6 @@
     <ClInclude Include="..\..\contrib\packjpg\htables.h">
       <Filter>Headerdateien</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\contrib\packjpg\packJPGdll.h">
-      <Filter>Headerdateien</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\contrib\packjpg\packJPGlib.h">
       <Filter>Headerdateien</Filter>
     </ClInclude>
@@ -146,5 +149,20 @@
     <ClInclude Include="..\..\contrib\zlib\zutil.h">
       <Filter>Headerdateien</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\contrib\packmp3\huffmp3.h">
+      <Filter>Headerdateien</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\contrib\packmp3\huffmp3tbl.h">
+      <Filter>Headerdateien</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\contrib\packmp3\packmp3lib.h">
+      <Filter>Headerdateien</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\contrib\packmp3\pmp3bitlen.h">
+      <Filter>Headerdateien</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\contrib\packmp3\pmp3tbl.h">
+      <Filter>Headerdateien</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>