-# This file was automatically generated by tmake at 20:55, 2001/07/13
+# This file was automatically generated by tmake at 23:49, 2001/10/14
# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE VC.T!
# File: makefile.vc
# Set to 0 if not using GLCanvas (only affects DLL build)
USE_GLCANVAS=1
+# Set to 0 if you are using MSVC 5
+USE_MSVC_5=0
+
# These are absolute paths, so that the compiler
# generates correct __FILE__ symbols for debugging.
# Otherwise you don't be able to double-click on a memory
HTMLDIR = $(WXDIR)\src\html
JPEGDIR = $(WXDIR)\src\jpeg
TIFFDIR = $(WXDIR)\src\tiff
+REGEXDIR = $(WXDIR)\src\regex
+
{$(GENDIR)}.cpp{$(GENDIR)\$D}.obj:
cl @<<
$(COMMDIR)\$D\appcmn.obj \
$(COMMDIR)\$D\choiccmn.obj \
$(COMMDIR)\$D\clipcmn.obj \
+ $(COMMDIR)\$D\clntdata.obj \
$(COMMDIR)\$D\cmdline.obj \
$(COMMDIR)\$D\cmdproc.obj \
$(COMMDIR)\$D\cmndata.obj \
$(COMMDIR)\$D\config.obj \
+ $(COMMDIR)\$D\containr.obj \
$(COMMDIR)\$D\cshelp.obj \
$(COMMDIR)\$D\ctrlcmn.obj \
$(COMMDIR)\$D\ctrlsub.obj \
$(COMMDIR)\$D\encconv.obj \
$(COMMDIR)\$D\event.obj \
$(COMMDIR)\$D\extended.obj \
+ $(COMMDIR)\$D\fddlgcmn.obj \
$(COMMDIR)\$D\ffile.obj \
$(COMMDIR)\$D\file.obj \
$(COMMDIR)\$D\fileconf.obj \
$(COMMDIR)\$D\serbase.obj \
$(COMMDIR)\$D\sizer.obj \
$(COMMDIR)\$D\socket.obj \
+ $(COMMDIR)\$D\statbar.obj \
$(COMMDIR)\$D\strconv.obj \
$(COMMDIR)\$D\stream.obj \
$(COMMDIR)\$D\string.obj \
$(COMMDIR)\$D\textfile.obj \
$(COMMDIR)\$D\timercmn.obj \
$(COMMDIR)\$D\tokenzr.obj \
+ $(COMMDIR)\$D\toplvcmn.obj \
$(COMMDIR)\$D\treebase.obj \
$(COMMDIR)\$D\txtstrm.obj \
$(COMMDIR)\$D\unzip.obj \
$(OLEDIR)\$D\droptgt.obj \
$(MSWDIR)\$D\enhmeta.obj \
$(MSWDIR)\$D\evtloop.obj \
+ $(MSWDIR)\$D\fdrepdlg.obj \
$(MSWDIR)\$D\filedlg.obj \
$(MSWDIR)\$D\font.obj \
$(MSWDIR)\$D\fontdlg.obj \
$(MSWDIR)\$D\glcanvas.obj \
$(MSWDIR)\$D\gsocket.obj \
$(MSWDIR)\$D\gsockmsw.obj \
+ $(MSWDIR)\$D\helpbest.obj \
$(MSWDIR)\$D\helpchm.obj \
$(MSWDIR)\$D\helpwin.obj \
$(MSWDIR)\$D\icon.obj \
$(MSWDIR)\$D\thread.obj \
$(MSWDIR)\$D\timer.obj \
$(MSWDIR)\$D\tooltip.obj \
+ $(MSWDIR)\$D\toplevel.obj \
$(MSWDIR)\$D\treectrl.obj \
$(MSWDIR)\$D\utils.obj \
$(MSWDIR)\$D\utilsexc.obj \
OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS)
# Normal, static library
-all: setuph dirs $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) png zlib jpeg tiff $(LIBTARGET)
+all: setuph dirs $(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
-dirs: $(MSWDIR)\$D $(COMMDIR)\$D $(GENDIR)\$D $(OLEDIR)\$D $(HTMLDIR)\$D $(JPEGDIR)\$D $(TIFFDIR)\$D
+dirs: $(MSWDIR)\$D $(COMMDIR)\$D $(GENDIR)\$D $(OLEDIR)\$D $(HTMLDIR)\$D $(JPEGDIR)\$D $(TIFFDIR)\$D $(REGEXDIR)\$D
$D:
mkdir $D
$(TIFFDIR)\$D:
mkdir $(TIFFDIR)\$D
+$(REGEXDIR)\$D:
+ mkdir $(REGEXDIR)\$D
+
# wxWindows library as DLL
dll:
nmake -f makefile.vc all FINAL=$(FINAL) DLL=1 WXMAKINGDLL=1 NEW_WXLIBNAME=$(NEW_WXLIBNAME)
# GL_LIBS_DELAY=/delayload:opengl32.dll
!endif
+!if "$(USE_MSVC_5)" == "1"
+# we are too big
+INCREMENTAL=/INCREMENTAL:NO
+DELAY_LOAD=
+!else
+INCREMENTAL=
+DELAY_LOAD=delayimp.lib \
+ /delayload:ws2_32.dll /delayload:advapi32.dll /delayload:user32.dll \
+ /delayload:gdi32.dll \
+ /delayload:comdlg32.dll /delayload:shell32.dll /delayload:comctl32.dll \
+ /delayload:ole32.dll \
+ /delayload:oleaut32.dll /delayload:rpcrt4.dll $(GL_LIBS_DELAY)
+!endif
+
# Update the dynamic link library
$(WXDIR)\lib\$(WXLIBNAME).dll: $(DUMMYOBJ) $(OBJECTS)
$(link) @<<
- $(LINKFLAGS)
+ $(LINKFLAGS) $(INCREMENTAL)
-out:$(WXDIR)\lib\$(WXLIBNAME).dll
- $(DUMMYOBJ) $(OBJECTS) $(guilibsdll) shell32.lib comctl32.lib ctl3d32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib odbc32.lib advapi32.lib winmm.lib $(GL_LIBS) $(WXDIR)\lib\png$(LIBEXT).lib $(WXDIR)\lib\zlib$(LIBEXT).lib $(WXDIR)\lib\jpeg$(LIBEXT).lib $(WXDIR)\lib\tiff$(LIBEXT).lib
- delayimp.lib
- /delayload:ws2_32.dll /delayload:advapi32.dll /delayload:user32.dll /delayload:gdi32.dll
- /delayload:comdlg32.dll /delayload:shell32.dll /delayload:comctl32.dll /delayload:ole32.dll
- /delayload:oleaut32.dll /delayload:rpcrt4.dll $(GL_LIBS_DELAY)
+ $(DUMMYOBJ) $(OBJECTS) $(guilibsdll) shell32.lib comctl32.lib ctl3d32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib odbc32.lib advapi32.lib winmm.lib $(GL_LIBS) $(WXDIR)\lib\png$(LIBEXT).lib $(WXDIR)\lib\zlib$(LIBEXT).lib $(WXDIR)\lib\jpeg$(LIBEXT).lib $(WXDIR)\lib\tiff$(LIBEXT).lib $(WXDIR)\lib\regex$(LIBEXT).lib $(DELAY_LOAD)
<<
!endif
nmake -f makefile.vc clean
cd $(WXDIR)\src\msw
+regex:
+ cd $(WXDIR)\src\regex
+ nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) CRTFLAG=$(CRTFLAG) all
+ cd $(WXDIR)\src\msw
+
+clean_regex:
+ cd $(WXDIR)\src\regex
+ nmake -f makefile.vc clean
+ cd $(WXDIR)\src\msw
+
rcparser:
cd $(WXDIR)\utils\rcparser\src
nmake -f makefile.vc FINAL=$(FINAL)
cd $(WXDIR)\src\msw
-cleanall: clean clean_png clean_zlib clean_jpeg clean_tiff
+cleanall: clean clean_png clean_zlib clean_jpeg clean_tiff clean_regex
-erase ..\..\lib\wx$(WXVERSION)$(LIBEXT).dll
-erase ..\..\lib\wx$(WXVERSION)$(LIBEXT).lib
-erase ..\..\lib\wx$(WXVERSION)$(LIBEXT).exp
projects / wxWidgets.git / blobdiff