Added configtool to configure and Makefile.in

[wxWidgets.git] / utils / configtool / src / Makefile

diff --git a/utils/configtool/src/Makefile b/utils/configtool/src/Makefile
index d8103b5e4cbdf360c53f24d0c1c2d49efcc4f066..65483082d05b3ca68242971483d1c28ee2fc7b5d 100644 (file)
--- a/utils/configtool/src/Makefile
+++ b/utils/configtool/src/Makefile
@@ -63,10 +63,12 @@ APPEXTRADEFS= \
 
 #  -I$(UTILSDIR) \
 
-WXVERSION=2.4
+WXVERSION=2.5
 
 # Use the small C++ support library
-APPEXTRALIBS=-lsupc++ ${top_builddir}/lib/libwx_$(WXTOOLKIT)$(WXDEBUGSUFFIX)_xrc-$(WXVERSION).a
+APPEXTRALIBS=-lsupc++
+
+# ${top_builddir}/lib/libwx_$(WXTOOLKIT)$(WXDEBUGSUFFIX)_xrc-$(WXVERSION).a
 
 PLATFORM_OS=$(shell echo $(OS))
 
@@ -125,8 +127,19 @@ else
 include $(top_builddir)/src/makeprog.env
 endif
 
+# Need to place -lsupc++ at end of libs or we get
+# link errors. Note the := syntax to prevent a
+# recursive variable error.
+LDLIBS:=${LDLIBS} -lsupc++
+
+# Only omit C++ libs for economy of size on Unix
+ifeq "$(WXTOOLKIT)" "msw"
+CC=c++
+CXX=c++
+else
 CC=gcc
 CXX=gcc
+endif
 
 mkbuilddir:
        mkdir -p $(APPBUILDDIR)
@@ -211,7 +224,7 @@ $(APPBUILDDIR)/property.o: $(APPSRCDIR)/property.cpp $(APPINCDIR)/property.h $(A
 $(APPBUILDDIR)/settingsdialog.o: $(APPSRCDIR)/settingsdialog.cpp $(APPINCDIR)/settingsdialog.h $(APPSRCDIR)/symbols.h
        $(CXX) -c $(CXXFLAGS) $(APPEXTRADEFS) -o $@ $<
 
-$(APPBUILDDIR)/utils.o: $(APPSRCDIR)/utils.cpp $(APPINCDIR)/imagewindow.h $(APPSRCDIR)/symbols.h
+$(APPBUILDDIR)/utils.o: $(APPSRCDIR)/utils.cpp $(APPINCDIR)/utils.h $(APPSRCDIR)/symbols.h
        $(CXX) -c $(CXXFLAGS) $(APPEXTRADEFS) -o $@ $<
 
 $(APPBUILDDIR)/wxconfigtool_resources.o: $(APPSRCDIR)/wxconfigtool.rc