X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dbda9e86f0e5ec1184bc16d135bb7205bc99236e..49e3e2c25f93dd8114b36155de1756139b7f18b9:/src/makeprog.g95

diff --git a/src/makeprog.g95 b/src/makeprog.g95
index 391881439c..adc0ab2928 100644
--- a/src/makeprog.g95
+++ b/src/makeprog.g95
@@ -7,17 +7,26 @@
 #
 # Include file for Cygwin/Mingw32 samples
 
-WXDIR = $(WXWIN)
+# WXDIR = $(WXWIN)
 
 include $(WXDIR)/src/makeg95.env
 
 all:    $(TARGET)$(GUISUFFIX)$(EXESUFF) $(TARGET)_resources.$(OBJSUFF) $(EXTRATARGETS)
 
 $(TARGET)$(GUISUFFIX)$(EXESUFF):	$(OBJECTS) $(TARGET)_resources.$(OBJSUFF) $(WXLIB)
-	$(CC) $(LDFLAGS) -o $(TARGET)$(GUISUFFIX)$(EXESUFF) $(OBJECTS) $(TARGET)_resources.$(OBJSUFF) $(LDLIBS)
+	$(CXX) $(ALL_LDFLAGS) -o $(TARGET)$(GUISUFFIX)$(EXESUFF) $(OBJECTS) $(TARGET)_resources.$(OBJSUFF) $(LDLIBS)
 
 $(TARGET)_resources.o:  $(TARGET).rc
 	$(RESCOMP) $(RCINPUTSWITCH) $(TARGET).rc $(RCOUTPUTSWITCH) $(TARGET)_resources.o $(RESFLAGS)
 
 clean:
-	rm -f $(OBJECTS) $(TARGET)_resources.o $(TARGET).exe core *.rsc *.res
+	-$(RM) *.o
+	-$(RM) $(TARGET)_resources.o
+	-$(RM) core
+	-$(RM) *.rsc
+	-$(RM) *.res
+	-$(RM) *.exe
+
+cleanall: clean
+	-$(RM) $(TARGET).exe
+