foreach $file (sort keys %wxGeneric) {
#! native wxDirDlg can't be compiled due to GnuWin32/OLE limitations,
#! so take the generic version
+ $base = ( $wxGeneric{$file} =~ /\bB\b/ ) ? '_BASE' : '';
+
if ( $wxGeneric{$file} =~ /\b(PS|G|U|16)\b/ ) {
next #! unless $file =~ /^dirdlgg\./;
}
$file =~ s/cp?p?$/\$(OBJSUFF)/;
- $project{"WXGENERICOBJS"} .= '$(GENDIR)/' . $file . " "
+ $project{"WXGENERICOBJS$base"} .= '$(GENDIR)/' . $file . " "
}
foreach $file (sort keys %wxCommon) {
#! needs extra files (sql*.h) so not compiled by default.
#! next if $file =~ /^odbc\./;
+ $base = ( $wxCommon{$file} =~ /\bB\b/ ) ? '_BASE' : '';
if ( $file =~ /^odbc\./ )
{
$file =~ s/cp?p?$/\$(OBJSUFF)/;
- $project{"ADVANCEDOBJS"} .= '$(COMMDIR)/' . $file . " "
+ $project{"ADVANCEDOBJS$base"} .= '$(COMMDIR)/' . $file . " "
}
else
{
$file =~ s/cp?p?$/\$(OBJSUFF)/;
- $project{"WXCOMMONOBJS"} .= '$(COMMDIR)/' . $file . " "
+ $project{"WXCOMMONOBJS$base"} .= '$(COMMDIR)/' . $file . " "
}
}
+ foreach $file (sort keys %wxBase) {
+ $file =~ s/cp?p?$/\$(OBJSUFF)/;
+ $project{"WXCOMMONOBJS_BASEONLY"} .= '$(COMMDIR)/' . $file . " "
+ }
+
foreach $file (sort keys %wxMSW) {
#! native wxDirDlg can't be compiled due to GnuWin32/OLE limitations,
next if $file =~ /^dirdlg\./;
next if $wxMSW{$file} =~ /\b(16)\b/;
+ $base = ( $wxMSW{$file} =~ /\bB\b/ ) ? '_BASE' : '';
#! Mingw32 doesn't have the OLE headers and has some troubles with
#! socket code, so put in ADVANCEDOBJS
if ( $wxMSW{$file} =~ /\b(O)\b/ )
{
$file =~ s/cp?p?$/\$(OBJSUFF)/;
- $project{"ADVANCEDOBJS"} .= '$(MSWDIR)/ole/' . $file . " "
+ $project{"ADVANCEDOBJS$base"} .= '$(MSWDIR)/ole/' . $file . " "
}
else
{
$file =~ s/cp?p?$/\$(OBJSUFF)/;
- $project{"WXMSWOBJS"} .= '$(MSWDIR)/' . $file . " "
+ $project{"WXMSWOBJS$base"} .= '$(MSWDIR)/' . $file . " "
}
}
}
#$}
-# This file was automatically generated by tmake at #$ Now()
+# 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
-DLL_EXTRA_LIBS = $(WXDIR)/lib/libzlib.a \
- $(WXDIR)/lib/libpng.a $(WXDIR)/lib/libjpeg.a \
- $(WXDIR)/lib/libtiff.a $(WXDIR)/lib/libregex.a
+WXDLL = $(WXDIR)/lib/wx$(TOOLKIT)$(WXVERSION)$(UNIEXT)$(DEBEXT)$(MIN_SUFFIX).dll
+WXDEF = wx$(TOOLKIT)$(WXVERSION)$(UNIEXT)$(DEBEXT).def
+DLL_EXTRA_LIBS = $(WXDIR)/lib/libzlib$(MIN_SUFFIX).a \
+ $(WXDIR)/lib/libpng$(MIN_SUFFIX).a \
+ $(WXDIR)/lib/libjpeg$(MIN_SUFFIX).a \
+ $(WXDIR)/lib/libtiff$(MIN_SUFFIX).a \
+ $(WXDIR)/lib/libregex$(MIN_SUFFIX).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
MSWDIR = $(WXDIR)/src/msw
REGEXDIR= $(WXDIR)/src/regex
-ZLIBLIB = $(WXDIR)/lib/libzlib.a
-PNGLIB = $(WXDIR)/lib/libpng.a
-JPEGLIB = $(WXDIR)/lib/libjpeg.a
-TIFFLIB = $(WXDIR)/lib/libtiff.a
-REGEXLIB= $(WXDIR)/lib/libregex.a
+ZLIBLIB = $(WXDIR)/lib/libzlib$(MIN_SUFFIX).a
+PNGLIB = $(WXDIR)/lib/libpng$(MIN_SUFFIX).a
+JPEGLIB = $(WXDIR)/lib/libjpeg$(MIN_SUFFIX).a
+TIFFLIB = $(WXDIR)/lib/libtiff$(MIN_SUFFIX).a
+REGEXLIB= $(WXDIR)/lib/libregex$(MIN_SUFFIX).a
DOCDIR = $(WXDIR)/docs
# 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 = \
+ #$ ExpandList("WXGENERICOBJS_BASE");
+
GENERICOBJS = \
+ $(GENERICOBJS_BASE) \
#$ ExpandList("WXGENERICOBJS");
+COMMONOBJS_BASE = \
+ #$ ExpandList("WXCOMMONOBJS_BASE");
+
+COMMONOBJS_BASEONLY = \
+ #$ ExpandList("WXCOMMONOBJS_BASEONLY");
+
COMMONOBJS = \
+ $(COMMONOBJS_BASE) \
$(COMMDIR)/y_tab.$(OBJSUFF) \
#$ ExpandList("WXCOMMONOBJS");
HTMLOBJS = \
#$ ExpandList("WXHTMLOBJS");
+MSWOBJS_BASE = \
+ #$ ExpandList("WXMSWOBJS_BASE");
+
MSWOBJS = \
+ $(MSWOBJS_BASE) \
#$ ExpandList("WXMSWOBJS");
+ADVANCEDOBJS_BASE = \
+ #$ ExpandList("ADVANCEDOBJS_BASE");
+
ADVANCEDOBJS = \
+ $(ADVANCEDOBJS_BASE) \
#$ ExpandList("ADVANCEDOBJS");
ZLIBOBJS = \
$(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 MINGW32=$(MINGW32) 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