A few changes to the Magic2 and ngenex projects to fix some compilation errors that cropped up

4 files changed, 9 insertions, 9 deletions

diff --git a/Magic2/Magic.vcxproj b/Magic2/Magic.vcxproj
index 1e1337f..2eb9259 100644
--- a/Magic2/Magic.vcxproj
+++ b/Magic2/Magic.vcxproj
@@ -151,7 +151,7 @@
       <WarningLevel>Level3</WarningLevel>

       <MinimalRebuild>true</MinimalRebuild>

       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

-      <AdditionalIncludeDirectories>../Opcode/OpcodeLib;../libpng;../Magic2;../FoundationEx;../nGenEx;../zlib;../parser;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>../oggvorbis/include;../Opcode/OpcodeLib;../libpng;../Magic2;../FoundationEx;../nGenEx;../zlib;../parser;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;FOUNDATION_USE_MFC;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <AssemblerListingLocation>.\Debug\</AssemblerListingLocation>

       <BrowseInformation>true</BrowseInformation>

@@ -236,7 +236,7 @@
       <Optimization>MaxSpeed</Optimization>

       <SuppressStartupBanner>true</SuppressStartupBanner>

       <WarningLevel>Level3</WarningLevel>

-      <AdditionalIncludeDirectories>../pnglib;../Opcode/OpcodeLib;../libpng;../Magic2;../FoundationEx;../nGenEx;../zlib;../parser;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>../oggvorbis/include;../pnglib;../Opcode/OpcodeLib;../libpng;../Magic2;../FoundationEx;../nGenEx;../zlib;../parser;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;FOUNDATION_USE_MFC;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <AssemblerListingLocation>.\Release\</AssemblerListingLocation>

       <PrecompiledHeaderOutputFile>.\Release\Magic.pch</PrecompiledHeaderOutputFile>

@@ -261,9 +261,9 @@
     <Link>

       <SuppressStartupBanner>true</SuppressStartupBanner>

       <SubSystem>Windows</SubSystem>

-      <IgnoreSpecificDefaultLibraries>LIBC;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>

+      <IgnoreSpecificDefaultLibraries>LIBCMT;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>

       <OutputFile>.\Release\Magic.exe</OutputFile>

-      <AdditionalDependencies>..\Opcode\Release\Opcode.lib;..\ngenex\release\ngenex.lib;..\zlib\release\zlib.lib;..\libpng\release\libpng.lib;wsock32.lib;..\DirectX\lib\dinput.lib;dsound.lib;d3d9.lib;d3dx9.lib;dxguid.lib;winmm.lib;version.lib;ogg_static.lib;vorbis_static.lib;vorbisfile_static.lib;vfw32.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <AdditionalDependencies>..\Opcode\Release\Opcode.lib;..\zlib\release\zlib.lib;..\libpng\release\libpng.lib;wsock32.lib;..\DirectX\lib\dinput.lib;dsound.lib;d3d9.lib;d3dx9.lib;dxguid.lib;winmm.lib;version.lib;ogg_static.lib;vorbis_static.lib;vorbisfile_static.lib;vfw32.lib;%(AdditionalDependencies)</AdditionalDependencies>

       <AdditionalLibraryDirectories>$(DXSDK_DIR)\lib\x86\;..\oggvorbis\lib;</AdditionalLibraryDirectories>

       <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>

     </Link>

diff --git a/nGenEx/Sound.cpp b/nGenEx/Sound.cpp
index 8de0350..c4936fb 100644
--- a/nGenEx/Sound.cpp
+++ b/nGenEx/Sound.cpp
@@ -17,8 +17,8 @@
 #include "SoundCard.h"

 #include "Wave.h"

 

-#include <vorbis/codec.h>

-#include <vorbis/vorbisfile.h>

+#include "vorbis/codec.h"

+#include "vorbis/vorbisfile.h"

 

 // +--------------------------------------------------------------------+

 

diff --git a/nGenEx/SoundD3D.h b/nGenEx/SoundD3D.h
index d31a2d9..466bb54 100644
--- a/nGenEx/SoundD3D.h
+++ b/nGenEx/SoundD3D.h
@@ -22,7 +22,7 @@
 #include "ThreadSync.h"

 #include <stdio.h>

 #include <dsound.h>

-#include <vorbis/vorbisfile.h>

+#include "vorbis/vorbisfile.h"

 

 // +--------------------------------------------------------------------+

 

diff --git a/nGenEx/nGenEx.vcxproj b/nGenEx/nGenEx.vcxproj
index ddb89e3..c655fa6 100644
--- a/nGenEx/nGenEx.vcxproj
+++ b/nGenEx/nGenEx.vcxproj
@@ -170,7 +170,7 @@
       <WarningLevel>Level3</WarningLevel>

       <MinimalRebuild>true</MinimalRebuild>

       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

-      <AdditionalIncludeDirectories>..\parser;..\FoundationEx;..\zlib;..\LibPng;..\Opcode\OpcodeLib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\oggvorbis\include;..\parser;..\FoundationEx;..\zlib;..\LibPng;..\Opcode\OpcodeLib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <AssemblerListingLocation>.\Debug\</AssemblerListingLocation>

       <BrowseInformation>true</BrowseInformation>

@@ -232,7 +232,7 @@
       <Optimization>MaxSpeed</Optimization>

       <SuppressStartupBanner>true</SuppressStartupBanner>

       <WarningLevel>Level3</WarningLevel>

-      <AdditionalIncludeDirectories>..\parser;..\FoundationEx;..\zlib;..\LibPng;..\Opcode\OpcodeLib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\oggvorbis\include;..\parser;..\FoundationEx;..\zlib;..\LibPng;..\Opcode\OpcodeLib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <AssemblerListingLocation>.\Release\</AssemblerListingLocation>

       <BrowseInformation>true</BrowseInformation>