Additional makefiles; changes for compilation with BC++ and GnuWin32
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@719 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
@@ -123,7 +123,7 @@ bool MyApp::OnInit(void)
|
||||
frame->Show(TRUE);
|
||||
|
||||
// Return the main frame window
|
||||
return true;
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
/*
|
||||
|
||||
@@ -1,82 +1,76 @@
|
||||
#
|
||||
# File: makefile.b32
|
||||
# Author: Patrick Halke, modified by Guilhem Lavaux
|
||||
# Created: 1997
|
||||
# Author: Guilhem Lavaux
|
||||
# Created: 1998
|
||||
# Updated:
|
||||
# Copyright: (c) 1993, AIAI, University of Edinburgh
|
||||
# Copyright: (c) Guilhem Lavaux
|
||||
#
|
||||
# "%W% %G%"
|
||||
#
|
||||
# Makefile : Builds 32bit wxstring library for Windows 3.1
|
||||
# and Borland C++ 4.x
|
||||
# Makefile : Builds 32-bit wxSocket sample under BC++
|
||||
|
||||
WXDIR = $(WXWIN)
|
||||
|
||||
ZLIB = $(WXDIR)\lib\zlib.lib
|
||||
|
||||
!include $(WXDIR)\src\makeb32.env
|
||||
|
||||
WXLIBDIR = $(WXDIR)\lib
|
||||
WXLIB = $(WXDIR)\lib\wx32.lib
|
||||
SOCKETLIB = $(WXDIR)\lib\wxsocket.lib $(WXDIR)\lib\zlib.lib
|
||||
WXINC = $(WXDIR)\include\msw
|
||||
WXBASESRC = $(WXDIR)\src\base
|
||||
WXBASEINC = $(WXDIR)\include\base
|
||||
LIBS=$(WXLIB) $(SOCKETLIB) cw32 import32
|
||||
|
||||
!ifndef DEBUG
|
||||
DEBUG=0
|
||||
!endif
|
||||
WXLIB = $(WXLIBDIR)\wx32.lib
|
||||
LIBS=$(WXLIB) $(ZLIB) cw32 import32 ole2w32
|
||||
|
||||
!if "$(FINAL)" == "0"
|
||||
LINKFLAGS=/v /Tpe /L$(WXLIBDIR);$(BCCDIR)\lib
|
||||
OPT = -Od
|
||||
DEBUG_FLAGS= -v -DDEBUG=$(DEBUG)
|
||||
DEBUG_FLAGS= -v
|
||||
!else
|
||||
LINKFLAGS=/Tpe /L$(WXLIBDIR);$(BCCDIR)\lib
|
||||
OPT = -O2
|
||||
DEBUG_FLAGS = -DDEBUG=$(DEBUG)
|
||||
OPT = -Od
|
||||
DEBUG_FLAGS =
|
||||
!endif
|
||||
|
||||
CPPFLAGS=$(DEBUG_FLAGS) $(OPT) @$(CFG)
|
||||
|
||||
.$(SRCSUFF).obj:
|
||||
bcc32 $(CPPFLAGS) -c {$< }
|
||||
|
||||
.c.obj:
|
||||
bcc32 $(CPPFLAGS) -P- -c {$< }
|
||||
|
||||
CLIENT_TARGET=client
|
||||
SERVER_TARGET=server
|
||||
CLIENT_OBJECTS=client.obj
|
||||
SERVER_OBJECTS=server.obj
|
||||
|
||||
.c.obj:
|
||||
bcc32 $(CPPFLAGS) -P- -c {$< }
|
||||
|
||||
all: $(CLIENT_TARGET).exe $(SERVER_TARGET).exe
|
||||
|
||||
$(CLIENT_TARGET).exe: $(CLIENT_OBJECTS) $(CLIENT_TARGET).def $(CLIENT_TARGET).res
|
||||
$(CLIENT_TARGET).exe: $(CLIENT_OBJECTS) $(CLIENT_TARGET).res
|
||||
tlink32 $(LINKFLAGS) @&&!
|
||||
c0w32.obj $(CLIENT_OBJECTS)
|
||||
$(CLIENT_TARGET)
|
||||
nul
|
||||
$(LIBS)
|
||||
$(CLIENT_TARGET).def
|
||||
!
|
||||
brc32 -K $(CLIENT_TARGET).res
|
||||
|
||||
client.obj: client.cpp
|
||||
|
||||
$(CLIENT_TARGET).res : $(CLIENT_TARGET).rc $(WXDIR)\include\msw\wx.rc
|
||||
brc32 -r /i$(BCCDIR)\include /i$(WXDIR)\include\msw /i$(WXDIR)\contrib\fafa $(CLIENT_TARGET)
|
||||
$(CLIENT_TARGET).res : $(CLIENT_TARGET).rc $(WXDIR)\include\wx\msw\wx.rc
|
||||
brc32 -r /i$(BCCDIR)\include /i$(WXDIR)\include $(CLIENT_TARGET)
|
||||
|
||||
$(SERVER_TARGET).exe: $(SERVER_OBJECTS) $(SERVER_TARGET).def $(SERVER_TARGET).res
|
||||
$(SERVER_TARGET).exe: $(SERVER_OBJECTS) $(SERVER_TARGET).res
|
||||
tlink32 $(LINKFLAGS) @&&!
|
||||
c0w32.obj $(SERVER_OBJECTS)
|
||||
$(SERVER_TARGET)
|
||||
nul
|
||||
$(LIBS)
|
||||
$(SERVER_TARGET).def
|
||||
!
|
||||
brc32 -K $(SERVER_TARGET).res
|
||||
|
||||
server.obj: server.cpp
|
||||
|
||||
$(SERVER_TARGET).res: $(SERVER_TARGET).rc $(WXDIR)\include\msw\wx.rc
|
||||
brc32 -r /i$(BCCDIR)\include /i$(WXDIR)\include\msw /i$(WXDIR)\contrib\fafa $(SERVER_TARGET)
|
||||
$(SERVER_TARGET).res: $(SERVER_TARGET).rc $(WXDIR)\include\wx\msw\wx.rc
|
||||
brc32 -r /i$(BCCDIR)\include /i$(WXDIR)\include $(SERVER_TARGET)
|
||||
|
||||
clean:
|
||||
-erase *.obj
|
||||
|
||||
@@ -1,14 +1,13 @@
|
||||
#
|
||||
# File: makefile.unx
|
||||
# Author: Stefan Hammes
|
||||
# Created: 1995
|
||||
# Author: Julian Smart
|
||||
# Created: 1993
|
||||
# Updated:
|
||||
# Copyright: (c) 1995
|
||||
# Copyright: (c) 1993, AIAI, University of Edinburgh
|
||||
#
|
||||
# "%W% %G%"
|
||||
#
|
||||
# Makefile for wxString example (UNIX).
|
||||
# Change the WXDIR directory, and CPPFLAGS and LDFLAGS, for your system.
|
||||
# Makefile for server/client example (UNIX).
|
||||
|
||||
WXDIR = ../..
|
||||
|
||||
@@ -16,60 +15,32 @@ WXDIR = ../..
|
||||
# this central makefile.
|
||||
include $(WXDIR)/src/makeg95.env
|
||||
|
||||
WXSOCKDIR = $(WXDIR)/contrib/wxsock
|
||||
WXSOCKLIB = $(WXSOCKDIR)/libwxsock.a
|
||||
OBJECTS=$(OBJDIR)/server.$(OBJSUFF) $(OBJDIR)/server_resources.$(OBJSUFF)\
|
||||
$(OBJDIR)/client.$(OBJSUFF) $(OBJDIR)/client_resources.$(OBJSUFF)
|
||||
|
||||
OBJECTS = $(OBJDIR)/wx_sock.$(OBJSUFF) $(OBJDIR)/wx_addr.$(OBJSUFF) \
|
||||
$(OBJDIR)/wx_pkman.$(OBJSUFF) $(OBJDIR)/wx_skflt.$(OBJSUFF) \
|
||||
$(OBJDIR)/wx_lzw.$(OBJSUFF) \
|
||||
$(OBJDIR)/wx_url.$(OBJSUFF) $(OBJDIR)/wx_ftp.$(OBJSUFF) \
|
||||
$(OBJDIR)/wx_file.$(OBJSUFF) $(OBJDIR)/wx_nipc.$(OBJSUFF) \
|
||||
$(OBJDIR)/wx_wipc.$(OBJSUFF) $(OBJDIR)/wx_sipc.$(OBJSUFF)
|
||||
all: $(OBJDIR) server$(GUISUFFIX) client$(GUISUFFIX)
|
||||
|
||||
TESTOBJECTS = $(OBJDIR)/test.$(OBJSUFF)
|
||||
TESTPROGRAM = $(WXSTRINGDIR)/test$(GUISUFFIX)
|
||||
|
||||
LDFLAGS = $(XLIB) -L$(WXSOCKDIR) -L$(WXDIR)/lib
|
||||
|
||||
XVIEWLDLIBS = -lwxstring_ol -lwx_ol -lxview -lolgx -lX11 -lm $(COMPLIBS)
|
||||
MOTIFLDLIBS = -lwxstring_motif -lwx_motif -lXm -lXt -lX11 -lm $(COMPLIBS)
|
||||
HPLDLIBS = -lwxstring_hp -lwx_hp -lXm -lXt -lX11 -lm $(HPCOMPLIBS)
|
||||
# Default
|
||||
LDLIBS=$(MOTIFLDLIBS)
|
||||
|
||||
all: $(OBJDIR) $(WXSOCKLIB)
|
||||
|
||||
demo: $(TESTPROGRAM)
|
||||
|
||||
.SUFFIXES:
|
||||
|
||||
# Comment this out if 'say' doesn't speak on your system, or make it beep perhaps!
|
||||
done:
|
||||
say dun
|
||||
|
||||
wx:
|
||||
cd $(WXDIR)/src/x; $(MAKE) -f makefile.unx GUI=$(GUI)
|
||||
|
||||
$(OBJDIR):
|
||||
mkdir $(OBJDIR)
|
||||
|
||||
$(WXSOCKLIB): $(OBJECTS)
|
||||
rm -f $@
|
||||
ar $(AROPTIONS) libwxsock.a $(OBJECTS)
|
||||
$(RANLIB) libwxsock.a
|
||||
server$(GUISUFFIX): $(OBJDIR)/server.$(OBJSUFF) $(OBJDIR)/server_resources.$(OBJSUFF) $(WXLIB)
|
||||
$(CC) $(LDFLAGS) -o server$(GUISUFFIX)$(EXESUFF) $(OBJDIR)/server.$(OBJSUFF) $(OBJDIR)/server_resources.$(OBJSUFF) $(LDLIBS)
|
||||
|
||||
$(OBJDIR)/wx_sock.$(OBJSUFF): wx_sock.$(SRCSUFF) wx_sock.h
|
||||
$(CC) -c $(CPPFLAGS) -o $@ wx_sock.$(SRCSUFF)
|
||||
$(OBJDIR)/server.$(OBJSUFF): server.$(SRCSUFF) server.h
|
||||
$(CC) -c $(CPPFLAGS) -o $@ server.$(SRCSUFF)
|
||||
|
||||
$(OBJDIR)/wx_addr.$(OBJSUFF): wx_addr.$(SRCSUFF) wx_addr.h
|
||||
$(CC) -c $(CPPFLAGS) -o $@ wx_addr.$(SRCSUFF)
|
||||
client$(GUISUFFIX): $(OBJDIR)/client.$(OBJSUFF) $(OBJDIR)/client_resources.$(OBJSUFF) $(WXLIB)
|
||||
$(CC) $(LDFLAGS) -o client$(GUISUFFIX)$(EXESUFF) $(OBJDIR)/client.$(OBJSUFF) $(OBJDIR)/client_resources.$(OBJSUFF) $(LDLIBS)
|
||||
|
||||
$(OBJDIR)/test.$(OBJSUFF): test.$(SRCSUFF)
|
||||
$(CC) -c $(CPPFLAGS) -o $@ test.$(SRCSUFF)
|
||||
$(OBJDIR)/client.$(OBJSUFF): client.$(SRCSUFF) client.h
|
||||
$(CC) -c $(CPPFLAGS) -o $@ client.$(SRCSUFF)
|
||||
|
||||
$(OBJDIR)/server_resources.o: server.rc
|
||||
$(RESCOMP) -i server.rc -o $(OBJDIR)/server_resources.o $(RESFLAGS)
|
||||
|
||||
$(TESTPROGRAM): $(OBJDIR)/test.$(OBJSUFF) $(WXLIB) $(WXSOCKLIB)
|
||||
$(CC) $(CPPFLAGS) $(LDFLAGS) -o test$(GUISUFFIX) $(OBJDIR)/test.$(OBJSUFF) $(XVIEW_LINK) $(LDLIBS)
|
||||
$(OBJDIR)/client_resources.o: client.rc
|
||||
$(RESCOMP) -i client.rc -o $(OBJDIR)/client_resources.o $(RESFLAGS)
|
||||
|
||||
clean:
|
||||
rm -f $(OBJECTS) test$(GUISUFFIX) $(WXSTRINGLIB) $(OBJDIR)/test.$(OBJSUFF) core
|
||||
|
||||
rm -f $(OBJECTS) server$(GUISUFFIX).exe client$(GUISUFFIX).exe core *.rsc *.res
|
||||
|
||||
Reference in New Issue
Block a user