--- /dev/null
+diff -ru miniAudicle-0.1.3.3~/chuck-1.2.0.6/src/makefile.alsa miniAudicle-0.1.3.3/chuck-1.2.0.6/src/makefile.alsa
+--- miniAudicle-0.1.3.3~/chuck-1.2.0.6/src/makefile.alsa 2006-07-30 11:51:22.000000000 +0200
++++ miniAudicle-0.1.3.3/chuck-1.2.0.6/src/makefile.alsa 2006-07-30 12:06:16.000000000 +0200
+@@ -1,9 +1,11 @@
+
+-CXX=gcc
++CXX?=g++
++CC?=gcc
+ LEX=flex
+ YACC=bison
+ INCLUDES=
+-FLAGS=-D__LINUX_ALSA__ -O3 -c
++CFLAGS?=-O3
++FLAGS=-D__LINUX_ALSA__ -c $(CFLAGS)
+ LIBS=-lasound -lstdc++ -ldl -lm
+ SF_OBJ=util_sndfile.o
+
+@@ -46,7 +48,7 @@
+ $(CXX) -o chuck $(OBJS) $(LIBS)
+
+ chuck.tab.o: chuck.tab.c
+- $(CXX) $(FLAGS) chuck.tab.c
++ $(CC) $(FLAGS) chuck.tab.c
+
+ chuck.tab.c: chuck.y
+ $(YACC) -dv -b chuck chuck.y
+@@ -55,7 +57,7 @@
+ echo "chuck.tab.h was created at the same time as chuck.tab.c"
+
+ chuck.yy.o: chuck.yy.c chuck.tab.h chuck_errmsg.h chuck_utils.h
+- $(CXX) $(FLAGS) chuck.yy.c
++ $(CC) $(FLAGS) chuck.yy.c
+
+ chuck.yy.c: chuck.lex
+ $(LEX) -ochuck.yy.c chuck.lex
+@@ -181,19 +183,19 @@
+ $(CXX) $(FLAGS) util_console.cpp
+
+ util_hid.o: util_hid.h util_hid.c
+- $(CXX) $(FLAGS) util_hid.c
++ $(CC) $(FLAGS) util_hid.c
+
+ util_math.o: util_math.h util_math.c
+- $(CXX) $(FLAGS) util_math.c
++ $(CC) $(FLAGS) util_math.c
+
+ util_network.o: util_network.h util_network.c
+- $(CXX) $(FLAGS) util_network.c
++ $(CC) $(FLAGS) util_network.c
+
+ util_opsc.o: util_opsc.h util_opsc.cpp
+ $(CXX) $(FLAGS) util_opsc.cpp
+
+ util_raw.o: util_raw.h util_raw.c
+- $(CXX) $(FLAGS) util_raw.c
++ $(CC) $(FLAGS) util_raw.c
+
+ util_string.o: util_string.h util_string.cpp
+ $(CXX) $(FLAGS) util_string.cpp
+@@ -202,10 +204,10 @@
+ $(CXX) $(FLAGS) util_thread.cpp
+
+ util_xforms.o: util_xforms.h util_xforms.c
+- $(CXX) $(FLAGS) util_xforms.c
++ $(CC) $(FLAGS) util_xforms.c
+
+ util_sndfile.o: util_sndfile.h util_sndfile.c
+- $(CXX) $(FLAGS) util_sndfile.c
++ $(CC) $(FLAGS) util_sndfile.c
+
+ clean:
+ rm -f chuck *~ *.o chuck.output chuck.tab.h chuck.tab.c chuck.yy.c
+diff -ru miniAudicle-0.1.3.3~/chuck-1.2.0.6/src/makefile.jack miniAudicle-0.1.3.3/chuck-1.2.0.6/src/makefile.jack
+--- miniAudicle-0.1.3.3~/chuck-1.2.0.6/src/makefile.jack 2006-07-30 11:51:22.000000000 +0200
++++ miniAudicle-0.1.3.3/chuck-1.2.0.6/src/makefile.jack 2006-07-30 12:04:37.000000000 +0200
+@@ -1,9 +1,11 @@
+
+-CXX=gcc
++CXX?=g++
++CC?=gcc
+ LEX=flex
+ YACC=bison
+ INCLUDES=
+-FLAGS=-D__LINUX_JACK__ -O3 -c
++CFLAGS?=-O3
++FLAGS=-D__LINUX_JACK__ -c $(CFLAGS)
+ LIBS=-lasound -ljack -lstdc++ -ldl -lm
+ SF_OBJ=util_sndfile.o
+
+@@ -46,7 +48,7 @@
+ $(CXX) -o chuck $(OBJS) $(LIBS)
+
+ chuck.tab.o: chuck.tab.c
+- $(CXX) $(FLAGS) chuck.tab.c
++ $(CC) $(FLAGS) chuck.tab.c
+
+ chuck.tab.c: chuck.y
+ $(YACC) -dv -b chuck chuck.y
+@@ -55,7 +57,7 @@
+ echo "chuck.tab.h was created at the same time as chuck.tab.c"
+
+ chuck.yy.o: chuck.yy.c chuck.tab.h chuck_errmsg.h chuck_utils.h
+- $(CXX) $(FLAGS) chuck.yy.c
++ $(CC) $(FLAGS) chuck.yy.c
+
+ chuck.yy.c: chuck.lex
+ $(LEX) -ochuck.yy.c chuck.lex
+@@ -181,19 +183,19 @@
+ $(CXX) $(FLAGS) util_console.cpp
+
+ util_hid.o: util_hid.h util_hid.c
+- $(CXX) $(FLAGS) util_hid.c
++ $(CC) $(FLAGS) util_hid.c
+
+ util_math.o: util_math.h util_math.c
+- $(CXX) $(FLAGS) util_math.c
++ $(CC) $(FLAGS) util_math.c
+
+ util_network.o: util_network.h util_network.c
+- $(CXX) $(FLAGS) util_network.c
++ $(CC) $(FLAGS) util_network.c
+
+ util_opsc.o: util_opsc.h util_opsc.cpp
+ $(CXX) $(FLAGS) util_opsc.cpp
+
+ util_raw.o: util_raw.h util_raw.c
+- $(CXX) $(FLAGS) util_raw.c
++ $(CC) $(FLAGS) util_raw.c
+
+ util_string.o: util_string.h util_string.cpp
+ $(CXX) $(FLAGS) util_string.cpp
+@@ -202,10 +204,10 @@
+ $(CXX) $(FLAGS) util_thread.cpp
+
+ util_xforms.o: util_xforms.h util_xforms.c
+- $(CXX) $(FLAGS) util_xforms.c
++ $(CC) $(FLAGS) util_xforms.c
+
+ util_sndfile.o: util_sndfile.h util_sndfile.c
+- $(CXX) $(FLAGS) util_sndfile.c
++ $(CC) $(FLAGS) util_sndfile.c
+
+ clean:
+ rm -f chuck *~ *.o chuck.output chuck.tab.h chuck.tab.c chuck.yy.c
+diff -ru miniAudicle-0.1.3.3~/chuck-1.2.0.6/src/makefile.oss miniAudicle-0.1.3.3/chuck-1.2.0.6/src/makefile.oss
+--- miniAudicle-0.1.3.3~/chuck-1.2.0.6/src/makefile.oss 2006-07-30 11:51:22.000000000 +0200
++++ miniAudicle-0.1.3.3/chuck-1.2.0.6/src/makefile.oss 2006-07-30 12:06:13.000000000 +0200
+@@ -1,9 +1,11 @@
+
+-CXX=gcc
++CXX?=g++
++CC?=gcc
+ LEX=flex
+ YACC=bison
+ INCLUDES=
+-FLAGS=-D__LINUX_OSS__ -O3 -c
++CFLAGS?=-O3
++FLAGS=-D__LINUX_OSS__ -c $(CFLAGS)
+ LIBS=-lpthread -lstdc++ -ldl -lm
+ SF_OBJ=util_sndfile.o
+
+@@ -46,7 +48,7 @@
+ $(CXX) -o chuck $(OBJS) $(LIBS)
+
+ chuck.tab.o: chuck.tab.c
+- $(CXX) $(FLAGS) chuck.tab.c
++ $(CC) $(FLAGS) chuck.tab.c
+
+ chuck.tab.c: chuck.y
+ $(YACC) -dv -b chuck chuck.y
+@@ -55,7 +57,7 @@
+ echo "chuck.tab.h was created at the same time as chuck.tab.c"
+
+ chuck.yy.o: chuck.yy.c chuck.tab.h chuck_errmsg.h chuck_utils.h
+- $(CXX) $(FLAGS) chuck.yy.c
++ $(CC) $(FLAGS) chuck.yy.c
+
+ chuck.yy.c: chuck.lex
+ $(LEX) -ochuck.yy.c chuck.lex
+@@ -181,19 +183,19 @@
+ $(CXX) $(FLAGS) util_console.cpp
+
+ util_hid.o: util_hid.h util_hid.c
+- $(CXX) $(FLAGS) util_hid.c
++ $(CC) $(FLAGS) util_hid.c
+
+ util_math.o: util_math.h util_math.c
+- $(CXX) $(FLAGS) util_math.c
++ $(CC) $(FLAGS) util_math.c
+
+ util_network.o: util_network.h util_network.c
+- $(CXX) $(FLAGS) util_network.c
++ $(CC) $(FLAGS) util_network.c
+
+ util_opsc.o: util_opsc.h util_opsc.cpp
+ $(CXX) $(FLAGS) util_opsc.cpp
+
+ util_raw.o: util_raw.h util_raw.c
+- $(CXX) $(FLAGS) util_raw.c
++ $(CC) $(FLAGS) util_raw.c
+
+ util_string.o: util_string.h util_string.cpp
+ $(CXX) $(FLAGS) util_string.cpp
+@@ -202,10 +204,10 @@
+ $(CXX) $(FLAGS) util_thread.cpp
+
+ util_xforms.o: util_xforms.h util_xforms.c
+- $(CXX) $(FLAGS) util_xforms.c
++ $(CC) $(FLAGS) util_xforms.c
+
+ util_sndfile.o: util_sndfile.h util_sndfile.c
+- $(CXX) $(FLAGS) util_sndfile.c
++ $(CC) $(FLAGS) util_sndfile.c
+
+ clean:
+ rm -f chuck *~ *.o chuck.output chuck.tab.h chuck.tab.c chuck.yy.c
+diff -ru miniAudicle-0.1.3.3~/makefile.alsa miniAudicle-0.1.3.3/makefile.alsa
+--- miniAudicle-0.1.3.3~/makefile.alsa 2006-07-30 11:51:22.000000000 +0200
++++ miniAudicle-0.1.3.3/makefile.alsa 2006-07-30 12:06:35.000000000 +0200
+@@ -6,12 +6,14 @@
+ WXW_DIR=wxw
+ BIN_DIR=wxw
+
+-CC=gcc
++CC?=gcc
++CXX?=g++
+ LEX=flex
+ YACC=bison
+ INCLUDES=-I$(CHUCK_SRC_DIR) -I$(WXW_DIR) -I$(PWD)
++CFLAGS?=-O3
+ FLAGS=-D__LINUX_ALSA__ -D__LINUX__ -D__MA_WXWIDGETS__ \
+- `wx-config --cppflags` -O3 -c
++ `wx-config --cppflags` -c $(CFLAGS)
+ LIBS=`wx-config --libs core,base,adv,stc` -lasound -lpthread -lstdc++ -ldl -lm
+ SF_OBJ=$(CHUCK_SRC_DIR)/util_sndfile.o
+
+@@ -78,38 +80,38 @@
+ $(WXW_DIR)/icons/replace.xpm $(WXW_DIR)/icons/miniAudicle.xpm
+
+ miniAudicle: $(OBJS) $(CHUCK_OBJS)
+- g++ -o $(BIN_DIR)/miniAudicle $(OBJS) $(CHUCK_OBJS) $(LIBS)
++ $(CXX) -o $(BIN_DIR)/miniAudicle $(OBJS) $(CHUCK_OBJS) $(LIBS)
+
+ # build the core chuck code
+ $(CHUCK_OBJS):
+ make -C $(CHUCK_SRC_DIR) linux-alsa
+
+ miniAudicle_shell.o: miniAudicle_shell.cpp miniAudicle_shell.h
+- $(CC) $(FLAGS) $(INCLUDES) miniAudicle_shell.cpp
++ $(CXX) $(FLAGS) $(INCLUDES) miniAudicle_shell.cpp
+
+ miniAudicle_import.o: miniAudicle_import.h miniAudicle_import.cpp
+- $(CC) $(FLAGS) $(INCLUDES) miniAudicle_import.cpp
++ $(CXX) $(FLAGS) $(INCLUDES) miniAudicle_import.cpp
+
+ miniAudicle.o: miniAudicle.cpp miniAudicle.h
+- $(CC) $(FLAGS) $(INCLUDES) miniAudicle.cpp
++ $(CXX) $(FLAGS) $(INCLUDES) miniAudicle.cpp
+
+ $(WXW_DIR)/mAParentFrame.o: $(WXW_DIR)/mAParentFrame.cpp $(WXW_DIR)/mAParentFrame.h $(WXW_DIR)/mAView.h $(WXW_DIR)/mADocument.h $(WXW_DIR)/mAVMMonitor.h miniAudicle.h $(WXW_DIR)/mAMenuBar.h $(XPMS)\r
+- $(CC) -o $(WXW_DIR)/mAParentFrame.o $(FLAGS) $(INCLUDES) $(WXW_DIR)/mAParentFrame.cpp
++ $(CXX) -o $(WXW_DIR)/mAParentFrame.o $(FLAGS) $(INCLUDES) $(WXW_DIR)/mAParentFrame.cpp
+
+ $(WXW_DIR)/mADocument.o: $(WXW_DIR)/mADocument.cpp $(WXW_DIR)/mADocument.h $(WXW_DIR)/mAView.h
+- $(CC) -o $(WXW_DIR)/mADocument.o $(FLAGS) $(INCLUDES) $(WXW_DIR)/mADocument.cpp
++ $(CXX) -o $(WXW_DIR)/mADocument.o $(FLAGS) $(INCLUDES) $(WXW_DIR)/mADocument.cpp
+
+ $(WXW_DIR)/mAView.o: $(WXW_DIR)/mAView.cpp $(WXW_DIR)/mAView.h
+- $(CC) -o $(WXW_DIR)/mAView.o $(FLAGS) $(INCLUDES) $(WXW_DIR)/mAView.cpp
++ $(CXX) -o $(WXW_DIR)/mAView.o $(FLAGS) $(INCLUDES) $(WXW_DIR)/mAView.cpp
+
+ $(WXW_DIR)/mAVMMonitor.o: $(WXW_DIR)/mAVMMonitor.cpp $(WXW_DIR)/mAVMMonitor.h $(WXW_DIR)/mAParentFrame.h miniAudicle.h
+- $(CC) -o $(WXW_DIR)/mAVMMonitor.o $(FLAGS) $(INCLUDES) $(WXW_DIR)/mAVMMonitor.cpp
++ $(CXX) -o $(WXW_DIR)/mAVMMonitor.o $(FLAGS) $(INCLUDES) $(WXW_DIR)/mAVMMonitor.cpp
+
+ $(WXW_DIR)/mAConsoleMonitor.o: $(WXW_DIR)/mAConsoleMonitor.cpp $(WXW_DIR)/mAConsoleMonitor.h $(WXW_DIR)/mAParentFrame.h
+- $(CC) -o $(WXW_DIR)/mAConsoleMonitor.o $(FLAGS) $(INCLUDES) $(WXW_DIR)/mAConsoleMonitor.cpp
++ $(CXX) -o $(WXW_DIR)/mAConsoleMonitor.o $(FLAGS) $(INCLUDES) $(WXW_DIR)/mAConsoleMonitor.cpp
+
+ $(WXW_DIR)/mAMenuBar.o: $(WXW_DIR)/mAMenuBar.cpp $(WXW_DIR)/mAMenuBar.h $(WXW_DIR)/mAEvents.h
+- $(CC) -o $(WXW_DIR)/mAMenuBar.o $(FLAGS) $(INCLUDES) $(WXW_DIR)/mAMenuBar.cpp
++ $(CXX) -o $(WXW_DIR)/mAMenuBar.o $(FLAGS) $(INCLUDES) $(WXW_DIR)/mAMenuBar.cpp
+
+ clean:
+ rm -rf *.o $(WXW_DIR)/*.o $(BIN_DIR)/miniAudicle
+diff -ru miniAudicle-0.1.3.3~/makefile.jack miniAudicle-0.1.3.3/makefile.jack
+--- miniAudicle-0.1.3.3~/makefile.jack 2006-07-30 11:51:22.000000000 +0200
++++ miniAudicle-0.1.3.3/makefile.jack 2006-07-30 12:06:43.000000000 +0200
+@@ -6,12 +6,14 @@
+ WXW_DIR=wxw
+ BIN_DIR=wxw
+
+-CC=gcc
++CC?=gcc
++CXX?=g++
+ LEX=flex
+ YACC=bison
+ INCLUDES=-I$(CHUCK_SRC_DIR) -I$(WXW_DIR) -I$(PWD)
++CFLAGS?=-O3
+ FLAGS=-D__LINUX_JACK__ -D__LINUX__ -D__MA_WXWIDGETS__ \
+- `wx-config --cppflags` -O3 -c
++ `wx-config --cppflags` -c $(CFLAGS)
+ LIBS=`wx-config --libs core,base,adv,stc` -lasound -ljack -lpthread -lstdc++ -ldl -lm
+ SF_OBJ=$(CHUCK_SRC_DIR)/util_sndfile.o
+
+@@ -78,38 +80,38 @@
+ $(WXW_DIR)/icons/replace.xpm $(WXW_DIR)/icons/miniAudicle.xpm
+
+ miniAudicle: $(OBJS) $(CHUCK_OBJS)
+- g++ -o $(BIN_DIR)/miniAudicle $(OBJS) $(CHUCK_OBJS) $(LIBS)
++ $(CXX) -o $(BIN_DIR)/miniAudicle $(OBJS) $(CHUCK_OBJS) $(LIBS)
+
+ # build the core chuck code
+ $(CHUCK_OBJS):
+ make -C $(CHUCK_SRC_DIR) linux-alsa
+
+ miniAudicle_shell.o: miniAudicle_shell.cpp miniAudicle_shell.h
+- $(CC) $(FLAGS) $(INCLUDES) miniAudicle_shell.cpp
++ $(CXX) $(FLAGS) $(INCLUDES) miniAudicle_shell.cpp
+
+ miniAudicle_import.o: miniAudicle_import.h miniAudicle_import.cpp
+- $(CC) $(FLAGS) $(INCLUDES) miniAudicle_import.cpp
++ $(CXX) $(FLAGS) $(INCLUDES) miniAudicle_import.cpp
+
+ miniAudicle.o: miniAudicle.cpp miniAudicle.h
+- $(CC) $(FLAGS) $(INCLUDES) miniAudicle.cpp
++ $(CXX) $(FLAGS) $(INCLUDES) miniAudicle.cpp
+
+ $(WXW_DIR)/mAParentFrame.o: $(WXW_DIR)/mAParentFrame.cpp $(WXW_DIR)/mAParentFrame.h $(WXW_DIR)/mAView.h $(WXW_DIR)/mADocument.h $(WXW_DIR)/mAVMMonitor.h miniAudicle.h $(WXW_DIR)/mAMenuBar.h $(XPMS)\r
+- $(CC) -o $(WXW_DIR)/mAParentFrame.o $(FLAGS) $(INCLUDES) $(WXW_DIR)/mAParentFrame.cpp
++ $(CXX) -o $(WXW_DIR)/mAParentFrame.o $(FLAGS) $(INCLUDES) $(WXW_DIR)/mAParentFrame.cpp
+
+ $(WXW_DIR)/mADocument.o: $(WXW_DIR)/mADocument.cpp $(WXW_DIR)/mADocument.h $(WXW_DIR)/mAView.h
+- $(CC) -o $(WXW_DIR)/mADocument.o $(FLAGS) $(INCLUDES) $(WXW_DIR)/mADocument.cpp
++ $(CXX) -o $(WXW_DIR)/mADocument.o $(FLAGS) $(INCLUDES) $(WXW_DIR)/mADocument.cpp
+
+ $(WXW_DIR)/mAView.o: $(WXW_DIR)/mAView.cpp $(WXW_DIR)/mAView.h
+- $(CC) -o $(WXW_DIR)/mAView.o $(FLAGS) $(INCLUDES) $(WXW_DIR)/mAView.cpp
++ $(CXX) -o $(WXW_DIR)/mAView.o $(FLAGS) $(INCLUDES) $(WXW_DIR)/mAView.cpp
+
+ $(WXW_DIR)/mAVMMonitor.o: $(WXW_DIR)/mAVMMonitor.cpp $(WXW_DIR)/mAVMMonitor.h $(WXW_DIR)/mAParentFrame.h miniAudicle.h
+- $(CC) -o $(WXW_DIR)/mAVMMonitor.o $(FLAGS) $(INCLUDES) $(WXW_DIR)/mAVMMonitor.cpp
++ $(CXX) -o $(WXW_DIR)/mAVMMonitor.o $(FLAGS) $(INCLUDES) $(WXW_DIR)/mAVMMonitor.cpp
+
+ $(WXW_DIR)/mAConsoleMonitor.o: $(WXW_DIR)/mAConsoleMonitor.cpp $(WXW_DIR)/mAConsoleMonitor.h $(WXW_DIR)/mAParentFrame.h
+- $(CC) -o $(WXW_DIR)/mAConsoleMonitor.o $(FLAGS) $(INCLUDES) $(WXW_DIR)/mAConsoleMonitor.cpp
++ $(CXX) -o $(WXW_DIR)/mAConsoleMonitor.o $(FLAGS) $(INCLUDES) $(WXW_DIR)/mAConsoleMonitor.cpp
+
+ $(WXW_DIR)/mAMenuBar.o: $(WXW_DIR)/mAMenuBar.cpp $(WXW_DIR)/mAMenuBar.h $(WXW_DIR)/mAEvents.h
+- $(CC) -o $(WXW_DIR)/mAMenuBar.o $(FLAGS) $(INCLUDES) $(WXW_DIR)/mAMenuBar.cpp
++ $(CXX) -o $(WXW_DIR)/mAMenuBar.o $(FLAGS) $(INCLUDES) $(WXW_DIR)/mAMenuBar.cpp
+
+ clean:
+ rm -rf *.o $(WXW_DIR)/*.o $(BIN_DIR)/miniAudicle
+diff -ru miniAudicle-0.1.3.3~/makefile.oss miniAudicle-0.1.3.3/makefile.oss
+--- miniAudicle-0.1.3.3~/makefile.oss 2006-07-30 11:51:22.000000000 +0200
++++ miniAudicle-0.1.3.3/makefile.oss 2006-07-30 12:06:56.000000000 +0200
+@@ -6,12 +6,14 @@
+ WXW_DIR=wxw
+ BIN_DIR=wxw
+
+-CC=gcc
++CC?=gcc
++CXX?=g++
+ LEX=flex
+ YACC=bison
+ INCLUDES=-I$(CHUCK_SRC_DIR) -I$(WXW_DIR) -I$(PWD)
++CFLAGS?=-O3
+ FLAGS=-D__LINUX_OSS___ -D__LINUX__ -D__PLATFORM_LINUX__ -D__MA_WXWIDGETS__ \
+- `wx-config --cppflags` -O3 -c
++ `wx-config --cppflags` -c $(CFLAGS)
+ LIBS=`wx-config --libs core,base,adv,stc` -lpthread -lstdc++ -ldl -lm
+ SF_OBJ=$(CHUCK_SRC_DIR)/util_sndfile.o
+
+@@ -78,38 +80,38 @@
+ $(WXW_DIR)/icons/replace.xpm $(WXW_DIR)/icons/miniAudicle.xpm
+
+ miniAudicle: $(OBJS) $(CHUCK_OBJS)
+- g++ -o $(BIN_DIR)/miniAudicle $(OBJS) $(CHUCK_OBJS) $(LIBS)
++ $(CXX) -o $(BIN_DIR)/miniAudicle $(OBJS) $(CHUCK_OBJS) $(LIBS)
+
+ # build the core chuck code
+ $(CHUCK_OBJS):
+ make -C $(CHUCK_SRC_DIR) linux-oss
+
+ miniAudicle_shell.o: miniAudicle_shell.cpp miniAudicle_shell.h
+- $(CC) $(FLAGS) $(INCLUDES) miniAudicle_shell.cpp
++ $(CXX) $(FLAGS) $(INCLUDES) miniAudicle_shell.cpp
+
+ miniAudicle_import.o: miniAudicle_import.h miniAudicle_import.cpp
+- $(CC) $(FLAGS) $(INCLUDES) miniAudicle_import.cpp
++ $(CXX) $(FLAGS) $(INCLUDES) miniAudicle_import.cpp
+
+ miniAudicle.o: miniAudicle.cpp miniAudicle.h
+- $(CC) $(FLAGS) $(INCLUDES) miniAudicle.cpp
++ $(CXX) $(FLAGS) $(INCLUDES) miniAudicle.cpp
+
+ $(WXW_DIR)/mAParentFrame.o: $(WXW_DIR)/mAParentFrame.cpp $(WXW_DIR)/mAParentFrame.h $(WXW_DIR)/mAView.h $(WXW_DIR)/mADocument.h $(WXW_DIR)/mAVMMonitor.h miniAudicle.h $(WXW_DIR)/mAMenuBar.h $(XPMS)\r
+- $(CC) -o $(WXW_DIR)/mAParentFrame.o $(FLAGS) $(INCLUDES) $(WXW_DIR)/mAParentFrame.cpp
++ $(CXX) -o $(WXW_DIR)/mAParentFrame.o $(FLAGS) $(INCLUDES) $(WXW_DIR)/mAParentFrame.cpp
+
+ $(WXW_DIR)/mADocument.o: $(WXW_DIR)/mADocument.cpp $(WXW_DIR)/mADocument.h $(WXW_DIR)/mAView.h
+- $(CC) -o $(WXW_DIR)/mADocument.o $(FLAGS) $(INCLUDES) $(WXW_DIR)/mADocument.cpp
++ $(CXX) -o $(WXW_DIR)/mADocument.o $(FLAGS) $(INCLUDES) $(WXW_DIR)/mADocument.cpp
+
+ $(WXW_DIR)/mAView.o: $(WXW_DIR)/mAView.cpp $(WXW_DIR)/mAView.h
+- $(CC) -o $(WXW_DIR)/mAView.o $(FLAGS) $(INCLUDES) $(WXW_DIR)/mAView.cpp
++ $(CXX) -o $(WXW_DIR)/mAView.o $(FLAGS) $(INCLUDES) $(WXW_DIR)/mAView.cpp
+
+ $(WXW_DIR)/mAVMMonitor.o: $(WXW_DIR)/mAVMMonitor.cpp $(WXW_DIR)/mAVMMonitor.h $(WXW_DIR)/mAParentFrame.h miniAudicle.h
+- $(CC) -o $(WXW_DIR)/mAVMMonitor.o $(FLAGS) $(INCLUDES) $(WXW_DIR)/mAVMMonitor.cpp
++ $(CXX) -o $(WXW_DIR)/mAVMMonitor.o $(FLAGS) $(INCLUDES) $(WXW_DIR)/mAVMMonitor.cpp
+
+ $(WXW_DIR)/mAConsoleMonitor.o: $(WXW_DIR)/mAConsoleMonitor.cpp $(WXW_DIR)/mAConsoleMonitor.h $(WXW_DIR)/mAParentFrame.h
+- $(CC) -o $(WXW_DIR)/mAConsoleMonitor.o $(FLAGS) $(INCLUDES) $(WXW_DIR)/mAConsoleMonitor.cpp
++ $(CXX) -o $(WXW_DIR)/mAConsoleMonitor.o $(FLAGS) $(INCLUDES) $(WXW_DIR)/mAConsoleMonitor.cpp
+
+ $(WXW_DIR)/mAMenuBar.o: $(WXW_DIR)/mAMenuBar.cpp $(WXW_DIR)/mAMenuBar.h $(WXW_DIR)/mAEvents.h
+- $(CC) -o $(WXW_DIR)/mAMenuBar.o $(FLAGS) $(INCLUDES) $(WXW_DIR)/mAMenuBar.cpp
++ $(CXX) -o $(WXW_DIR)/mAMenuBar.o $(FLAGS) $(INCLUDES) $(WXW_DIR)/mAMenuBar.cpp
+
+ clean:
+ rm -rf *.o $(WXW_DIR)/*.o $(BIN_DIR)/miniAudicle
--- /dev/null
+diff -ru miniAudicle-0.1.3.3~/wxw/mAConsoleMonitor.cpp miniAudicle-0.1.3.3/wxw/mAConsoleMonitor.cpp
+--- miniAudicle-0.1.3.3~/wxw/mAConsoleMonitor.cpp 2006-07-26 21:52:18.000000000 +0200
++++ miniAudicle-0.1.3.3/wxw/mAConsoleMonitor.cpp 2006-07-27 15:53:20.000000000 +0200
+@@ -203,14 +203,14 @@
+ {\r
+ len = read( console_monitor->err_fd, buf, BUF_SIZE-1 );\r
+ buf[len] = 0;\r
+- console_monitor->text->AppendText( _T( buf ) );\r
++ console_monitor->text->AppendText( wxString(buf, wxConvUTF8) );\r
+ }\r
+ \r
+ if( pfd[1].revents & POLLIN )\r
+ {\r
+ len = read( console_monitor->out_fd, buf, BUF_SIZE-1 );\r
+ buf[len] = 0;\r
+- console_monitor->text->AppendText( _T( buf ) );\r
++ console_monitor->text->AppendText( wxString(buf, wxConvUTF8) );\r
+ }\r
+ }\r
+ }\r
+@@ -223,7 +223,7 @@
+ //fflush( NULL );\r
+ \r
+ if( fgets( buf, BUF_SIZE, f ) )\r
+- console_monitor->text->AppendText( _T( buf ) );\r
++ console_monitor->text->AppendText( wxString(buf, wxConvUTF8) );\r
+ }\r
+ \r
+ #endif /* __PLATFORM_WIN32__ */\r
+diff -ru miniAudicle-0.1.3.3~/wxw/mAParentFrame.cpp miniAudicle-0.1.3.3/wxw/mAParentFrame.cpp
+--- miniAudicle-0.1.3.3~/wxw/mAParentFrame.cpp 2006-07-26 21:52:18.000000000 +0200
++++ miniAudicle-0.1.3.3/wxw/mAParentFrame.cpp 2006-07-27 15:49:39.000000000 +0200
+@@ -366,7 +366,7 @@
+ sizer->Add( logo, 0, wxALL | wxALIGN_CENTER, 10 );\r
+ \r
+ wxString copystring;\r
+- copystring.Printf( MA_ABOUT, MA_VERSION, CK_VERSION );\r
++ copystring.Printf( wxString(MA_ABOUT, wxConvUTF8), MA_VERSION, CK_VERSION );\r
+ copystring.Prepend( _T( "miniAudicle\n" ) );\r
+ wxStaticText * copytext = new wxStaticText( &about_dialog, wxID_ANY, \r
+ copystring, wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE );\r
+diff -ru miniAudicle-0.1.3.3~/wxw/mAView.cpp miniAudicle-0.1.3.3/wxw/mAView.cpp
+--- miniAudicle-0.1.3.3~/wxw/mAView.cpp 2006-07-26 21:52:18.000000000 +0200
++++ miniAudicle-0.1.3.3/wxw/mAView.cpp 2006-07-27 15:51:55.000000000 +0200
+@@ -179,7 +179,7 @@
+ \r
+ ma->run_code( code, name, cid, cgid, result );\r
+ \r
+- wxString status( _T( result.c_str() ) );\r
++ wxString status(result.c_str(), wxConvUTF8);\r
+ \r
+ frame->SetStatusText( status );\r
+ }\r
+@@ -191,7 +191,7 @@
+ \r
+ ma->remove_code( cid, cgid, result );\r
+ \r
+- wxString status( _T( result.c_str() ) );\r
++ wxString status(result.c_str(), wxConvUTF8);\r
+ \r
+ frame->SetStatusText( status );\r
+ }\r
+@@ -203,7 +203,7 @@
+ \r
+ ma->replace_code( code, cid, cgid, result );\r
+ \r
+- wxString status( _T( result.c_str() ) );\r
++ wxString status( result.c_str(), wxConvUTF8);\r
+ \r
+ frame->SetStatusText( status );\r
+ }\r
+diff -ru miniAudicle-0.1.3.3~/wxw/mAVMMonitor.cpp miniAudicle-0.1.3.3/wxw/mAVMMonitor.cpp
+--- miniAudicle-0.1.3.3~/wxw/mAVMMonitor.cpp 2006-07-26 21:52:18.000000000 +0200
++++ miniAudicle-0.1.3.3/wxw/mAVMMonitor.cpp 2006-07-28 18:05:25.000000000 +0200
+@@ -83,7 +83,7 @@
+ wxSize( 250, 300 ), wxSUNKEN_BORDER );\r
+ sizer->Add( grid, 2, wxALL | wxALIGN_CENTER | wxEXPAND, 10 );\r
+ \r
+- vm_start = new wxButton( this, mAID_TOGGLE_VM, "Start Virtual Machine" );\r
++ vm_start = new wxButton( this, mAID_TOGGLE_VM, _T( "Start Virtual Machine" ) );\r
+ sizer->Add( vm_start, 0, wxBOTTOM | wxALIGN_CENTER, 10 );\r
+ \r
+ grid->CreateGrid( 0, 4 );\r
+@@ -220,27 +220,27 @@
+ now = ( time_t ) ( status.now_system / status.srate );\r
+ if( now != last_now )\r
+ {\r
+- time_counter->SetLabel( wxString::Format( "running time: %u:%02u",\r
++ time_counter->SetLabel( wxString::Format( _T( "running time: %u:%02u" ),\r
+ now / 60, now % 60 ) );\r
+ last_now = now;\r
+ }\r
+ \r
+ if( num_shreds != last_num_shreds )\r
+ {\r
+- shred_count->SetLabel( wxString::Format( "shreds: %u", num_shreds ) );\r
++ shred_count->SetLabel( wxString::Format( _T( "shreds: %u" ), num_shreds ) );\r
+ last_num_shreds = num_shreds;\r
+ }\r
+ \r
+ for( int i = 0; i < num_shreds; i++ )\r
+ {\r
+- temp = wxString::Format( "%u", status.list[i]->xid );\r
++ temp = wxString::Format( _T( "%u" ), status.list[i]->xid );\r
+ grid->SetCellValue( i, 0, temp );\r
+ \r
+- temp = wxString::Format( "%s", status.list[i]->name.c_str() );\r
++ temp = wxString(status.list[i]->name.c_str(), wxConvUTF8);\r
+ grid->SetCellValue( i, 1, temp );\r
+ \r
+ age = ( time_t ) ( ( status.now_system - status.list[i]->start ) / status.srate );\r
+- temp = wxString::Format( "%u:%02u", age / 60, age % 60 );\r
++ temp = wxString::Format( _T( "%u:%02u" ), age / 60, age % 60 );\r
+ grid->SetCellValue( i, 2, temp );\r
+ \r
+ grid->SetCellValue( i, 3, _T( "-" ) );\r