From 11840d1c733535b65daa3c50b192fcadb8ce751b Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 31 Jul 2005 15:42:03 +0000
Subject: [PATCH] regenerated after adding sound.rc

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35037 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 samples/sound/Makefile.in  | 12 ++++++------
 samples/sound/makefile.bcc | 21 ++++++++++++++-------
 samples/sound/makefile.gcc | 25 ++++++++++++++++---------
 samples/sound/makefile.vc  | 25 ++++++++++++++++---------
 samples/sound/makefile.wat | 12 ++++++------
 samples/sound/sound.dsp    |  4 ++--
 6 files changed, 60 insertions(+), 39 deletions(-)

diff --git a/samples/sound/Makefile.in b/samples/sound/Makefile.in
index b11ba56650..00e3d4d408 100644
--- a/samples/sound/Makefile.in
+++ b/samples/sound/Makefile.in
@@ -43,9 +43,9 @@ SOUND_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
 	-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
 SOUND_OBJECTS =  \
-	$(__sound___win32rc) \
 	$(__sound_os2_lib_res) \
-	sound_sound.o
+	sound_sound.o \
+	$(__sound___win32rc)
 
 ### Conditionally set variables: ###
 
@@ -84,7 +84,6 @@ SOUND_OBJECTS =  \
 COND_PLATFORM_OS2_1___sound___os2_emxbindcmd = $(NM) sound$(EXEEXT) | if grep -q \
 	pmwin.763 ; then emxbind -ep sound$(EXEEXT) ; fi
 @COND_PLATFORM_OS2_1@__sound___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___sound___os2_emxbindcmd)
-@COND_PLATFORM_WIN32_1@__sound___win32rc = sound_sample_rc.o
 @COND_PLATFORM_OS2_1@__sound_os2_lib_res = \
 @COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
 @COND_PLATFORM_MACOSX_1@__sound_bundle___depname = sound_bundle
@@ -100,6 +99,7 @@ COND_MONOLITHIC_0___WXLIB_CORE_p = \
 COND_MONOLITHIC_0___WXLIB_BASE_p = \
 	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
+@COND_PLATFORM_WIN32_1@__sound___win32rc = sound_sound_rc.o
 COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
@@ -188,12 +188,12 @@ data:
 	esac; \
 	done
 
-sound_sample_rc.o: $(srcdir)/../../samples/sample.rc
-	$(RESCOMP) -i$< -o$@   --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)  $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2)  --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples --include-dir $(top_srcdir)/include
-
 sound_sound.o: $(srcdir)/sound.cpp
 	$(CXXC) -c -o $@ $(SOUND_CXXFLAGS) $(srcdir)/sound.cpp
 
