projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added generic LoadObject methods that can load any classtype from a
[wxWidgets.git]
/
src
/
msw
/
makefile.g95
diff --git
a/src/msw/makefile.g95
b/src/msw/makefile.g95
index 4b63f3a301e4f219ead5c557b284e0d04569db37..1043e14499f63a9f9fef5f6084714e869fad78a1 100644
(file)
--- a/
src/msw/makefile.g95
+++ b/
src/msw/makefile.g95
@@
-63,7
+63,7
@@
DOCDIR = $(WXDIR)/docs
# Only use the WIN32 wxDirDialog if we have a recent
# version of Mingw32
ifeq ($(MINGW32),1)
# Only use the WIN32 wxDirDialog if we have a recent
# version of Mingw32
ifeq ($(MINGW32),1)
- ifneq "$(
findstring 2.95, $(MINGW32VERSION)
)" ""
+ ifneq "$(
_GCC295)$(_GCC3
)" ""
DIRDLGOBJ = $(MSWDIR)/dirdlg.$(OBJSUFF)
else
DIRDLGOBJ = $(GENDIR)/dirdlgg.$(OBJSUFF)
DIRDLGOBJ = $(MSWDIR)/dirdlg.$(OBJSUFF)
else
DIRDLGOBJ = $(GENDIR)/dirdlgg.$(OBJSUFF)
@@
-149,6
+149,7
@@
COMMONOBJS_BASE = \
$(COMMDIR)/memory.$(OBJSUFF) \
$(COMMDIR)/mimecmn.$(OBJSUFF) \
$(COMMDIR)/module.$(OBJSUFF) \
$(COMMDIR)/memory.$(OBJSUFF) \
$(COMMDIR)/mimecmn.$(OBJSUFF) \
$(COMMDIR)/module.$(OBJSUFF) \
+ $(COMMDIR)/msgout.$(OBJSUFF) \
$(COMMDIR)/mstream.$(OBJSUFF) \
$(COMMDIR)/object.$(OBJSUFF) \
$(COMMDIR)/process.$(OBJSUFF) \
$(COMMDIR)/mstream.$(OBJSUFF) \
$(COMMDIR)/object.$(OBJSUFF) \
$(COMMDIR)/process.$(OBJSUFF) \
@@
-183,6
+184,8
@@
COMMONOBJS_BASEONLY = \
COMMONOBJS = \
$(COMMONOBJS_BASE) \
$(COMMDIR)/y_tab.$(OBJSUFF) \
COMMONOBJS = \
$(COMMONOBJS_BASE) \
$(COMMDIR)/y_tab.$(OBJSUFF) \
+ $(COMMDIR)/artprov.$(OBJSUFF) \
+ $(COMMDIR)/artstd.$(OBJSUFF) \
$(COMMDIR)/choiccmn.$(OBJSUFF) \
$(COMMDIR)/clipcmn.$(OBJSUFF) \
$(COMMDIR)/cmdproc.$(OBJSUFF) \
$(COMMDIR)/choiccmn.$(OBJSUFF) \
$(COMMDIR)/clipcmn.$(OBJSUFF) \
$(COMMDIR)/cmdproc.$(OBJSUFF) \
@@
-208,9
+211,11
@@
COMMONOBJS = \
$(COMMDIR)/geometry.$(OBJSUFF) \
$(COMMDIR)/gifdecod.$(OBJSUFF) \
$(COMMDIR)/helpbase.$(OBJSUFF) \
$(COMMDIR)/geometry.$(OBJSUFF) \
$(COMMDIR)/gifdecod.$(OBJSUFF) \
$(COMMDIR)/helpbase.$(OBJSUFF) \
+ $(COMMDIR)/iconbndl.$(OBJSUFF) \
$(COMMDIR)/imagall.$(OBJSUFF) \
$(COMMDIR)/imagbmp.$(OBJSUFF) \
$(COMMDIR)/image.$(OBJSUFF) \
$(COMMDIR)/imagall.$(OBJSUFF) \
$(COMMDIR)/imagbmp.$(OBJSUFF) \
$(COMMDIR)/image.$(OBJSUFF) \
+ $(COMMDIR)/imagfill.$(OBJSUFF) \
$(COMMDIR)/imaggif.$(OBJSUFF) \
$(COMMDIR)/imagiff.$(OBJSUFF) \
$(COMMDIR)/imagjpeg.$(OBJSUFF) \
$(COMMDIR)/imaggif.$(OBJSUFF) \
$(COMMDIR)/imagiff.$(OBJSUFF) \
$(COMMDIR)/imagjpeg.$(OBJSUFF) \
@@
-230,6
+235,7
@@
COMMONOBJS = \
$(COMMDIR)/quantize.$(OBJSUFF) \
$(COMMDIR)/radiocmn.$(OBJSUFF) \
$(COMMDIR)/resource.$(OBJSUFF) \
$(COMMDIR)/quantize.$(OBJSUFF) \
$(COMMDIR)/radiocmn.$(OBJSUFF) \
$(COMMDIR)/resource.$(OBJSUFF) \
+ $(COMMDIR)/settcmn.$(OBJSUFF) \
$(COMMDIR)/sizer.$(OBJSUFF) \
$(COMMDIR)/statbar.$(OBJSUFF) \
$(COMMDIR)/tbarbase.$(OBJSUFF) \
$(COMMDIR)/sizer.$(OBJSUFF) \
$(COMMDIR)/statbar.$(OBJSUFF) \
$(COMMDIR)/tbarbase.$(OBJSUFF) \
@@
-329,6
+335,7
@@
MSWOBJS = \
$(MSWDIR)/helpwin.$(OBJSUFF) \
$(MSWDIR)/icon.$(OBJSUFF) \
$(MSWDIR)/imaglist.$(OBJSUFF) \
$(MSWDIR)/helpwin.$(OBJSUFF) \
$(MSWDIR)/icon.$(OBJSUFF) \
$(MSWDIR)/imaglist.$(OBJSUFF) \
+ $(MSWDIR)/iniconf.$(OBJSUFF) \
$(MSWDIR)/joystick.$(OBJSUFF) \
$(MSWDIR)/listbox.$(OBJSUFF) \
$(MSWDIR)/listctrl.$(OBJSUFF) \
$(MSWDIR)/joystick.$(OBJSUFF) \
$(MSWDIR)/listbox.$(OBJSUFF) \
$(MSWDIR)/listctrl.$(OBJSUFF) \
@@
-345,6
+352,7
@@
MSWOBJS = \
$(MSWDIR)/palette.$(OBJSUFF) \
$(MSWDIR)/pen.$(OBJSUFF) \
$(MSWDIR)/penwin.$(OBJSUFF) \
$(MSWDIR)/palette.$(OBJSUFF) \
$(MSWDIR)/pen.$(OBJSUFF) \
$(MSWDIR)/penwin.$(OBJSUFF) \
+ $(MSWDIR)/popupwin.$(OBJSUFF) \
$(MSWDIR)/printdlg.$(OBJSUFF) \
$(MSWDIR)/printwin.$(OBJSUFF) \
$(MSWDIR)/radiobox.$(OBJSUFF) \
$(MSWDIR)/printdlg.$(OBJSUFF) \
$(MSWDIR)/printwin.$(OBJSUFF) \
$(MSWDIR)/radiobox.$(OBJSUFF) \
@@
-501,7
+509,7
@@
TIFFOBJS = $(TIFFDIR)/tif_aux.o \
$(TIFFDIR)/tif_zip.o
ifeq ($(MINGW32),1)
$(TIFFDIR)/tif_zip.o
ifeq ($(MINGW32),1)
- ifneq "$(
findstring 2.95, $(MINGW32VERSION)
)" ""
+ ifneq "$(
_GCC295)$(_GCC3
)" ""
OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(DIRDLGOBJ) $(ADVANCEDOBJS)
else
OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(DIRDLGOBJ)
OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(DIRDLGOBJ) $(ADVANCEDOBJS)
else
OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(DIRDLGOBJ)
@@
-513,20
+521,12
@@
ifeq ($(wxUSE_GUI),0)
OBJECTS = $(MSWOBJS_BASE) $(COMMONOBJS_BASE) $(COMMONOBJS_BASEONLY) $(GENERICOBJS_BASE)
endif
OBJECTS = $(MSWOBJS_BASE) $(COMMONOBJS_BASE) $(COMMONOBJS_BASEONLY) $(GENERICOBJS_BASE)
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
-
# how do you do "VAR=\" ? BLEAGH!
BACKSLASH=$(subst a,\,a)
# 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
PATH_SEPARATOR:=$(BACKSLASH)
PATH_SUBST=/
else
- IS_CYGWIN=1
PATH_SEPARATOR=/
PATH_SUBST:=$(BACKSLASH)
endif
PATH_SEPARATOR=/
PATH_SUBST:=$(BACKSLASH)
endif
@@
-619,7
+619,7
@@
$(TIFFLIB): $(TIFFOBJS)
$(RANLIB) $@
$(REGEXLIB):
$(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
$(OBJECTS): $(WXINC)/wx/defs.h $(WXINC)/wx/object.h $(ARCHINCDIR)/wx/setup.h