--- odalaunch/Makefile.orig	2011-11-05 05:00:03.000000000 +0100
+++ odalaunch/Makefile	2011-12-01 05:33:47.418968116 +0100
@@ -23,11 +23,11 @@
 	-I./res \
 	-I../odalpapi
 
-CC = g++
-LD = g++
+CC = $(CXX)
+LD = $(CC)
 
-WXCONFIG = wx-config
-WXRC = wxrc
+WXCONFIG = $(WX_CONFIG)
+WXRC = $(WXRC_CMD)
 
 # Sometimes wx-config will use the lowest version available, which is what
 # we do no want! -- GhostlyDeath
