Mercurial > ecos-v2_0-branch
diff host/tools/configtool/standalone/wxwin/makefile.gnu @ 768:261830f283c6
* Merge patches to build configtool against wxWindows 2.4.0 using
Cygwin GCC from the trunk.
| author | jld |
|---|---|
| date | Thu, 20 Mar 2003 09:44:44 +0000 |
| parents | 9b330aaacf9b |
| children | 45be05d8085f |
line wrap: on
line diff
--- a/host/tools/configtool/standalone/wxwin/makefile.gnu +++ b/host/tools/configtool/standalone/wxwin/makefile.gnu @@ -27,13 +27,13 @@ EXTRALDFLAGS=-L$(TCLDIR)/lib -L$(INSTALL ifeq "$(OSTYPE)" "cygwin" PROGRAM=configtool.exe - CPPFLAGS=-I$(WXDIR)/include -I$(WXDIR)/lib/wx/include -DSTRICT -DWINVER=0x0400 -D_WIN32 -D__GNUWIN32__ -D__WIN95__ -D__WIN32__ -D_X86_=1 -DWIN32 - LDFLAGS=-L$(WXDIR)/lib -lwx -lstdc++ -lwinspool -lwinmm -lshell32 -lcomctl32 -lctl3d32 -ladvapi32 -lwsock32 -lglu32 -lgdi32 -lcomdlg32 -lole32 -luuid -lshlwapi -lpng -lzlib + CPPFLAGS=`$(WXDIR)/bin/wx-config --cppflags` -D_WIN32 -D__WIN32__ -DSTRICT + LDFLAGS=`$(WXDIR)/bin/wx-config --libs` -lshlwapi EXTRAOBJECTS=$(CTBUILDDIR)/configtoolres.o else PROGRAM=configtool - CPPFLAGS=-I$(WXDIR)/include -I$(WXDIR)/lib/wx/include -DGTK_NO_CHECK_CASTS -D__WXGTK__ -D__USE_WXCONFIG__ - LDFLAGS=-L$(WXDIR)/lib -L/usr/X11R6/lib -lwx_gtk -lgtk -lgdk -rdynamic -lgmodule -lgthread -lglib -lpthread -ldl -lXi -lXext -lX11 -lm + CPPFLAGS=`$(WXDIR)/bin/wx-config --cppflags` + LDFLAGS=`$(WXDIR)/bin/wx-config --libs` EXTRAOBJECTS= endif @@ -118,7 +118,7 @@ install: $(CTBUILDDIR)/$(PROGRAM) $(CC) $(CPPDEBUGOPTIONS) -c $(EXTRACPPFLAGS) $(CPPFLAGS) -o $@ $< $(CTBUILDDIR)/configtoolres.o: $(CTDIR)/configtool.rc - $(RESCOMP) -i $< -o $@ --preprocessor "$(CC) -c -E -xc-header -DRC_INVOKED" --include-dir $(WXDIR)/include --include-dir $(CTDIR) --define __WIN32__ --define __WIN95__ --define __GNUWIN32__ + $(RESCOMP) -i $< -o $@ --preprocessor "$(CC) -c -E -xc-header -DRC_INVOKED" --include-dir $(WXDIR)/include --include-dir $(CTDIR) --define __GNUWIN32__ clean: rm -f $(CTBUILDDIR)/$(PROGRAM) $(CTBUILDDIR)/*.o