-# This file was automatically generated by tmake at 16:36, 2001/11/20
+# This file was automatically generated by tmake
# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE G95.T!
#
# DLL Name, if building wxWindows as a DLL.
ifdef WXMAKINGDLL
-WXDLL = $(WXDIR)/lib/wxmsw$(WXVERSION)$(UNIEXT).dll
-WXDEF = wxmsw$(WXVERSION)$(UNIEXT).def
+WXDLL = $(WXDIR)/lib/wx$(TOOLKIT)$(WXVERSION)$(UNIEXT)$(DEBEXT).dll
+WXDEF = wx$(TOOLKIT)$(WXVERSION)$(UNIEXT)$(DEBEXT).def
DLL_EXTRA_LIBS = $(WXDIR)/lib/libzlib.a \
$(WXDIR)/lib/libpng.a $(WXDIR)/lib/libjpeg.a \
$(WXDIR)/lib/libtiff.a $(WXDIR)/lib/libregex.a
DLL_LDFLAGS = -L$(WXDIR)/lib
-DLL_LDLIBS = -mwindows -lcomctl32 -lctl3d32 -lole32 -loleaut32 \
- -luuid -lrpcrt4 -lodbc32 -lwinmm -lopengl32 \
- -lwsock32 $(DLL_EXTRA_LIBS) \
- -lstdc++
+DLL_BASE_LDLIBS = $(DLL_EXTRA_LIBS) -lstdc++ -lwsock32
+ifeq ($(wxUSE_GUI),0)
+ DLL_LDLIBS = $(DLL_BASE_LDLIBS)
+else
+ DLL_LDLIBS = -lcomctl32 -lctl3d32 -lole32 -loleaut32 \
+ -luuid -lrpcrt4 -lodbc32 -lwinmm -lopengl32 \
+ $(DLL_BASE_LDLIBS)
+endif
endif
# Subordinate library possibilities
# Only use the WIN32 wxDirDialog if we have a recent
# version of Mingw32
-ifeq ($(MINGW32),1)
- ifneq "$(findstring 2.95, $(MINGW32VERSION))" ""
+ifeq "$(strip $(RECENT_MINGW))" "yes"
DIRDLGOBJ = $(MSWDIR)/dirdlg.$(OBJSUFF)
- else
- DIRDLGOBJ = $(GENDIR)/dirdlgg.$(OBJSUFF)
- endif
else
DIRDLGOBJ = $(GENDIR)/dirdlgg.$(OBJSUFF)
endif
+ifeq ($(wxUSE_GUI),0)
+ DIRDLGOBJ =
+endif
+
+GENERICOBJS_BASE = \
+
GENERICOBJS = \
+ $(GENERICOBJS_BASE) \
$(GENDIR)/busyinfo.$(OBJSUFF) \
$(GENDIR)/calctrl.$(OBJSUFF) \
$(GENDIR)/choicdgg.$(OBJSUFF) \
+ $(GENDIR)/dcbuffer.$(OBJSUFF) \
$(GENDIR)/dcpsg.$(OBJSUFF) \
$(GENDIR)/dirctrlg.$(OBJSUFF) \
$(GENDIR)/dragimgg.$(OBJSUFF) \
$(GENDIR)/treelay.$(OBJSUFF) \
$(GENDIR)/wizard.$(OBJSUFF)
-COMMONOBJS = \
- $(COMMDIR)/y_tab.$(OBJSUFF) \
- $(COMMDIR)/appcmn.$(OBJSUFF) \
- $(COMMDIR)/choiccmn.$(OBJSUFF) \
- $(COMMDIR)/clipcmn.$(OBJSUFF) \
+COMMONOBJS_BASE = \
+ $(COMMDIR)/appcmn.$(OBJSUFF) \
$(COMMDIR)/clntdata.$(OBJSUFF) \
$(COMMDIR)/cmdline.$(OBJSUFF) \
- $(COMMDIR)/cmdproc.$(OBJSUFF) \
- $(COMMDIR)/cmndata.$(OBJSUFF) \
$(COMMDIR)/config.$(OBJSUFF) \
- $(COMMDIR)/containr.$(OBJSUFF) \
- $(COMMDIR)/cshelp.$(OBJSUFF) \
- $(COMMDIR)/ctrlcmn.$(OBJSUFF) \
- $(COMMDIR)/ctrlsub.$(OBJSUFF) \
$(COMMDIR)/datetime.$(OBJSUFF) \
$(COMMDIR)/datstrm.$(OBJSUFF) \
$(COMMDIR)/db.$(OBJSUFF) \
- $(COMMDIR)/dbgrid.$(OBJSUFF) \
$(COMMDIR)/dbtable.$(OBJSUFF) \
- $(COMMDIR)/dcbase.$(OBJSUFF) \
$(COMMDIR)/dircmn.$(OBJSUFF) \
- $(COMMDIR)/dlgcmn.$(OBJSUFF) \
- $(COMMDIR)/dndcmn.$(OBJSUFF) \
- $(COMMDIR)/dobjcmn.$(OBJSUFF) \
- $(COMMDIR)/docmdi.$(OBJSUFF) \
- $(COMMDIR)/docview.$(OBJSUFF) \
- $(COMMDIR)/dseldlg.$(OBJSUFF) \
$(COMMDIR)/dynarray.$(OBJSUFF) \
$(COMMDIR)/dynlib.$(OBJSUFF) \
- $(COMMDIR)/effects.$(OBJSUFF) \
+ $(COMMDIR)/dynload.$(OBJSUFF) \
$(COMMDIR)/encconv.$(OBJSUFF) \
$(COMMDIR)/event.$(OBJSUFF) \
$(COMMDIR)/extended.$(OBJSUFF) \
- $(COMMDIR)/fddlgcmn.$(OBJSUFF) \
$(COMMDIR)/ffile.$(OBJSUFF) \
$(COMMDIR)/file.$(OBJSUFF) \
$(COMMDIR)/fileconf.$(OBJSUFF) \
$(COMMDIR)/filefn.$(OBJSUFF) \
$(COMMDIR)/filename.$(OBJSUFF) \
$(COMMDIR)/filesys.$(OBJSUFF) \
- $(COMMDIR)/fontcmn.$(OBJSUFF) \
$(COMMDIR)/fontmap.$(OBJSUFF) \
- $(COMMDIR)/framecmn.$(OBJSUFF) \
$(COMMDIR)/fs_inet.$(OBJSUFF) \
$(COMMDIR)/fs_mem.$(OBJSUFF) \
$(COMMDIR)/fs_zip.$(OBJSUFF) \
$(COMMDIR)/ftp.$(OBJSUFF) \
- $(COMMDIR)/gaugecmn.$(OBJSUFF) \
- $(COMMDIR)/gdicmn.$(OBJSUFF) \
- $(COMMDIR)/geometry.$(OBJSUFF) \
- $(COMMDIR)/gifdecod.$(OBJSUFF) \
$(COMMDIR)/hash.$(OBJSUFF) \
- $(COMMDIR)/helpbase.$(OBJSUFF) \
+ $(COMMDIR)/hashmap.$(OBJSUFF) \
$(COMMDIR)/http.$(OBJSUFF) \
- $(COMMDIR)/imagall.$(OBJSUFF) \
- $(COMMDIR)/imagbmp.$(OBJSUFF) \
- $(COMMDIR)/image.$(OBJSUFF) \
- $(COMMDIR)/imaggif.$(OBJSUFF) \
- $(COMMDIR)/imagjpeg.$(OBJSUFF) \
- $(COMMDIR)/imagpcx.$(OBJSUFF) \
- $(COMMDIR)/imagpng.$(OBJSUFF) \
- $(COMMDIR)/imagpnm.$(OBJSUFF) \
- $(COMMDIR)/imagtiff.$(OBJSUFF) \
- $(COMMDIR)/imagxpm.$(OBJSUFF) \
$(COMMDIR)/intl.$(OBJSUFF) \
$(COMMDIR)/ipcbase.$(OBJSUFF) \
- $(COMMDIR)/layout.$(OBJSUFF) \
- $(COMMDIR)/lboxcmn.$(OBJSUFF) \
$(COMMDIR)/list.$(OBJSUFF) \
$(COMMDIR)/log.$(OBJSUFF) \
$(COMMDIR)/longlong.$(OBJSUFF) \
- $(COMMDIR)/matrix.$(OBJSUFF) \
$(COMMDIR)/memory.$(OBJSUFF) \
- $(COMMDIR)/menucmn.$(OBJSUFF) \
$(COMMDIR)/mimecmn.$(OBJSUFF) \
$(COMMDIR)/module.$(OBJSUFF) \
+ $(COMMDIR)/msgout.$(OBJSUFF) \
$(COMMDIR)/mstream.$(OBJSUFF) \
- $(COMMDIR)/nbkbase.$(OBJSUFF) \
$(COMMDIR)/object.$(OBJSUFF) \
- $(COMMDIR)/objstrm.$(OBJSUFF) \
- $(COMMDIR)/paper.$(OBJSUFF) \
- $(COMMDIR)/popupcmn.$(OBJSUFF) \
- $(COMMDIR)/prntbase.$(OBJSUFF) \
$(COMMDIR)/process.$(OBJSUFF) \
$(COMMDIR)/protocol.$(OBJSUFF) \
- $(COMMDIR)/quantize.$(OBJSUFF) \
- $(COMMDIR)/radiocmn.$(OBJSUFF) \
$(COMMDIR)/regex.$(OBJSUFF) \
- $(COMMDIR)/resource.$(OBJSUFF) \
$(COMMDIR)/sckaddr.$(OBJSUFF) \
$(COMMDIR)/sckfile.$(OBJSUFF) \
$(COMMDIR)/sckipc.$(OBJSUFF) \
$(COMMDIR)/sckstrm.$(OBJSUFF) \
- $(COMMDIR)/serbase.$(OBJSUFF) \
- $(COMMDIR)/sizer.$(OBJSUFF) \
$(COMMDIR)/socket.$(OBJSUFF) \
- $(COMMDIR)/statbar.$(OBJSUFF) \
$(COMMDIR)/strconv.$(OBJSUFF) \
$(COMMDIR)/stream.$(OBJSUFF) \
$(COMMDIR)/string.$(OBJSUFF) \
$(COMMDIR)/sysopt.$(OBJSUFF) \
- $(COMMDIR)/tbarbase.$(OBJSUFF) \
$(COMMDIR)/textbuf.$(OBJSUFF) \
- $(COMMDIR)/textcmn.$(OBJSUFF) \
$(COMMDIR)/textfile.$(OBJSUFF) \
$(COMMDIR)/timercmn.$(OBJSUFF) \
$(COMMDIR)/tokenzr.$(OBJSUFF) \
- $(COMMDIR)/toplvcmn.$(OBJSUFF) \
- $(COMMDIR)/treebase.$(OBJSUFF) \
$(COMMDIR)/txtstrm.$(OBJSUFF) \
$(COMMDIR)/unzip.$(OBJSUFF) \
$(COMMDIR)/url.$(OBJSUFF) \
$(COMMDIR)/utilscmn.$(OBJSUFF) \
- $(COMMDIR)/valgen.$(OBJSUFF) \
- $(COMMDIR)/validate.$(OBJSUFF) \
- $(COMMDIR)/valtext.$(OBJSUFF) \
$(COMMDIR)/variant.$(OBJSUFF) \
$(COMMDIR)/wfstream.$(OBJSUFF) \
- $(COMMDIR)/wincmn.$(OBJSUFF) \
$(COMMDIR)/wxchar.$(OBJSUFF) \
- $(COMMDIR)/wxexpr.$(OBJSUFF) \
- $(COMMDIR)/xpmdecod.$(OBJSUFF) \
$(COMMDIR)/zipstrm.$(OBJSUFF) \
$(COMMDIR)/zstream.$(OBJSUFF)
+COMMONOBJS_BASEONLY = \
+ $(COMMDIR)/init.$(OBJSUFF)
+
+COMMONOBJS = \
+ $(COMMONOBJS_BASE) \
+ $(COMMDIR)/y_tab.$(OBJSUFF) \
+ $(COMMDIR)/artprov.$(OBJSUFF) \
+ $(COMMDIR)/artstd.$(OBJSUFF) \
+ $(COMMDIR)/choiccmn.$(OBJSUFF) \
+ $(COMMDIR)/clipcmn.$(OBJSUFF) \
+ $(COMMDIR)/cmdproc.$(OBJSUFF) \
+ $(COMMDIR)/cmndata.$(OBJSUFF) \
+ $(COMMDIR)/containr.$(OBJSUFF) \
+ $(COMMDIR)/cshelp.$(OBJSUFF) \
+ $(COMMDIR)/ctrlcmn.$(OBJSUFF) \
+ $(COMMDIR)/ctrlsub.$(OBJSUFF) \
+ $(COMMDIR)/dbgrid.$(OBJSUFF) \
+ $(COMMDIR)/dcbase.$(OBJSUFF) \
+ $(COMMDIR)/dlgcmn.$(OBJSUFF) \
+ $(COMMDIR)/dndcmn.$(OBJSUFF) \
+ $(COMMDIR)/dobjcmn.$(OBJSUFF) \
+ $(COMMDIR)/docmdi.$(OBJSUFF) \
+ $(COMMDIR)/docview.$(OBJSUFF) \
+ $(COMMDIR)/dseldlg.$(OBJSUFF) \
+ $(COMMDIR)/effects.$(OBJSUFF) \
+ $(COMMDIR)/fddlgcmn.$(OBJSUFF) \
+ $(COMMDIR)/fontcmn.$(OBJSUFF) \
+ $(COMMDIR)/framecmn.$(OBJSUFF) \
+ $(COMMDIR)/gaugecmn.$(OBJSUFF) \
+ $(COMMDIR)/gdicmn.$(OBJSUFF) \
+ $(COMMDIR)/geometry.$(OBJSUFF) \
+ $(COMMDIR)/gifdecod.$(OBJSUFF) \
+ $(COMMDIR)/helpbase.$(OBJSUFF) \
+ $(COMMDIR)/iconbndl.$(OBJSUFF) \
+ $(COMMDIR)/imagall.$(OBJSUFF) \
+ $(COMMDIR)/imagbmp.$(OBJSUFF) \
+ $(COMMDIR)/image.$(OBJSUFF) \
+ $(COMMDIR)/imagfill.$(OBJSUFF) \
+ $(COMMDIR)/imaggif.$(OBJSUFF) \
+ $(COMMDIR)/imagiff.$(OBJSUFF) \
+ $(COMMDIR)/imagjpeg.$(OBJSUFF) \
+ $(COMMDIR)/imagpcx.$(OBJSUFF) \
+ $(COMMDIR)/imagpng.$(OBJSUFF) \
+ $(COMMDIR)/imagpnm.$(OBJSUFF) \
+ $(COMMDIR)/imagtiff.$(OBJSUFF) \
+ $(COMMDIR)/imagxpm.$(OBJSUFF) \
+ $(COMMDIR)/layout.$(OBJSUFF) \
+ $(COMMDIR)/lboxcmn.$(OBJSUFF) \
+ $(COMMDIR)/matrix.$(OBJSUFF) \
+ $(COMMDIR)/menucmn.$(OBJSUFF) \
+ $(COMMDIR)/nbkbase.$(OBJSUFF) \
+ $(COMMDIR)/paper.$(OBJSUFF) \
+ $(COMMDIR)/popupcmn.$(OBJSUFF) \
+ $(COMMDIR)/prntbase.$(OBJSUFF) \
+ $(COMMDIR)/quantize.$(OBJSUFF) \
+ $(COMMDIR)/radiocmn.$(OBJSUFF) \
+ $(COMMDIR)/resource.$(OBJSUFF) \
+ $(COMMDIR)/settcmn.$(OBJSUFF) \
+ $(COMMDIR)/sizer.$(OBJSUFF) \
+ $(COMMDIR)/statbar.$(OBJSUFF) \
+ $(COMMDIR)/tbarbase.$(OBJSUFF) \
+ $(COMMDIR)/textcmn.$(OBJSUFF) \
+ $(COMMDIR)/toplvcmn.$(OBJSUFF) \
+ $(COMMDIR)/treebase.$(OBJSUFF) \
+ $(COMMDIR)/valgen.$(OBJSUFF) \
+ $(COMMDIR)/validate.$(OBJSUFF) \
+ $(COMMDIR)/valtext.$(OBJSUFF) \
+ $(COMMDIR)/wincmn.$(OBJSUFF) \
+ $(COMMDIR)/wxexpr.$(OBJSUFF) \
+ $(COMMDIR)/xpmdecod.$(OBJSUFF)
+
HTMLOBJS = \
$(HTMLDIR)/helpctrl.$(OBJSUFF) \
$(HTMLDIR)/helpdata.$(OBJSUFF) \
$(HTMLDIR)/m_layout.$(OBJSUFF) \
$(HTMLDIR)/m_links.$(OBJSUFF) \
$(HTMLDIR)/m_list.$(OBJSUFF) \
- $(HTMLDIR)/m_meta.$(OBJSUFF) \
$(HTMLDIR)/m_pre.$(OBJSUFF) \
+ $(HTMLDIR)/m_style.$(OBJSUFF) \
$(HTMLDIR)/m_tables.$(OBJSUFF) \
$(HTMLDIR)/winpars.$(OBJSUFF)
+MSWOBJS_BASE = \
+ $(MSWDIR)/dde.$(OBJSUFF) \
+ $(MSWDIR)/dir.$(OBJSUFF) \
+ $(MSWDIR)/gsocket.$(OBJSUFF) \
+ $(MSWDIR)/gsockmsw.$(OBJSUFF) \
+ $(MSWDIR)/main.$(OBJSUFF) \
+ $(MSWDIR)/mimetype.$(OBJSUFF) \
+ $(MSWDIR)/regconf.$(OBJSUFF) \
+ $(MSWDIR)/registry.$(OBJSUFF) \
+ $(MSWDIR)/snglinst.$(OBJSUFF) \
+ $(MSWDIR)/thread.$(OBJSUFF) \
+ $(MSWDIR)/utils.$(OBJSUFF) \
+ $(MSWDIR)/utilsexc.$(OBJSUFF) \
+ $(MSWDIR)/volume.$(OBJSUFF)
+
MSWOBJS = \
+ $(MSWOBJS_BASE) \
$(MSWDIR)/accel.$(OBJSUFF) \
$(MSWDIR)/app.$(OBJSUFF) \
$(MSWDIR)/bitmap.$(OBJSUFF) \
$(MSWDIR)/dcmemory.$(OBJSUFF) \
$(MSWDIR)/dcprint.$(OBJSUFF) \
$(MSWDIR)/dcscreen.$(OBJSUFF) \
- $(MSWDIR)/dde.$(OBJSUFF) \
$(MSWDIR)/dialog.$(OBJSUFF) \
$(MSWDIR)/dialup.$(OBJSUFF) \
$(MSWDIR)/dib.$(OBJSUFF) \
$(MSWDIR)/dibutils.$(OBJSUFF) \
- $(MSWDIR)/dir.$(OBJSUFF) \
$(MSWDIR)/dragimag.$(OBJSUFF) \
$(MSWDIR)/enhmeta.$(OBJSUFF) \
$(MSWDIR)/evtloop.$(OBJSUFF) \
$(MSWDIR)/gdiimage.$(OBJSUFF) \
$(MSWDIR)/gdiobj.$(OBJSUFF) \
$(MSWDIR)/glcanvas.$(OBJSUFF) \
- $(MSWDIR)/gsocket.$(OBJSUFF) \
- $(MSWDIR)/gsockmsw.$(OBJSUFF) \
$(MSWDIR)/helpbest.$(OBJSUFF) \
$(MSWDIR)/helpchm.$(OBJSUFF) \
$(MSWDIR)/helpwin.$(OBJSUFF) \
$(MSWDIR)/icon.$(OBJSUFF) \
$(MSWDIR)/imaglist.$(OBJSUFF) \
+ $(MSWDIR)/iniconf.$(OBJSUFF) \
$(MSWDIR)/joystick.$(OBJSUFF) \
$(MSWDIR)/listbox.$(OBJSUFF) \
$(MSWDIR)/listctrl.$(OBJSUFF) \
- $(MSWDIR)/main.$(OBJSUFF) \
$(MSWDIR)/mdi.$(OBJSUFF) \
$(MSWDIR)/menu.$(OBJSUFF) \
$(MSWDIR)/menuitem.$(OBJSUFF) \
$(MSWDIR)/metafile.$(OBJSUFF) \
- $(MSWDIR)/mimetype.$(OBJSUFF) \
$(MSWDIR)/minifram.$(OBJSUFF) \
$(MSWDIR)/msgdlg.$(OBJSUFF) \
+ $(MSWDIR)/mslu.$(OBJSUFF) \
$(MSWDIR)/nativdlg.$(OBJSUFF) \
$(MSWDIR)/notebook.$(OBJSUFF) \
$(MSWDIR)/ownerdrw.$(OBJSUFF) \
$(MSWDIR)/palette.$(OBJSUFF) \
$(MSWDIR)/pen.$(OBJSUFF) \
$(MSWDIR)/penwin.$(OBJSUFF) \
+ $(MSWDIR)/popupwin.$(OBJSUFF) \
$(MSWDIR)/printdlg.$(OBJSUFF) \
$(MSWDIR)/printwin.$(OBJSUFF) \
$(MSWDIR)/radiobox.$(OBJSUFF) \
$(MSWDIR)/radiobut.$(OBJSUFF) \
- $(MSWDIR)/regconf.$(OBJSUFF) \
$(MSWDIR)/region.$(OBJSUFF) \
- $(MSWDIR)/registry.$(OBJSUFF) \
$(MSWDIR)/scrolbar.$(OBJSUFF) \
$(MSWDIR)/settings.$(OBJSUFF) \
$(MSWDIR)/slider95.$(OBJSUFF) \
- $(MSWDIR)/snglinst.$(OBJSUFF) \
$(MSWDIR)/spinbutt.$(OBJSUFF) \
$(MSWDIR)/spinctrl.$(OBJSUFF) \
$(MSWDIR)/statbmp.$(OBJSUFF) \
$(MSWDIR)/tbar95.$(OBJSUFF) \
$(MSWDIR)/textctrl.$(OBJSUFF) \
$(MSWDIR)/tglbtn.$(OBJSUFF) \
- $(MSWDIR)/thread.$(OBJSUFF) \
$(MSWDIR)/timer.$(OBJSUFF) \
$(MSWDIR)/tooltip.$(OBJSUFF) \
$(MSWDIR)/toplevel.$(OBJSUFF) \
$(MSWDIR)/treectrl.$(OBJSUFF) \
- $(MSWDIR)/utils.$(OBJSUFF) \
- $(MSWDIR)/utilsexc.$(OBJSUFF) \
$(MSWDIR)/wave.$(OBJSUFF) \
$(MSWDIR)/window.$(OBJSUFF)
+ADVANCEDOBJS_BASE = \
+
ADVANCEDOBJS = \
+ $(ADVANCEDOBJS_BASE) \
$(COMMDIR)/odbc.$(OBJSUFF) \
$(MSWDIR)/ole/automtn.$(OBJSUFF) \
$(MSWDIR)/ole/dataobj.$(OBJSUFF) \
$(TIFFDIR)/tif_write.o \
$(TIFFDIR)/tif_zip.o
-ifeq ($(MINGW32),1)
- ifneq "$(findstring 2.95, $(MINGW32VERSION))" ""
- OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(DIRDLGOBJ) $(ADVANCEDOBJS)
- else
- OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(DIRDLGOBJ)
- endif
+ifeq "$(strip $(RECENT_MINGW))" "yes"
+ OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(DIRDLGOBJ) $(ADVANCEDOBJS)
else
OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(DIRDLGOBJ)
endif
-
-# MBN: if anyone has a better solution for this kludge, step
-# forward, *please*
-# this tests is we are on cygwin or not ( will _not_ work if you are using
-# ZSH on plain Win32, tought ); it uses the presence of "/"
-# in the PATH variable
+ifeq ($(wxUSE_GUI),0)
+ OBJECTS = $(MSWOBJS_BASE) $(COMMONOBJS_BASE) $(COMMONOBJS_BASEONLY) $(GENERICOBJS_BASE)
+endif
# how do you do "VAR=\" ? BLEAGH!
BACKSLASH=$(subst a,\,a)
-ifeq (,$(findstring /,$(PATH)))
- IS_CYGWIN=0
+ifeq (,$(findstring $(OSTYPE),"cygwin!msys"))
PATH_SEPARATOR:=$(BACKSLASH)
PATH_SUBST=/
else
- IS_CYGWIN=1
PATH_SEPARATOR=/
PATH_SUBST:=$(BACKSLASH)
endif
#ARCHINCDIR=$(subst $(PATH_SUBST),$(PATH_SEPARATOR),$(WXDIR)/lib/msw$(INCEXT))
-ARCHINCDIR=$(WXDIR)/lib/msw$(INCEXT)
+ARCHINCDIR=$(WXDIR)/lib/$(TOOLKIT)$(INCEXT)
SETUP_H=$(ARCHINCDIR)/wx/setup.h
mkdir $(subst $(PATH_SUBST),$(PATH_SEPARATOR),$(ARCHINCDIR))
mkdir $(subst $(PATH_SUBST),$(PATH_SEPARATOR),$(ARCHINCDIR)/wx)
-$(SETUP_H): $(ARCHINCDIR)/wx
- $(COPY) $(WXDIR)/include/wx/msw/setup.h $@
+# Copy ALWAYS uses forward slashes now.
+
+$(SETUP_H): $(ARCHINCDIR)/wx $(WXDIR)/include/wx/msw/setup.h
+ $(COPY) $(WXDIR)/include/wx/msw/setup.h $(subst $(BACKSLASH),/,$@)
+# $(COPY) $(WXDIR)/include/wx/msw/setup.h $@
# $(COPY) $(subst $(PATH_SUBST),$(PATH_SEPARATOR),$(WXDIR)/include/wx/msw/setup.h) $(subst $(PATH_SUBST),$(PATH_SEPARATOR),$@)
ifndef WXMAKINGDLL
ifeq "$(strip $(LD_SUPPORTS_SHARED))" "yes"
$(WXDLL): $(OBJECTS) $(EXTRAOBJS)
- $(CC) -shared -o $@ \
+ $(CXX) -shared -o $@ \
-Wl,--output-def,$(WXDEF) \
-Wl,--out-implib,$(WXLIB) \
$(OBJECTS) $(EXTRAOBJS) \
- $(DLL_LDFLAGS) $(DLL_LDLIBS)
+ $(DLL_LDFLAGS) $(DLL_LDLIBS) \
+ $(ALL_LDFLAGS_DLL)
else
ifeq ($(MINGW32),1)
$(OBJECTS) $(EXTRAOBJS) $(DLL_EXTRA_LIBS)
$(WXDLL): $(OBJECTS) $(EXTRAOBJS) $(WXDEF)
- $(CC) -mdll -Wl,--base-file,wx.base -s -o $@ $(LD_STUFF)
+ $(CC) -mdll -Wl,--base-file,wx.base -s -o $@ $(LD_STUFF) $(ALL_LDFLAGS_DLL)
$(DLLTOOL) $(DLL_STUFF)
- $(CC) -mdll -Wl,--base-file,wx.base wx.exp -s -o $@ $(LD_STUFF)
+ $(CC) -mdll -Wl,--base-file,wx.base wx.exp -s -o $@ $(LD_STUFF) $(ALL_LDFLAGS_DLL)
$(DLLTOOL) $(DLL_STUFF)
- $(CC) -mdll wx.exp -o $@ $(LD_STUFF)
+ $(CC) -mdll wx.exp -o $@ $(LD_STUFF) $(ALL_LDFLAGS_DLL)
-$(RM) wx.base
-$(RM) wx.exp
$(RANLIB) $@
$(REGEXLIB):
- $(MAKE) -C $(REGEXDIR) -f makefile.g95 WXDIR=$(WXDIR)
+ $(MAKE) -C $(REGEXDIR) -f makefile.g95 WXDIR=$(WXDIR) WXWIN=$(WXDIR)
$(OBJECTS): $(WXINC)/wx/defs.h $(WXINC)/wx/object.h $(ARCHINCDIR)/wx/setup.h
$(COMMDIR)/y_tab.$(OBJSUFF): $(COMMDIR)/y_tab.c $(COMMDIR)/lex_yy.c
- $(CCLEX) -c $(CPPFLAGS) -DUSE_DEFINE -DYY_USE_PROTOS -o $@ $(COMMDIR)/y_tab.c
+ $(CCLEX) -c $(ALL_CPPFLAGS) $(ALL_CFLAGS) -DUSE_DEFINE -DYY_USE_PROTOS -o $@ $(COMMDIR)/y_tab.c
$(COMMDIR)/y_tab.c: $(COMMDIR)/dosyacc.c
$(COPY) ../common/dosyacc.c ../common/y_tab.c
projects / wxWidgets.git / blobdiff