Updated makefile.g95/vc to behave similarly to wxWindows.dsp WRT library names
and setup.h . git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12069 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mattia Barbon
parent
deb3ea6a34
commit
b3bd664a90
@ -91,11 +91,11 @@ include $(WXDIR)/src/makeg95.env
|
||||
|
||||
# DLL Name, if building wxWindows as a DLL.
|
||||
ifdef WXMAKINGDLL
|
||||
WXDLL = $(WXDIR)/lib/wx$(WXVERSION).dll
|
||||
WXDEF = wx$(WXVERSION).def
|
||||
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/libtiff.a $(WXDIR)/lib/libregex.a
|
||||
DLL_LDFLAGS = -L$(WXDIR)/lib
|
||||
DLL_LDLIBS = -mwindows -lcomctl32 -lctl3d32 -lole32 -loleaut32 \
|
||||
-luuid -lrpcrt4 -lodbc32 -lwinmm -lopengl32 \
|
||||
@ -116,11 +116,13 @@ JPEGDIR = $(WXDIR)/src/jpeg
|
||||
TIFFDIR = $(WXDIR)/src/tiff
|
||||
OLEDIR = $(WXDIR)/src/msw/ole
|
||||
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
|
||||
|
||||
DOCDIR = $(WXDIR)/docs
|
||||
|
||||
@ -278,12 +280,23 @@ else
|
||||
OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(DIRDLGOBJ)
|
||||
endif
|
||||
|
||||
ARCHINCDIR=$(subst /,\,$(WXDIR))\lib\msw$(INCEXT)
|
||||
|
||||
SETUP_H=$(ARCHINCDIR)\wx\setup.h
|
||||
|
||||
ifndef WXMAKINGDLL
|
||||
all: $(OBJECTS) $(WXLIB) $(ZLIBLIB) $(PNGLIB) $(JPEGLIB) $(TIFFLIB)
|
||||
all: $(SETUP_H) $(OBJECTS) $(WXLIB) $(ZLIBLIB) $(PNGLIB) $(JPEGLIB) $(TIFFLIB) $(REGEXLIB)
|
||||
else
|
||||
all: $(OBJECTS) $(ZLIBLIB) $(PNGLIB) $(JPEGLIB) $(TIFFLIB) $(WXDLL)
|
||||
all: $(SETUP_H) $(OBJECTS) $(ZLIBLIB) $(PNGLIB) $(JPEGLIB) $(TIFFLIB) $(REGEXLIB) $(WXDLL)
|
||||
endif
|
||||
|
||||
$(ARCHINCDIR)\wx:
|
||||
mkdir $(ARCHINCDIR)
|
||||
mkdir $(ARCHINCDIR)\wx
|
||||
|
||||
$(SETUP_H): $(ARCHINCDIR)\wx
|
||||
$(COPY) $(WXDIR)\include\wx\msw\setup.h $@
|
||||
|
||||
ifndef WXMAKINGDLL
|
||||
|
||||
$(WXLIB): $(OBJECTS) $(EXTRAOBJS)
|
||||
@ -351,8 +364,10 @@ $(TIFFLIB): $(TIFFOBJS)
|
||||
$(AR) $(AROPTIONS) $@ $(TIFFOBJS)
|
||||
$(RANLIB) $@
|
||||
|
||||
$(REGEXLIB):
|
||||
$(MAKE) -C $(REGEXDIR) -f makefile.g95 WXDIR=$(WXDIR)
|
||||
|
||||
$(OBJECTS): $(WXINC)/wx/defs.h $(WXINC)/wx/object.h $(WXINC)/wx/setup.h
|
||||
$(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
|
||||
@ -413,6 +428,8 @@ clean:
|
||||
-$(RM) ../jpeg/*.bak
|
||||
-$(RM) ../tiff/*.o
|
||||
-$(RM) ../tiff/*.bak
|
||||
-$(RM) ../regex/*.o
|
||||
-$(RM) ../regex/*.bak
|
||||
|
||||
cleanall: clean
|
||||
-$(RM) $(WXLIB)
|
||||
@ -420,6 +437,7 @@ cleanall: clean
|
||||
-$(RM) $(PNGLIB)
|
||||
-$(RM) $(JPEGLIB)
|
||||
-$(RM) $(TIFFLIB)
|
||||
-$(RM) $(REGEXLIB)
|
||||
|
||||
ifdef WXMAKINGDLL
|
||||
-$(RM) $(WXDLL)
|
||||
|
||||
@ -166,15 +166,20 @@ HTMLOBJS = #$ ExpandList("WXHTMLOBJS");
|
||||
# Add $(HTMLOBJS) if wanting wxHTML classes
|
||||
OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS)
|
||||
|
||||
ARCHINCDIR=$(WXDIR)\lib\msw$(INCEXT)
|
||||
SETUP_H=$(ARCHINCDIR)\wx\setup.h
|
||||
|
||||
# Normal, static library
|
||||
all: setuph dirs $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) png zlib jpeg tiff regex $(LIBTARGET)
|
||||
all: dirs $(SETUP_H) $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) png zlib jpeg tiff regex $(LIBTARGET)
|
||||
|
||||
setuph:
|
||||
cd $(WXDIR)\include\wx\msw
|
||||
if not exist setup.h copy setup0.h setup.h
|
||||
cd $(WXDIR)\src\msw
|
||||
$(ARCHINCDIR)\wx:
|
||||
mkdir $(ARCHINCDIR)
|
||||
mkdir $(ARCHINCDIR)\wx
|
||||
|
||||
dirs: $(MSWDIR)\$D $(COMMDIR)\$D $(GENDIR)\$D $(OLEDIR)\$D $(HTMLDIR)\$D $(JPEGDIR)\$D $(TIFFDIR)\$D $(REGEXDIR)\$D
|
||||
$(SETUP_H):
|
||||
copy $(WXDIR)\include\wx\msw\setup.h $@
|
||||
|
||||
dirs: $(MSWDIR)\$D $(COMMDIR)\$D $(GENDIR)\$D $(OLEDIR)\$D $(HTMLDIR)\$D $(JPEGDIR)\$D $(TIFFDIR)\$D $(REGEXDIR)\$D $(ARCHINCDIR)\wx
|
||||
|
||||
$D:
|
||||
mkdir $D
|
||||
@ -205,18 +210,18 @@ $(REGEXDIR)\$D:
|
||||
|
||||
# wxWindows library as DLL
|
||||
dll:
|
||||
nmake -f makefile.vc all FINAL=$(FINAL) DLL=1 WXMAKINGDLL=1 NEW_WXLIBNAME=$(NEW_WXLIBNAME)
|
||||
nmake -f makefile.vc all FINAL=$(FINAL) DLL=1 WXMAKINGDLL=1 NEW_WXLIBNAME=$(NEW_WXLIBNAME) UNICODE=$(UNICODE)
|
||||
|
||||
cleandll:
|
||||
nmake -f makefile.vc clean FINAL=$(FINAL) DLL=1 WXMAKINGDLL=1 NEW_WXLIBNAME=$(NEW_WXLIBNAME)
|
||||
nmake -f makefile.vc clean FINAL=$(FINAL) DLL=1 WXMAKINGDLL=1 NEW_WXLIBNAME=$(NEW_WXLIBNAME) UNICODE=$(UNICODE)
|
||||
|
||||
# wxWindows + app as DLL. Only affects main.cpp.
|
||||
dllapp:
|
||||
nmake -f makefile.vc all FINAL=$(FINAL) DLL=1
|
||||
nmake -f makefile.vc all FINAL=$(FINAL) DLL=1 UNICODE=$(UNICODE)
|
||||
|
||||
# wxWindows + app as DLL, for Netscape plugin - remove DllMain.
|
||||
dllnp:
|
||||
nmake -f makefile.vc all NOMAIN=1 FINAL=$(FINAL) DLL=1
|
||||
nmake -f makefile.vc all NOMAIN=1 FINAL=$(FINAL) DLL=1 UNICODE=$(UNICODE)
|
||||
|
||||
# Use this to make dummy.obj and generate a PCH.
|
||||
# You might use the dll target, then the pch target, in order to
|
||||
@ -292,10 +297,10 @@ $(WXDIR)\lib\$(WXLIBNAME).dll: $(DUMMYOBJ) $(OBJECTS)
|
||||
########################################################
|
||||
# Windows-specific objects
|
||||
|
||||
$D\dummy.obj: dummy.$(SRCSUFF) $(WXDIR)\include\wx\wx.h $(WXDIR)\include\wx\msw\setup.h
|
||||
$D\dummy.obj: dummy.$(SRCSUFF) $(WXDIR)\include\wx\wx.h $(SETUP_H)
|
||||
cl $(CPPFLAGS) $(MAKEPRECOMP) /Fo$D\dummy.obj /c /Tp dummy.cpp
|
||||
|
||||
$D\dummydll.obj: dummydll.$(SRCSUFF) $(WXDIR)\include\wx\wx.h $(WXDIR)\include\wx\msw\setup.h
|
||||
$D\dummydll.obj: dummydll.$(SRCSUFF) $(WXDIR)\include\wx\wx.h $(SETUP_H)
|
||||
cl @<<
|
||||
$(CPPFLAGS) $(MAKEPRECOMP) /Fo$D\dummydll.obj /c /Tp dummydll.cpp
|
||||
<<
|
||||
@ -376,7 +381,7 @@ $(COMMDIR)\y_tab.c: $(COMMDIR)\dosyacc.c
|
||||
$(COMMDIR)\lex_yy.c: $(COMMDIR)\doslex.c
|
||||
copy "$(COMMDIR)"\doslex.c "$(COMMDIR)"\lex_yy.c
|
||||
|
||||
$(OBJECTS): $(WXDIR)/include/wx/setup.h
|
||||
$(OBJECTS): $(SETUP_H)
|
||||
|
||||
$(COMMDIR)\$D\unzip.obj: $(COMMDIR)\unzip.c
|
||||
cl @<<
|
||||
|
||||
@ -18,7 +18,11 @@ MINGW32=1
|
||||
MINGW32VERSION=2.95
|
||||
|
||||
# If building DLL, the version
|
||||
WXVERSION=23_2
|
||||
WXVERSION=232
|
||||
|
||||
ifndef UNICODE
|
||||
UNICODE=0
|
||||
endif
|
||||
|
||||
# Say yes if you have a "modern" linker that supports --shared option.
|
||||
# Note that you're probably going to wait forever for dlltool/gcc/etc
|
||||
@ -178,7 +182,7 @@ endif
|
||||
#ifeq ($(MINGW32),1)
|
||||
#INC = -I$(WXINC) -I$(WXDIR)/contrib/include -I$(WXDIR)/src/png -I$(WXDIR)/src/jpeg -I$(WXDIR)/src/zlib -I$(WXDIR)/src/tiff $(EXTRAINC) $(COMPPATHS)
|
||||
#else
|
||||
INC = -I$(WXINC) -I$(WXDIR)/contrib/include -I$(WXDIR)/src/regex -I$(WXDIR)/src/png -I$(WXDIR)/src/jpeg -I$(WXDIR)/src/zlib -I$(WXDIR)/src/tiff $(EXTRAINC) $(COMPPATHS) -I$(WXDIR)/include/wx/msw/gnuwin32
|
||||
INC = -I$(WXDIR)/lib/msw$(INCEXT) -I$(WXINC) -I$(WXDIR)/contrib/include -I$(WXDIR)/src/regex -I$(WXDIR)/src/png -I$(WXDIR)/src/jpeg -I$(WXDIR)/src/zlib -I$(WXDIR)/src/tiff $(EXTRAINC) $(COMPPATHS) -I$(WXDIR)/include/wx/msw/gnuwin32
|
||||
#endif
|
||||
|
||||
RCLFLAGS=-cpp "cpp -lang-c++ -DWIN32 -D_WIN32 -DRCL_INVOKED -I$(WXWIN)/include"
|
||||
@ -201,14 +205,26 @@ LDLIBS = $(LIBS)
|
||||
# OBJDIR = objects$(GUISUFFIX)
|
||||
OBJDIR = .
|
||||
|
||||
ifeq ($(UNICODE),1)
|
||||
UNIEXT=u
|
||||
else
|
||||
UNIEXT=
|
||||
endif
|
||||
|
||||
ifeq ($(WXMAKINGDLL)$(WXUSINGDLL),)
|
||||
INCEXT=$(UNIEXT)
|
||||
else
|
||||
INCEXT=dll$(UNIEXT)
|
||||
endif
|
||||
|
||||
ifdef WXMAKINGDLL
|
||||
EXTRADLLFLAGS = -DWXMAKINGDLL=1 -D_DLL=1 -D_WINDLL=1
|
||||
WXLIB=$(WXDIR)/lib/$(LIBPREFIX)wx$(WXVERSION).$(LIBSUFF)
|
||||
WXLIB=$(WXDIR)/lib/$(LIBPREFIX)wxmsw$(WXVERSION)$(UNIEXT).$(LIBSUFF)
|
||||
endif
|
||||
|
||||
ifdef WXUSINGDLL
|
||||
EXTRADLLFLAGS = -DWXUSINGDLL=1
|
||||
WXLIB=$(WXDIR)/lib/$(LIBPREFIX)wx$(WXVERSION).$(LIBSUFF)
|
||||
WXLIB=$(WXDIR)/lib/$(LIBPREFIX)wxmsw$(WXVERSION)$(UNIEXT).$(LIBSUFF)
|
||||
endif
|
||||
|
||||
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
RM= erase
|
||||
!endif
|
||||
|
||||
WXVERSION=23_2
|
||||
WXVERSION=232
|
||||
WIN95=1
|
||||
|
||||
!if "$(WIN95)" == "0"
|
||||
@ -99,6 +99,10 @@ EXTRADLLFLAGS=
|
||||
EXTRADLLFLAGS=$(EXTRADLLFLAGS) /DNOMAIN
|
||||
!endif
|
||||
|
||||
!ifndef UNICODE
|
||||
UNICODE=0
|
||||
!endif
|
||||
|
||||
!ifndef FINAL
|
||||
FINAL=0
|
||||
DEBUG=1
|
||||
@ -118,15 +122,20 @@ NOPCH=0
|
||||
# wx$(WXVERSION) (DLL release), wx$(WXVERSION)d (DLL debug)
|
||||
|
||||
!if "$(WXMAKINGDLL)" == "1" || "$(WXUSINGDLL)" == "1"
|
||||
WXLIBNAME=wx$(WXVERSION)
|
||||
WXLIBNAME=wxmsw$(WXVERSION)
|
||||
!else
|
||||
WXLIBNAME=wx
|
||||
WXLIBNAME=wxmsw
|
||||
!endif
|
||||
|
||||
!if "$(NEW_WXLIBNAME)" != ""
|
||||
WXLIBNAME=$(NEW_WXLIBNAME)
|
||||
!endif
|
||||
|
||||
!if "$(UNICODE)" == "1"
|
||||
UNIEXT=u
|
||||
WXLIBNAME=$(WXLIBNAME)$(UNIEXT)
|
||||
!endif
|
||||
|
||||
!if "$(FINAL)" == "1"
|
||||
D=Release
|
||||
!else if "$(FINAL)" == "hybrid"
|
||||
@ -145,16 +154,23 @@ WXLIBNAME=$(WXLIBNAME)$(LIBEXT)
|
||||
!if "$(wxUSE_GUI)" == "0"
|
||||
WXLIBNAME=wxBase
|
||||
D=Base$(D)
|
||||
WXLIBNAME=$(WXLIBNAME)$(LIBEXT)
|
||||
WXLIBNAME=$(WXLIBNAME)$(UNIEXT)$(LIBEXT)
|
||||
!endif
|
||||
|
||||
!if "$(UNICODE)" == "1"
|
||||
D=$(D)Unicode
|
||||
!endif
|
||||
|
||||
INCEXT=$(UNIEXT)$(LIBEXT)
|
||||
|
||||
!if "$(WXMAKINGDLL)" == "1" || "$(WXUSINGDLL)" == "1"
|
||||
D=$(D)DLL
|
||||
INCEXT=dll$(INCEXT)
|
||||
!endif
|
||||
|
||||
WXLIB=$(WXDIR)\lib\$(WXLIBNAME).lib
|
||||
|
||||
INC=$(EXTRAINC) -I$(WXINC) -I$(WXDIR)/contrib/include -I$(WXDIR)/src/regex -I$(WXDIR)/src/png -I$(WXDIR)/src/zlib -I$(WXDIR)/src/jpeg -I$(WXDIR)/src/tiff
|
||||
INC=$(EXTRAINC) -I$(WXDIR)/lib/msw$(INCEXT) -I$(WXINC) -I$(WXDIR)/contrib/include -I$(WXDIR)/src/regex -I$(WXDIR)/src/png -I$(WXDIR)/src/zlib -I$(WXDIR)/src/jpeg -I$(WXDIR)/src/tiff
|
||||
|
||||
!if "$(WXUSINGDLL)" == "1" || "$(wxUSE_GUI)" == "0"
|
||||
LIBS = $(EXTRALIBS) $(WXLIB) $(WINLIBS) $(WXDIR)\lib\regex$(LIBEXT).lib $(WXDIR)\lib\zlib$(LIBEXT).lib
|
||||
@ -212,9 +228,9 @@ MAKEPRECOMP=/YcWX/WXPREC.H
|
||||
|
||||
|
||||
|
||||
CPPFLAGS=$(WINFLAGS) $(DEBUG_FLAGS) $(PRECOMP) $(EXTRAFLAGS) /D__WXMSW__ $(INC) $(OPT) $(EXTRADLLFLAGS) $(CRTFLAG) /D__WINDOWS__ /GX /DSTRICT $(OVERRIDEFLAGS)
|
||||
CPPFLAGS=$(WINFLAGS) $(DEBUG_FLAGS) $(PRECOMP) $(EXTRAFLAGS) /D__WXMSW__ $(INC) $(OPT) $(EXTRADLLFLAGS) $(CRTFLAG) /D__WINDOWS__ /GX $(OVERRIDEFLAGS)
|
||||
# If you don't include wxprec.h, use CPPFLAGS2
|
||||
CPPFLAGS2=$(WINFLAGS) $(DEBUG_FLAGS) /D__WXMSW__ $(INC) $(EXTRAFLAGS) $(OPT) $(EXTRADLLFLAGS) $(CRTFLAG) /D__WINDOWS__ /GX /DSTRICT $(OVERRIDEFLAGS)
|
||||
CPPFLAGS2=$(WINFLAGS) $(DEBUG_FLAGS) /D__WXMSW__ $(INC) $(EXTRAFLAGS) $(OPT) $(EXTRADLLFLAGS) $(CRTFLAG) /D__WINDOWS__ /GX $(OVERRIDEFLAGS)
|
||||
!if "$(wxUSE_GUI)" == "0"
|
||||
LINKFLAGS=$(LINK_DEBUG_FLAGS) $(BASELINKFLAGS)
|
||||
!else
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# This file was automatically generated by tmake at 23:49, 2001/10/14
|
||||
# This file was automatically generated by tmake at 23:00, 2001/10/18
|
||||
# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE G95.T!
|
||||
|
||||
#
|
||||
@ -21,11 +21,11 @@ include $(WXDIR)/src/makeg95.env
|
||||
|
||||
# DLL Name, if building wxWindows as a DLL.
|
||||
ifdef WXMAKINGDLL
|
||||
WXDLL = $(WXDIR)/lib/wx$(WXVERSION).dll
|
||||
WXDEF = wx$(WXVERSION).def
|
||||
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/libtiff.a $(WXDIR)/lib/libregex.a
|
||||
DLL_LDFLAGS = -L$(WXDIR)/lib
|
||||
DLL_LDLIBS = -mwindows -lcomctl32 -lctl3d32 -lole32 -loleaut32 \
|
||||
-luuid -lrpcrt4 -lodbc32 -lwinmm -lopengl32 \
|
||||
@ -46,11 +46,13 @@ JPEGDIR = $(WXDIR)/src/jpeg
|
||||
TIFFDIR = $(WXDIR)/src/tiff
|
||||
OLEDIR = $(WXDIR)/src/msw/ole
|
||||
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
|
||||
|
||||
DOCDIR = $(WXDIR)/docs
|
||||
|
||||
@ -478,12 +480,23 @@ else
|
||||
OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(DIRDLGOBJ)
|
||||
endif
|
||||
|
||||
ARCHINCDIR=$(subst /,\,$(WXDIR))\lib\msw$(INCEXT)
|
||||
|
||||
SETUP_H=$(ARCHINCDIR)\wx\setup.h
|
||||
|
||||
ifndef WXMAKINGDLL
|
||||
all: $(OBJECTS) $(WXLIB) $(ZLIBLIB) $(PNGLIB) $(JPEGLIB) $(TIFFLIB)
|
||||
all: $(SETUP_H) $(OBJECTS) $(WXLIB) $(ZLIBLIB) $(PNGLIB) $(JPEGLIB) $(TIFFLIB) $(REGEXLIB)
|
||||
else
|
||||
all: $(OBJECTS) $(ZLIBLIB) $(PNGLIB) $(JPEGLIB) $(TIFFLIB) $(WXDLL)
|
||||
all: $(SETUP_H) $(OBJECTS) $(ZLIBLIB) $(PNGLIB) $(JPEGLIB) $(TIFFLIB) $(REGEXLIB) $(WXDLL)
|
||||
endif
|
||||
|
||||
$(ARCHINCDIR)\wx:
|
||||
mkdir $(ARCHINCDIR)
|
||||
mkdir $(ARCHINCDIR)\wx
|
||||
|
||||
$(SETUP_H): $(ARCHINCDIR)\wx
|
||||
$(COPY) $(WXDIR)\include\wx\msw\setup.h $@
|
||||
|
||||
ifndef WXMAKINGDLL
|
||||
|
||||
$(WXLIB): $(OBJECTS) $(EXTRAOBJS)
|
||||
@ -551,8 +564,10 @@ $(TIFFLIB): $(TIFFOBJS)
|
||||
$(AR) $(AROPTIONS) $@ $(TIFFOBJS)
|
||||
$(RANLIB) $@
|
||||
|
||||
$(REGEXLIB):
|
||||
$(MAKE) -C $(REGEXDIR) -f makefile.g95 WXDIR=$(WXDIR)
|
||||
|
||||
$(OBJECTS): $(WXINC)/wx/defs.h $(WXINC)/wx/object.h $(WXINC)/wx/setup.h
|
||||
$(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
|
||||
@ -563,14 +578,6 @@ $(COMMDIR)/y_tab.c: $(COMMDIR)/dosyacc.c
|
||||
$(COMMDIR)/lex_yy.c: $(COMMDIR)/doslex.c
|
||||
$(COPY) ../common/doslex.c ../common/lex_yy.c
|
||||
|
||||
|
||||
#
|
||||
# NOTE: by default, you don't need to run $(LEX) and $(YACC)
|
||||
# to rebuild lex_yy.c and y_tab.c, since these will be copied
|
||||
# from the doslex.c and dosyacc.c files. So, normally you
|
||||
# don't need to uncomment the following lines.
|
||||
#
|
||||
#
|
||||
# Replace lex with flex if you run into compilation
|
||||
# problems with lex_yy.c. See also note about LEX_SCANNER
|
||||
# above.
|
||||
@ -621,6 +628,8 @@ clean:
|
||||
-$(RM) ../jpeg/*.bak
|
||||
-$(RM) ../tiff/*.o
|
||||
-$(RM) ../tiff/*.bak
|
||||
-$(RM) ../regex/*.o
|
||||
-$(RM) ../regex/*.bak
|
||||
|
||||
cleanall: clean
|
||||
-$(RM) $(WXLIB)
|
||||
@ -628,6 +637,7 @@ cleanall: clean
|
||||
-$(RM) $(PNGLIB)
|
||||
-$(RM) $(JPEGLIB)
|
||||
-$(RM) $(TIFFLIB)
|
||||
-$(RM) $(REGEXLIB)
|
||||
|
||||
ifdef WXMAKINGDLL
|
||||
-$(RM) $(WXDLL)
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# This file was automatically generated by tmake at 23:49, 2001/10/14
|
||||
# This file was automatically generated by tmake at 22:51, 2001/10/18
|
||||
# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE VC.T!
|
||||
|
||||
# File: makefile.vc
|
||||
@ -391,15 +391,20 @@ HTMLOBJS = $(HTMLDIR)\$D\helpctrl.obj \
|
||||
# Add $(HTMLOBJS) if wanting wxHTML classes
|
||||
OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS)
|
||||
|
||||
ARCHINCDIR=$(WXDIR)\lib\msw$(INCEXT)
|
||||
SETUP_H=$(ARCHINCDIR)\wx\setup.h
|
||||
|
||||
# Normal, static library
|
||||
all: setuph dirs $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) png zlib jpeg tiff regex $(LIBTARGET)
|
||||
all: dirs $(SETUP_H) $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) png zlib jpeg tiff regex $(LIBTARGET)
|
||||
|
||||
setuph:
|
||||
cd $(WXDIR)\include\wx\msw
|
||||
if not exist setup.h copy setup0.h setup.h
|
||||
cd $(WXDIR)\src\msw
|
||||
$(ARCHINCDIR)\wx:
|
||||
mkdir $(ARCHINCDIR)
|
||||
mkdir $(ARCHINCDIR)\wx
|
||||
|
||||
dirs: $(MSWDIR)\$D $(COMMDIR)\$D $(GENDIR)\$D $(OLEDIR)\$D $(HTMLDIR)\$D $(JPEGDIR)\$D $(TIFFDIR)\$D $(REGEXDIR)\$D
|
||||
$(SETUP_H):
|
||||
copy $(WXDIR)\include\wx\msw\setup.h $@
|
||||
|
||||
dirs: $(MSWDIR)\$D $(COMMDIR)\$D $(GENDIR)\$D $(OLEDIR)\$D $(HTMLDIR)\$D $(JPEGDIR)\$D $(TIFFDIR)\$D $(REGEXDIR)\$D $(ARCHINCDIR)\wx
|
||||
|
||||
$D:
|
||||
mkdir $D
|
||||
@ -430,18 +435,18 @@ $(REGEXDIR)\$D:
|
||||
|
||||
# wxWindows library as DLL
|
||||
dll:
|
||||
nmake -f makefile.vc all FINAL=$(FINAL) DLL=1 WXMAKINGDLL=1 NEW_WXLIBNAME=$(NEW_WXLIBNAME)
|
||||
nmake -f makefile.vc all FINAL=$(FINAL) DLL=1 WXMAKINGDLL=1 NEW_WXLIBNAME=$(NEW_WXLIBNAME) UNICODE=$(UNICODE)
|
||||
|
||||
cleandll:
|
||||
nmake -f makefile.vc clean FINAL=$(FINAL) DLL=1 WXMAKINGDLL=1 NEW_WXLIBNAME=$(NEW_WXLIBNAME)
|
||||
nmake -f makefile.vc clean FINAL=$(FINAL) DLL=1 WXMAKINGDLL=1 NEW_WXLIBNAME=$(NEW_WXLIBNAME) UNICODE=$(UNICODE)
|
||||
|
||||
# wxWindows + app as DLL. Only affects main.cpp.
|
||||
dllapp:
|
||||
nmake -f makefile.vc all FINAL=$(FINAL) DLL=1
|
||||
nmake -f makefile.vc all FINAL=$(FINAL) DLL=1 UNICODE=$(UNICODE)
|
||||
|
||||
# wxWindows + app as DLL, for Netscape plugin - remove DllMain.
|
||||
dllnp:
|
||||
nmake -f makefile.vc all NOMAIN=1 FINAL=$(FINAL) DLL=1
|
||||
nmake -f makefile.vc all NOMAIN=1 FINAL=$(FINAL) DLL=1 UNICODE=$(UNICODE)
|
||||
|
||||
# Use this to make dummy.obj and generate a PCH.
|
||||
# You might use the dll target, then the pch target, in order to
|
||||
@ -517,10 +522,10 @@ $(WXDIR)\lib\$(WXLIBNAME).dll: $(DUMMYOBJ) $(OBJECTS)
|
||||
########################################################
|
||||
# Windows-specific objects
|
||||
|
||||
$D\dummy.obj: dummy.$(SRCSUFF) $(WXDIR)\include\wx\wx.h $(WXDIR)\include\wx\msw\setup.h
|
||||
$D\dummy.obj: dummy.$(SRCSUFF) $(WXDIR)\include\wx\wx.h $(SETUP_H)
|
||||
cl $(CPPFLAGS) $(MAKEPRECOMP) /Fo$D\dummy.obj /c /Tp dummy.cpp
|
||||
|
||||
$D\dummydll.obj: dummydll.$(SRCSUFF) $(WXDIR)\include\wx\wx.h $(WXDIR)\include\wx\msw\setup.h
|
||||
$D\dummydll.obj: dummydll.$(SRCSUFF) $(WXDIR)\include\wx\wx.h $(SETUP_H)
|
||||
cl @<<
|
||||
$(CPPFLAGS) $(MAKEPRECOMP) /Fo$D\dummydll.obj /c /Tp dummydll.cpp
|
||||
<<
|
||||
@ -601,7 +606,7 @@ $(COMMDIR)\y_tab.c: $(COMMDIR)\dosyacc.c
|
||||
$(COMMDIR)\lex_yy.c: $(COMMDIR)\doslex.c
|
||||
copy "$(COMMDIR)"\doslex.c "$(COMMDIR)"\lex_yy.c
|
||||
|
||||
$(OBJECTS): $(WXDIR)/include/wx/setup.h
|
||||
$(OBJECTS): $(SETUP_H)
|
||||
|
||||
$(COMMDIR)\$D\unzip.obj: $(COMMDIR)\unzip.c
|
||||
cl @<<
|
||||
|
||||
Loading…
Reference in New Issue
Block a user