diff --git a/docs/rh-log.txt b/docs/rh-log.txt
index 6a035b55b4..a9c6ffaa6f 100644
--- a/docs/rh-log.txt
+++ b/docs/rh-log.txt
@@ -1,3 +1,7 @@
+March 9, 2008 (Changes by Graf Zahl)
+- fixed: The release build still linked to the old FMOD version.
+- fixed: SPCSong only works for Win32 so its definition must be excluded for Linux.
+
March 8, 2008
- Fixed: If you wanted to make cleandep with MinGW, you had to specifically
specify Makefile.mingw as the makefile to use.
@@ -65,7 +69,7 @@ March 3, 2008
March 1, 2008 (Changes by Graf Zahl)
- fixed: A_CountdownArg used 0 based indices although all uses of it assumed
- 1-based.
+ it is 1-based.
- added MF5_DONTRIP flag.
- added CheckActorFloorTexture, CheckActorCeilingTexture and
GetActorLightLevel ACS functions.
diff --git a/src/sound/fmodsound.cpp b/src/sound/fmodsound.cpp
index 01b4efda89..90292e7e94 100644
--- a/src/sound/fmodsound.cpp
+++ b/src/sound/fmodsound.cpp
@@ -952,7 +952,7 @@ void FMODSoundRenderer::StopSound(long handle)
{
ChannelMap[handle].channelID->stop();
UncheckSound(&S_sfx[ChannelMap[handle].soundID], ChannelMap[handle].bIsLooping);
- ChannelMap[handle].soundID = NULL;
+ ChannelMap[handle].soundID = 0;
}
}
diff --git a/src/sound/i_musicinterns.h b/src/sound/i_musicinterns.h
index 51dde57cab..90be184d84 100644
--- a/src/sound/i_musicinterns.h
+++ b/src/sound/i_musicinterns.h
@@ -250,6 +250,7 @@ protected:
int m_LastPos;
};
+#ifdef _WIN32
// SPC file, rendered with SNESAPU.DLL and streamed through FMOD ------------
typedef void (__stdcall *SNESAPUInfo_TYPE) (DWORD*, DWORD*, DWORD*);
@@ -296,6 +297,8 @@ protected:
EmuAPU_TYPE EmuAPU;
};
+#endif
+
// MIDI file played with Timidity and possibly streamed through FMOD --------
class TimiditySong : public StreamSong
diff --git a/zdoom.vcproj b/zdoom.vcproj
index fdecd5ee18..6e49f3eeb6 100644
--- a/zdoom.vcproj
+++ b/zdoom.vcproj
@@ -1,7 +1,7 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -2729,6 +2721,14 @@
GeneratePreprocessedFile="0"
/>
+
+
+
@@ -2751,7 +2751,7 @@
/>
-
-
-
@@ -3720,6 +3710,16 @@
Outputs=""src/$(InputName).h""
/>
+
+
+
@@ -3743,7 +3743,7 @@
/>
-
-
-
@@ -4806,6 +4796,16 @@
Outputs="$(IntDir)\$(InputName).obj"
/>
+
+
+
@@ -4830,16 +4830,6 @@
Outputs="$(IntDir)\$(InputName).obj"
/>
-
-
-
@@ -4850,6 +4840,16 @@
Outputs="$(IntDir)\$(InputName).obj"
/>
+
+
+
@@ -4874,16 +4874,6 @@
Outputs="$(IntDir)\$(InputName).obj"
/>
-
-
-
@@ -4894,6 +4884,16 @@
Outputs="$(IntDir)\$(InputName).obj"
/>
+
+
+
@@ -4918,16 +4918,6 @@
Outputs="$(IntDir)\$(InputName).obj"
/>
-
-
-
@@ -4938,6 +4928,16 @@
Outputs="$(IntDir)\$(InputName).obj"
/>
+
+
+
@@ -4962,16 +4962,6 @@
Outputs="$(IntDir)\$(InputName).obj"
/>
-
-
-
@@ -4982,6 +4972,16 @@
Outputs="$(IntDir)\$(InputName).obj"
/>
+
+
+
@@ -5069,7 +5069,7 @@
/>
-
-
-
@@ -5416,6 +5408,14 @@
Outputs="$(IntDir)\$(InputName).obj"
/>
+
+
+
+
+
+
@@ -5642,14 +5650,6 @@
GeneratePreprocessedFile="0"
/>
-
-
-
@@ -5671,7 +5671,7 @@
/>
-
-
-
@@ -9192,6 +9184,14 @@
AdditionalIncludeDirectories="src\win32;$(NoInherit)"
/>
+
+
+
@@ -9346,7 +9346,7 @@
/>