+sound_sound_rc.o: $(srcdir)/sound.rc
+	$(RESCOMP) -i$< -o$@   --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)  $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2)   --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples --include-dir $(top_srcdir)/include
+
 
 # Include dependency info, if present:
 @IF_GNU_MAKE@-include .deps/*.d
diff --git a/samples/sound/makefile.bcc b/samples/sound/makefile.bcc
index e392883c5b..c1bf65730e 100644
--- a/samples/sound/makefile.bcc
+++ b/samples/sound/makefile.bcc
@@ -30,8 +30,9 @@ SETUPHDIR = \
 SOUND_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
 	$(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
 	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
-	$(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) \
-	-I. $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
+	$(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+	-I.\..\..\include -I$(SETUPHDIR) -I. $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH \
+	$(CPPFLAGS) $(CXXFLAGS)
 SOUND_OBJECTS =  \
 	$(OBJS)\sound_sound.obj
 
@@ -142,6 +143,12 @@ __UNICODE_DEFINE_p = -D_UNICODE
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p_1 = -d_UNICODE
 !endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1
+!endif
 !if "$(SHARED)" == "1"
 __DLLFLAG_p = -DWXUSINGDLL
 !endif
@@ -209,18 +216,18 @@ clean:
 	-if exist $(OBJS)\sound.ilf del $(OBJS)\sound.ilf
 	-if exist $(OBJS)\sound.ils del $(OBJS)\sound.ils
 
-$(OBJS)\sound.exe: $(SOUND_OBJECTS)  $(OBJS)\sound_sample.res
+$(OBJS)\sound.exe: $(SOUND_OBJECTS)  $(OBJS)\sound_sound.res
 	ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa @&&|
-	c0w32.obj $(SOUND_OBJECTS),$@,, $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib  import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\sound_sample.res
+	c0w32.obj $(SOUND_OBJECTS),$@,, $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib  import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\sound_sound.res
 |
 
 data: 
 	if not exist $(OBJS) mkdir $(OBJS)
 	for %f in (9000g.wav cuckoo.wav doggrowl.wav tinkalink2.wav) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
 
-$(OBJS)\sound_sample.res: .\..\..\samples\sample.rc
-	brcc32 -32 -r -fo$@ -i$(BCCDIR)\include   -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\include -i$(SETUPHDIR) -i. $(__DLLFLAG_p_1) -i.\..\..\samples $**
-
 $(OBJS)\sound_sound.obj: .\sound.cpp
 	$(CXX) -q -c -P -o$@ $(SOUND_CXXFLAGS) $**
 
+$(OBJS)\sound_sound.res: .\sound.rc
+	brcc32 -32 -r -fo$@ -i$(BCCDIR)\include   -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i.\..\..\include -i$(SETUPHDIR) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH $**
+
diff --git a/samples/sound/makefile.gcc b/samples/sound/makefile.gcc
index 6b2fce87a8..9f2c966b07 100644
--- a/samples/sound/makefile.gcc
+++ b/samples/sound/makefile.gcc
@@ -22,12 +22,13 @@ SETUPHDIR = \
 SOUND_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
 	$(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
 	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
-	$(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) \
-	-W -Wall -I. $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \
-	$(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
+	$(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+	-I.\..\..\include -I$(SETUPHDIR) -W -Wall -I. $(__DLLFLAG_p) -I.\..\..\samples \
+	-DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy \
+	$(CPPFLAGS) $(CXXFLAGS)
 SOUND_OBJECTS =  \
-	$(OBJS)\sound_sample_rc.o \
-	$(OBJS)\sound_sound.o
+	$(OBJS)\sound_sound.o \
+	$(OBJS)\sound_sound_rc.o
 
 ### Conditionally set variables: ###
 
@@ -133,6 +134,12 @@ endif
 ifeq ($(UNICODE),1)
 __UNICODE_DEFINE_p_1 = --define _UNICODE
 endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1
+endif
 ifeq ($(SHARED),1)
 __DLLFLAG_p = -DWXUSINGDLL
 endif
@@ -204,19 +211,19 @@ clean:
 	-if exist $(OBJS)\*.d del $(OBJS)\*.d
 	-if exist $(OBJS)\sound.exe del $(OBJS)\sound.exe
 
-$(OBJS)\sound.exe: $(SOUND_OBJECTS) $(OBJS)\sound_sample_rc.o
+$(OBJS)\sound.exe: $(SOUND_OBJECTS) $(OBJS)\sound_sound_rc.o
 	$(CXX) -o $@ $(SOUND_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32
 
 data: 
 	if not exist $(OBJS) mkdir $(OBJS)
 	for %%f in (9000g.wav cuckoo.wav doggrowl.wav tinkalink2.wav) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)
 
-$(OBJS)\sound_sample_rc.o: ./../../samples/sample.rc
-	windres --use-temp-file -i$< -o$@   --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir ./../../include --include-dir $(SETUPHDIR) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples
-
 $(OBJS)\sound_sound.o: ./sound.cpp
 	$(CXX) -c -o $@ $(SOUND_CXXFLAGS) $(CPPDEPS) $<
 
+$(OBJS)\sound_sound_rc.o: ./sound.rc
+	windres --use-temp-file -i$< -o$@   --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir ./../../include --include-dir $(SETUPHDIR) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
+
 .PHONY: all clean data
 
 
diff --git a/samples/sound/makefile.vc b/samples/sound/makefile.vc
index 469cd4a276..87f44aba9f 100644
--- a/samples/sound/makefile.vc
+++ b/samples/sound/makefile.vc
@@ -22,12 +22,13 @@ SOUND_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \
 	$(__DEBUGINFO_0) /Fd$(OBJS)\sound.pdb $(____DEBUGRUNTIME_2_p) \
 	$(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
 	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
-	$(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I$(SETUPHDIR) \
-	/W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) \
-	$(__EXCEPTIONSFLAG_10) $(CPPFLAGS) $(CXXFLAGS)
+	$(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+	/I.\..\..\include /I$(SETUPHDIR) /W4 /I. $(__DLLFLAG_p) /D_WINDOWS \
+	/I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) $(CPPFLAGS) \
+	$(CXXFLAGS)
 SOUND_OBJECTS =  \
-	$(OBJS)\sound_sample.res \
-	$(OBJS)\sound_sound.obj
+	$(OBJS)\sound_sound.obj \
+	$(OBJS)\sound_sound.res
 
 ### Conditionally set variables: ###
 
@@ -208,6 +209,12 @@ __UNICODE_DEFINE_p = /D_UNICODE
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p_1 = /d _UNICODE
 !endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1
+!endif
 !if "$(SHARED)" == "1"
 __DLLFLAG_p = /DWXUSINGDLL
 !endif
@@ -260,7 +267,7 @@ clean:
 	-if exist $(OBJS)\sound.ilk del $(OBJS)\sound.ilk
 	-if exist $(OBJS)\sound.pdb del $(OBJS)\sound.pdb
 
-$(OBJS)\sound.exe: $(SOUND_OBJECTS) $(OBJS)\sound_sample.res
+$(OBJS)\sound.exe: $(SOUND_OBJECTS) $(OBJS)\sound_sound.res
 	link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1)  /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
 	$(SOUND_OBJECTS)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib
 <<
@@ -269,9 +276,9 @@ data:
 	if not exist $(OBJS) mkdir $(OBJS)
 	for %f in (9000g.wav cuckoo.wav doggrowl.wav tinkalink2.wav) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
 
-$(OBJS)\sound_sample.res: .\..\..\samples\sample.rc
-	rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i .\..\..\include /i $(SETUPHDIR) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples $**
-
 $(OBJS)\sound_sound.obj: .\sound.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(SOUND_CXXFLAGS) $**
 
+$(OBJS)\sound_sound.res: .\sound.rc
+	rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i .\..\..\include /i $(SETUPHDIR) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH $**
+
diff --git a/samples/sound/makefile.wat b/samples/sound/makefile.wat
index 8785466ee9..bc6d5d0fb1 100644
--- a/samples/sound/makefile.wat
+++ b/samples/sound/makefile.wat
@@ -238,7 +238,7 @@ clean : .SYMBOLIC
 	-if exist $(OBJS)\*.pch del $(OBJS)\*.pch
 	-if exist $(OBJS)\sound.exe del $(OBJS)\sound.exe
 
-$(OBJS)\sound.exe :  $(SOUND_OBJECTS) $(OBJS)\sound_sample.res
+$(OBJS)\sound.exe :  $(SOUND_OBJECTS) $(OBJS)\sound_sound.res
 	@%create $(OBJS)\sound.lbc
 	@%append $(OBJS)\sound.lbc option quiet
 	@%append $(OBJS)\sound.lbc name $^@
@@ -246,16 +246,16 @@ $(OBJS)\sound.exe :  $(SOUND_OBJECTS) $(OBJS)\sound_sample.res
 	@%append $(OBJS)\sound.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
 	@for %i in ($(SOUND_OBJECTS)) do @%append $(OBJS)\sound.lbc file %i
 	@for %i in ( $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ) do @%append $(OBJS)\sound.lbc library %i
-	@%append $(OBJS)\sound.lbc option resource=$(OBJS)\sound_sample.res
+	@%append $(OBJS)\sound.lbc option resource=$(OBJS)\sound_sound.res
 	wlink @$(OBJS)\sound.lbc
 
 data : .SYMBOLIC 
 	if not exist $(OBJS) mkdir $(OBJS)
 	for %f in (9000g.wav cuckoo.wav doggrowl.wav tinkalink2.wav) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
 
-$(OBJS)\sound_sample.res :  .AUTODEPEND .\..\..\samples\sample.rc
-	wrc -q -ad -bt=nt -r -fo=$^@   -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) -i=.\..\..\samples $<
-
 $(OBJS)\sound_sound.obj :  .AUTODEPEND .\sound.cpp
-	$(CXX) -zq -fo=$^@ $(SOUND_CXXFLAGS) $<
+	$(CXX) -bt=nt -zq -fo=$^@ $(SOUND_CXXFLAGS) $<
+
+$(OBJS)\sound_sound.res :  .AUTODEPEND .\sound.rc
+	wrc -q -ad -bt=nt -r -fo=$^@   -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
 
diff --git a/samples/sound/sound.dsp b/samples/sound/sound.dsp
index b2751679d0..8c419e33f1 100644
--- a/samples/sound/sound.dsp
+++ b/samples/sound/sound.dsp
@@ -468,11 +468,11 @@ LINK32=link.exe
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=.\..\..\samples\sample.rc
+SOURCE=.\sound.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\sound.cpp
+SOURCE=.\sound.rc
 # End Source File
 # End Group
 # End Target