summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRussell Rice2007-03-07 23:52:33 +0000
committerRussell Rice2007-03-07 23:52:33 +0000
commitcebecf16cc349650bf2a9b20f24b2eac6372e07b (patch)
treef565f4a1dd235d35e0e9f025a5e626677444fa32
parente434c7c10278a47fc686024fae04d361a0282ab8 (diff)
downloadchocolate-doom-cebecf16cc349650bf2a9b20f24b2eac6372e07b.tar.gz
chocolate-doom-cebecf16cc349650bf2a9b20f24b2eac6372e07b.tar.bz2
chocolate-doom-cebecf16cc349650bf2a9b20f24b2eac6372e07b.zip
Update project
Fix a warning Subversion-branch: /trunk/chocolate-doom Subversion-revision: 845
-rw-r--r--codeblocks/chocolate-doom.cbp14
-rw-r--r--src/pcsound/pcsound_win32.c6
2 files changed, 18 insertions, 2 deletions
diff --git a/codeblocks/chocolate-doom.cbp b/codeblocks/chocolate-doom.cbp
index 14daf01f..414970de 100644
--- a/codeblocks/chocolate-doom.cbp
+++ b/codeblocks/chocolate-doom.cbp
@@ -158,6 +158,10 @@
<Unit filename="..\src\i_main.c">
<Option compilerVar="CC" />
</Unit>
+ <Unit filename="..\src\i_pcsound.c">
+ <Option compilerVar="CC" />
+ </Unit>
+ <Unit filename="..\src\i_pcsound.h" />
<Unit filename="..\src\i_scale.c">
<Option compilerVar="CC" />
</Unit>
@@ -336,6 +340,16 @@
<Unit filename="..\src\p_user.c">
<Option compilerVar="CC" />
</Unit>
+ <Unit filename="..\src\pcsound\pcsound.c">
+ <Option compilerVar="CC" />
+ </Unit>
+ <Unit filename="..\src\pcsound\pcsound.h" />
+ <Unit filename="..\src\pcsound\pcsound_sdl.c">
+ <Option compilerVar="CC" />
+ </Unit>
+ <Unit filename="..\src\pcsound\pcsound_win32.c">
+ <Option compilerVar="CC" />
+ </Unit>
<Unit filename="..\src\r_bsp.c">
<Option compilerVar="CC" />
</Unit>
diff --git a/src/pcsound/pcsound_win32.c b/src/pcsound/pcsound_win32.c
index 41b1e059..090c0bbd 100644
--- a/src/pcsound/pcsound_win32.c
+++ b/src/pcsound/pcsound_win32.c
@@ -34,7 +34,7 @@ static SDL_Thread *sound_thread_handle;
static int sound_thread_running;
static pcsound_callback_func callback;
-static void SoundThread(void *unused)
+static int SoundThread(void *unused)
{
int frequency;
int duration;
@@ -51,7 +51,9 @@ static void SoundThread(void *unused)
{
Sleep(duration);
}
- }
+ }
+
+ return 0;
}
static int PCSound_Win32_Init(pcsound_callback_func callback_func)