ConvertToImage: Check !Ok() (we may not have any ref data at all) and if

[wxWidgets.git] / src / makeprog.g95

diff --git a/src/makeprog.g95 b/src/makeprog.g95
index 98287d1450d165e218b991b1484bea3b29587491..adc0ab29288efc165790e5137c445ab36faee40f 100644 (file)
--- a/src/makeprog.g95
+++ b/src/makeprog.g95
@@ -14,7 +14,7 @@ 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)
@@ -22,10 +22,11 @@ $(TARGET)_resources.o:  $(TARGET).rc
 clean:
        -$(RM) *.o
        -$(RM) $(TARGET)_resources.o
-       -$(RM) core 
+       -$(RM) core
        -$(RM) *.rsc
        -$(RM) *.res
        -$(RM) *.exe
 
 cleanall: clean
-       -$(RM) $(TARGET).exe 
+       -$(RM) $(TARGET).exe
+