# USE_GAUGE should be 1
# xpm: XPM pixmap support
# USE_XPM_IN_X should be 1
-# image: GIF, BMP image reading
-# USE_IMAGE_LOADING_IN_X should be 1
# wxstring: string class
# USE_GNU_WXSTRING should be 1
#
GENDIR=../generic
COMMDIR=../common
+XPMDIR=../xpm
OLEDIR=ole
MSWDIR=.
-GENERICOBJDIR=../generic/$(OBJDIR)
-COMMOBJDIR=../common/$(OBJDIR)
-OLEOBJDIR=ole/$(OBJDIR)
-MSWDIR=$(OBJDIR)
-
DOCDIR = $(WXDIR)\docs
GENERICOBJS= \
$(GENDIR)/choicdgg.$(OBJSUFF) \
- $(GENDIR)/colrdlgg.$(OBJSUFF) \
- $(GENDIR)/fontdlgg.$(OBJSUFF) \
+ $(GENDIR)/dirdlgg.$(OBJSUFF) \
$(GENDIR)/gridg.$(OBJSUFF) \
- $(GENDIR)/helpxlp.$(OBJSUFF) \
$(GENDIR)/laywin.$(OBJSUFF) \
- $(GENDIR)/msgdlgg.$(OBJSUFF) \
$(GENDIR)/panelg.$(OBJSUFF) \
- $(GENDIR)/printps.$(OBJSUFF) \
- $(GENDIR)/prntdlgg.$(OBJSUFF) \
+ $(GENDIR)/progdlgg.$(OBJSUFF) \
+ $(GENDIR)/prop.$(OBJSUFF) \
+ $(GENDIR)/propform.$(OBJSUFF) \
+ $(GENDIR)/proplist.$(OBJSUFF) \
$(GENDIR)/sashwin.$(OBJSUFF) \
$(GENDIR)/scrolwin.$(OBJSUFF) \
$(GENDIR)/splitter.$(OBJSUFF) \
$(GENDIR)/statusbr.$(OBJSUFF) \
$(GENDIR)/tabg.$(OBJSUFF) \
$(GENDIR)/textdlgg.$(OBJSUFF)
+ $(GENDIR)/tipdlg.$(OBJSUFF)
+
+# $(GENDIR)/colrdlgg.$(OBJSUFF) \
+# $(GENDIR)/fontdlgg.$(OBJSUFF) \
+# $(GENDIR)/prntdlgg.$(OBJSUFF) \
+# $(GENDIR)/printps.$(OBJSUFF) \
+# $(GENDIR)/msgdlgg.$(OBJSUFF) \
COMMONOBJS = \
$(COMMDIR)/config.$(OBJSUFF) \
$(COMMDIR)/cmndata.$(OBJSUFF) \
+ $(COMMDIR)/dcbase.$(OBJSUFF) \
$(COMMDIR)/docview.$(OBJSUFF) \
$(COMMDIR)/docmdi.$(OBJSUFF) \
$(COMMDIR)/dynarray.$(OBJSUFF) \
$(COMMDIR)/framecmn.$(OBJSUFF) \
$(COMMDIR)/gdicmn.$(OBJSUFF) \
$(COMMDIR)/helpbase.$(OBJSUFF) \
+ $(COMMDIR)/image.$(OBJSUFF) \
+ $(COMMDIR)/imagebmp.$(OBJSUFF) \
+ $(COMMDIR)/imagpng.$(OBJSUFF) \
+ $(COMMDIR)/imagjpeg.$(OBJSUFF) \
$(COMMDIR)/intl.$(OBJSUFF) \
+ $(COMMDIR)/ipcbase.$(OBJSUFF) \
$(COMMDIR)/layout.$(OBJSUFF) \
$(COMMDIR)/log.$(OBJSUFF) \
$(COMMDIR)/memory.$(OBJSUFF) \
$(COMMDIR)/module.$(OBJSUFF) \
+ $(COMMDIR)/mimetype.$(OBJSUFF) \
$(COMMDIR)/object.$(OBJSUFF) \
$(COMMDIR)/odbc.$(OBJSUFF) \
- $(COMMDIR)/postscrp.$(OBJSUFF) \
$(COMMDIR)/process.$(OBJSUFF) \
$(COMMDIR)/prntbase.$(OBJSUFF) \
$(COMMDIR)/resource.$(OBJSUFF) \
$(COMMDIR)/timercmn.$(OBJSUFF) \
$(COMMDIR)/utilscmn.$(OBJSUFF) \
$(COMMDIR)/validate.$(OBJSUFF) \
+ $(COMMDIR)/valgen.$(OBJSUFF) \
$(COMMDIR)/valtext.$(OBJSUFF) \
$(COMMDIR)/date.$(OBJSUFF) \
$(COMMDIR)/wxexpr.$(OBJSUFF) \
$(COMMDIR)/hash.$(OBJSUFF) \
$(COMMDIR)/list.$(OBJSUFF) \
+ $(COMMDIR)/variant.$(OBJSUFF) \
+ $(COMMDIR)/paper.$(OBJSUFF) \
$(COMMDIR)/string.$(OBJSUFF) \
$(COMMDIR)/time.$(OBJSUFF) \
$(COMMDIR)/tokenzr.$(OBJSUFF) \
$(COMMDIR)/y_tab.$(OBJSUFF) \
$(COMMDIR)/stream.$(OBJSUFF) \
- $(COMMDIR)/fstream.$(OBJSUFF) \
+ $(COMMDIR)/wfstream.$(OBJSUFF) \
$(COMMDIR)/mstream.$(OBJSUFF) \
$(COMMDIR)/zstream.$(OBJSUFF) \
$(COMMDIR)/datstrm.$(OBJSUFF) \
$(COMMDIR)/objstrm.$(OBJSUFF) \
$(COMMDIR)/extended.$(OBJSUFF) \
- $(COMMDIR)/wincmn.$(OBJSUFF)
+ $(COMMDIR)/dlgcmn.$(OBJSUFF) \
+ $(COMMDIR)/wincmn.$(OBJSUFF) \
+ $(COMMDIR)/wxchar.$(OBJSUFF)
-# Unfortunately, GnuWin32 fails with a syntax error in Sockets.h,
-# so remove socket code.
+# NOTE: if the socket-related files fail with a syntax error in Sockets.h,
+# remove the files (probably all GnuWin32 releases < b20). Cygwin b20 is OK,
+# Mingw32 may still have problems.
# $(COMMDIR)/socket.$(OBJSUFF) \
# $(COMMDIR)/sckaddr.$(OBJSUFF) \
# $(COMMDIR)/sckfile.$(OBJSUFF) \
button.$(OBJSUFF) \
checkbox.$(OBJSUFF) \
checklst.$(OBJSUFF) \
+ caret.$(OBJSUFF) \
choice.$(OBJSUFF) \
clipbrd.$(OBJSUFF) \
colordlg.$(OBJSUFF) \
dde.$(OBJSUFF) \
dialog.$(OBJSUFF) \
dib.$(OBJSUFF) \
- dirdlg.$(OBJSUFF) \
filedlg.$(OBJSUFF) \
font.$(OBJSUFF) \
fontdlg.$(OBJSUFF) \
spinbutt.$(OBJSUFF) \
statbmp.$(OBJSUFF) \
statbox.$(OBJSUFF) \
+ statline.$(OBJSUFF) \
statbr95.$(OBJSUFF) \
stattext.$(OBJSUFF) \
tabctrl.$(OBJSUFF) \
textctrl.$(OBJSUFF) \
thread.$(OBJSUFF) \
timer.$(OBJSUFF) \
+ tooltip.$(OBJSUFF) \
treectrl.$(OBJSUFF) \
utils.$(OBJSUFF) \
utilsexc.$(OBJSUFF) \
wave.$(OBJSUFF) \
- window.$(OBJSUFF)
+ window.$(OBJSUFF) \
+ xpmhand.$(OBJSUFF)
+
+# Native wxDirDlg can't be compiled due to GnuWin32/OLE limitations
+# dirdlg.$(OBJSUFF) \
-# OLE not supported yet by GnuWin32 (?)
+# OLE not supported yet by GnuWin32
# $(OLEDIR)/droptgt.$(OBJSUFF) \
# $(OLEDIR)/dropsrc.$(OBJSUFF) \
# $(OLEDIR)/dataobj.$(OBJSUFF) \
# $(OLEDIR)/oleutils.$(OBJSUFF) \
-# $(OLEDIR)/uuid.$(OBJSUFF)
-
-OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS)
+# $(OLEDIR)/uuid.$(OBJSUFF) \
+# $(OLEDIR)/automtn.$(OBJSUFF)
+
+XPMOBJECTS = $(XPMDIR)/crbuffri.o\
+ $(XPMDIR)/crdatfri.o\
+ $(XPMDIR)/create.o $(XPMDIR)/crifrbuf.o\
+ $(XPMDIR)/crifrdat.o\
+ $(XPMDIR)/data.o\
+ $(XPMDIR)/hashtab.o $(XPMDIR)/misc.o\
+ $(XPMDIR)/parse.o $(XPMDIR)/rdftodat.o\
+ $(XPMDIR)/rdftoi.o\
+ $(XPMDIR)/rgb.o $(XPMDIR)/scan.o\
+ $(XPMDIR)/simx.o $(XPMDIR)/wrffrdat.o\
+ $(XPMDIR)/wrffrp.o $(XPMDIR)/wrffri.o
+
+OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) # $(XPMOBJECTS)
all: $(OBJECTS) $(WXLIB)
ar $(AROPTIONS) $@ $(EXTRAOBJS) $(OBJECTS)
$(RANLIB) $@
-#$(MSWOBJDIR):
-# mkdir $(OBJDIR)
-
-#$(COMMOBJDIR):
-# mkdir $(COMMDIR)/$(OBJDIR)
-
-#$(GENERICOBJDIR):
-# mkdir $(GENDIR)/$(OBJDIR)
-
$(OBJECTS): $(WXINC)/wx/defs.h $(WXINC)/wx/object.h $(WXINC)/wx/setup.h
$(COMMDIR)/y_tab.$(OBJSUFF): $(COMMDIR)/y_tab.c $(COMMDIR)/lex_yy.c
# problems with lex_yy.c. See also note about LEX_SCANNER
# above.
$(COMMDIR)/lex_yy.c: $(COMMDIR)/lexer.l
- $(LEX) $(COMMDIR)/lexer.l > $(COMMDIR)/lex_yy.c
+ $(LEX) -L -o$(COMMDIR)/lex_yy.c $(COMMDIR)/lexer.l
+
+# Try one of these if the above line doesn't work.
+# Alternative syntax (1)
+# $(LEX) -t -L $(COMMDIR)/lexer.l > $(COMMDIR)/lex_yy.c
+# Alternative syntax (2)
+# $(LEX) -L -o$(COMMDIR)/lex_yy.c $(COMMDIR)/lexer.l
# sed -e "s/BUFSIZ/5000/g" < lex.yy.c | \
# sed -e "s/yyoutput(c)/void yyoutput(c)/g" | \
# Replace yacc with bison if you run into compilation
# problems with y_tab.c.
+
$(COMMDIR)/y_tab.c: $(COMMDIR)/parser.y
$(YACC) -o $(COMMDIR)/y_tab.c $(COMMDIR)/parser.y
-# mv y.tab.c $(COMMDIR)/y_tab.c
+# If you use e.g. gcc on Unix, uncomment these lines
+# and comment out the above.
+#$(COMMDIR)/y_tab.c: $(COMMDIR)/parser.y
+# $(YACC) $(COMMDIR)/parser.y
+# mv y.tab.c $(COMMDIR)/y_tab.c
# Extra targets
rcparser:
projects / wxWidgets.git / blobdiff