projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed paper size calculation (convert from 10ths of mm to mm correctly)
[wxWidgets.git]
/
src
/
msw
/
makefile.vc
diff --git
a/src/msw/makefile.vc
b/src/msw/makefile.vc
index 700d65326de2be5a0029b9661d53390735e436b0..ab809e04a98db4844c006791272eae86f9ae8327 100644
(file)
--- a/
src/msw/makefile.vc
+++ b/
src/msw/makefile.vc
@@
-1,4
+1,4
@@
-# This file was automatically generated by tmake
+# This file was automatically generated by tmake
# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE VC.T!
# File: makefile.vc
# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE VC.T!
# File: makefile.vc
@@
-127,7
+127,6
@@
NONESSENTIALOBJS= $(GENDIR)\$D\colrdlgg.obj \
$(GENDIR)\$D\fontdlgg.obj \
$(GENDIR)\$D\helpext.obj \
$(GENDIR)\$D\helphtml.obj \
$(GENDIR)\$D\fontdlgg.obj \
$(GENDIR)\$D\helpext.obj \
$(GENDIR)\$D\helphtml.obj \
- $(GENDIR)\$D\helpwxht.obj \
$(GENDIR)\$D\imaglist.obj \
$(GENDIR)\$D\listctrl.obj \
$(GENDIR)\$D\msgdlgg.obj \
$(GENDIR)\$D\imaglist.obj \
$(GENDIR)\$D\listctrl.obj \
$(GENDIR)\$D\msgdlgg.obj \
@@
-137,6
+136,8
@@
NONESSENTIALOBJS= $(GENDIR)\$D\colrdlgg.obj \
COMMONOBJS = \
$(COMMDIR)\$D\y_tab.obj \
$(COMMDIR)\$D\appcmn.obj \
COMMONOBJS = \
$(COMMDIR)\$D\y_tab.obj \
$(COMMDIR)\$D\appcmn.obj \
+ $(COMMDIR)\$D\artprov.obj \
+ $(COMMDIR)\$D\artstd.obj \
$(COMMDIR)\$D\choiccmn.obj \
$(COMMDIR)\$D\clipcmn.obj \
$(COMMDIR)\$D\clntdata.obj \
$(COMMDIR)\$D\choiccmn.obj \
$(COMMDIR)\$D\clipcmn.obj \
$(COMMDIR)\$D\clntdata.obj \
@@
-190,9
+191,11
@@
COMMONOBJS = \
$(COMMDIR)\$D\hashmap.obj \
$(COMMDIR)\$D\helpbase.obj \
$(COMMDIR)\$D\http.obj \
$(COMMDIR)\$D\hashmap.obj \
$(COMMDIR)\$D\helpbase.obj \
$(COMMDIR)\$D\http.obj \
+ $(COMMDIR)\$D\iconbndl.obj \
$(COMMDIR)\$D\imagall.obj \
$(COMMDIR)\$D\imagbmp.obj \
$(COMMDIR)\$D\image.obj \
$(COMMDIR)\$D\imagall.obj \
$(COMMDIR)\$D\imagbmp.obj \
$(COMMDIR)\$D\image.obj \
+ $(COMMDIR)\$D\imagfill.obj \
$(COMMDIR)\$D\imaggif.obj \
$(COMMDIR)\$D\imagiff.obj \
$(COMMDIR)\$D\imagjpeg.obj \
$(COMMDIR)\$D\imaggif.obj \
$(COMMDIR)\$D\imagiff.obj \
$(COMMDIR)\$D\imagjpeg.obj \
@@
-450,18
+453,18
@@
$(WXDIR)\$D:
# wxWindows library as DLL
dll:
# wxWindows library as DLL
dll:
- nmake -f makefile.vc all FINAL=$(FINAL) DLL=1 WXMAKINGDLL=1 NEW_WXLIBNAME=$(NEW_WXLIBNAME) UNICODE=$(UNICODE)
+ nmake -f makefile.vc all FINAL=$(FINAL) DLL=1 WXMAKINGDLL=1 NEW_WXLIBNAME=$(NEW_WXLIBNAME) UNICODE=$(UNICODE)
MSLU=$(MSLU)
cleandll:
cleandll:
- nmake -f makefile.vc clean FINAL=$(FINAL) DLL=1 WXMAKINGDLL=1 NEW_WXLIBNAME=$(NEW_WXLIBNAME) UNICODE=$(UNICODE)
+ nmake -f makefile.vc clean FINAL=$(FINAL) DLL=1 WXMAKINGDLL=1 NEW_WXLIBNAME=$(NEW_WXLIBNAME) UNICODE=$(UNICODE)
MSLU=$(MSLU)
# wxWindows + app as DLL. Only affects main.cpp.
dllapp:
# wxWindows + app as DLL. Only affects main.cpp.
dllapp:
- nmake -f makefile.vc all FINAL=$(FINAL) DLL=1 UNICODE=$(UNICODE)
+ nmake -f makefile.vc all FINAL=$(FINAL) DLL=1 UNICODE=$(UNICODE)
MSLU=$(MSLU)
# wxWindows + app as DLL, for Netscape plugin - remove DllMain.
dllnp:
# wxWindows + app as DLL, for Netscape plugin - remove DllMain.
dllnp:
- nmake -f makefile.vc all NOMAIN=1 FINAL=$(FINAL) DLL=1 UNICODE=$(UNICODE)
+ nmake -f makefile.vc all NOMAIN=1 FINAL=$(FINAL) DLL=1 UNICODE=$(UNICODE)
MSLU=$(MSLU)
# Use this to make dummy.obj and generate a PCH.
# You might use the dll target, then the pch target, in order to
# Use this to make dummy.obj and generate a PCH.
# You might use the dll target, then the pch target, in order to
@@
-527,7
+530,7
@@
$(WXDIR)\lib\$(WXLIBNAME).dll: $(DUMMYOBJ) $(OBJECTS)
$(link) @<<
$(LINKFLAGS) $(INCREMENTAL)
-out:$(WXDIR)\lib\$(WXLIBNAME).dll
$(link) @<<
$(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 $(WXDIR)\lib\regex$(LIBEXT).lib $(DELAY_LOAD)
+ $(DUMMYOBJ) $(OBJECTS) $(
MSLU_LIBS) $(
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
<<
!endif