projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added src/msw/files.lst to the list of files to generate and updated it
[wxWidgets.git]
/
distrib
/
msw
/
tmake
/
dos.t
diff --git
a/distrib/msw/tmake/dos.t
b/distrib/msw/tmake/dos.t
index f3e30fb933c8d4f1a3c2c4a83e0f5e0cdfe0e1b5..8cb5b66e3100b35fd152c4e167b13170e1ed615b 100644
(file)
--- a/
distrib/msw/tmake/dos.t
+++ b/
distrib/msw/tmake/dos.t
@@
-14,7
+14,7
@@
#! now transform these hashes into $project tags
foreach $file (sort keys %wxGeneric) {
if ( $wxGeneric{$file} =~ /\b(PS|G|U)\b/ ) {
#! now transform these hashes into $project tags
foreach $file (sort keys %wxGeneric) {
if ( $wxGeneric{$file} =~ /\b(PS|G|U)\b/ ) {
- #!
this file for some reason wasn't compiled for VC++ 1.52
+ #!
Need this file too since it has wxGenericPageSetupDialog
next unless $file =~ /^prntdlgg\./;
}
next unless $file =~ /^prntdlgg\./;
}
@@
-32,7
+32,9
@@
$isCFile = $file =~ /\.c$/;
$file =~ s/cp?p?$/obj/;
$obj = "\$(COMMDIR)\\" . $file . " ";
$isCFile = $file =~ /\.c$/;
$file =~ s/cp?p?$/obj/;
$obj = "\$(COMMDIR)\\" . $file . " ";
- $project{"WXCOMMONOBJS"} .= $obj;
+ #! $project{"WXCOMMONOBJS"} .= $obj;
+ #! have to split lib in 2 halves because otherwise it's too big
+ $project{$file =~ "^[a-o]" ? "WXCOMMONOBJS1" : "WXCOMMONOBJS2"} .= $obj;
$project{"WXCOBJS"} .= $obj if $isCFile;
}
$project{"WXCOBJS"} .= $obj if $isCFile;
}
@@
-76,7
+78,7
@@
DUMMYOBJ=dummy.obj
# This one overrides the others, to be consistent with the settings in wx_setup.h
MINIMAL_WXWINDOWS_SETUP=0
# This one overrides the others, to be consistent with the settings in wx_setup.h
MINIMAL_WXWINDOWS_SETUP=0
-USE_XPM_IN_MSW=
0
+USE_XPM_IN_MSW=
1
USE_CTL3D=1
!if "$(MINIMAL_WXWINDOWS_SETUP)" == "1"
USE_CTL3D=1
!if "$(MINIMAL_WXWINDOWS_SETUP)" == "1"
@@
-93,7
+95,7
@@
PERIPH_CLEAN_TARGET=
# !endif
!if "$(USE_XPM_IN_MSW)" == "1"
# !endif
!if "$(USE_XPM_IN_MSW)" == "1"
-PERIPH_LIBS=$(WXDIR)\
contrib\wxxpm
\xpm.lib $(PERIPH_LIBS)
+PERIPH_LIBS=$(WXDIR)\
lib
\xpm.lib $(PERIPH_LIBS)
PERIPH_TARGET=xpm $(PERIPH_TARGET)
PERIPH_CLEAN_TARGET=clean_xpm $(PERIPH_CLEAN_TARGET)
!endif
PERIPH_TARGET=xpm $(PERIPH_TARGET)
PERIPH_CLEAN_TARGET=clean_xpm $(PERIPH_CLEAN_TARGET)
!endif
@@
-109,9
+111,13
@@
MSWDIR=.
GENERICOBJS= #$ ExpandList("WXGENERICOBJS");
GENERICOBJS= #$ ExpandList("WXGENERICOBJS");
-COMMONOBJS = \
+# we can't have all objects in one list because the library becomes too big
+COMMONOBJS1 = \
$(COMMDIR)\y_tab.obj \
$(COMMDIR)\y_tab.obj \
- #$ ExpandList("WXCOMMONOBJS");
+ #$ ExpandList("WXCOMMONOBJS1");
+
+COMMONOBJS2 = \
+ #$ ExpandList("WXCOMMONOBJS2");
# we can't have all objects in one list because the library becomes too big
MSWOBJS1 = #$ ExpandList("WXMSWOBJS1");
# we can't have all objects in one list because the library becomes too big
MSWOBJS1 = #$ ExpandList("WXMSWOBJS1");
@@
-122,46
+128,56
@@
MSWOBJS2 = #$ ExpandList("WXMSWOBJS2");
# $(OLEDIR)\xpmhand \
# $(OLEDIR)\pnghand \
# $(OLEDIR)\xpmhand \
# $(OLEDIR)\pnghand \
-OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS1) $(MSWOBJS2)
+OBJECTS = $(COMMONOBJS
1) $(COMMONOBJS2
) $(GENERICOBJS) $(MSWOBJS1) $(MSWOBJS2)
# Normal, static library
# Normal, static library
-all: $(DUMMYOBJ) $(WXDIR)\lib\wx1.lib $(WXDIR)\lib\wx2.lib $(WXDIR)\lib\wx3.lib $(WXDIR)\lib\wx4.lib
+all: $(DUMMYOBJ) $(WXDIR)\lib\wx1.lib $(WXDIR)\lib\wx2.lib $(WXDIR)\lib\wx3.lib $(WXDIR)\lib\wx4.lib
$(WXDIR)\lib\wx5.lib
-$(WXDIR)\lib\wx1.lib: $(COMMONOBJS) $(PERIPH_LIBS)
+$(WXDIR)\lib\wx1.lib: $(COMMONOBJS
1
) $(PERIPH_LIBS)
-erase $(WXDIR)\lib\wx1.lib
lib /PAGESIZE:128 @<<
$(WXDIR)\lib\wx1.lib
y
-erase $(WXDIR)\lib\wx1.lib
lib /PAGESIZE:128 @<<
$(WXDIR)\lib\wx1.lib
y
-$(COMMONOBJS) $(PERIPH_LIBS)
+$(COMMONOBJS
1
) $(PERIPH_LIBS)
nul
;
<<
nul
;
<<
-$(WXDIR)\lib\wx2.lib: $(
GENERICOBJS
)
+$(WXDIR)\lib\wx2.lib: $(
COMMONOBJS2
)
-erase $(WXDIR)\lib\wx2.lib
lib /PAGESIZE:128 @<<
$(WXDIR)\lib\wx2.lib
y
-erase $(WXDIR)\lib\wx2.lib
lib /PAGESIZE:128 @<<
$(WXDIR)\lib\wx2.lib
y
-$(
GENERICOBJS
)
+$(
COMMONOBJS2
)
nul
;
<<
nul
;
<<
-$(WXDIR)\lib\wx3.lib: $(
MSWOBJS1
)
+$(WXDIR)\lib\wx3.lib: $(
GENERICOBJS
)
-erase $(WXDIR)\lib\wx3.lib
lib /PAGESIZE:128 @<<
$(WXDIR)\lib\wx3.lib
y
-erase $(WXDIR)\lib\wx3.lib
lib /PAGESIZE:128 @<<
$(WXDIR)\lib\wx3.lib
y
-$(
MSWOBJS1
)
+$(
GENERICOBJS
)
nul
;
<<
nul
;
<<
-$(WXDIR)\lib\wx4.lib: $(MSWOBJS
2
)
+$(WXDIR)\lib\wx4.lib: $(MSWOBJS
1
)
-erase $(WXDIR)\lib\wx4.lib
lib /PAGESIZE:128 @<<
$(WXDIR)\lib\wx4.lib
y
-erase $(WXDIR)\lib\wx4.lib
lib /PAGESIZE:128 @<<
$(WXDIR)\lib\wx4.lib
y
+$(MSWOBJS1)
+nul
+;
+<<
+
+$(WXDIR)\lib\wx5.lib: $(MSWOBJS2)
+ -erase $(WXDIR)\lib\wx5.lib
+ lib /PAGESIZE:128 @<<
+$(WXDIR)\lib\wx5.lib
+y
$(MSWOBJS2)
nul
;
$(MSWOBJS2)
nul
;
@@
-184,7
+200,7
@@
$(CPPFLAGS) /YcWX/WXPREC.H /c /Tp $*.$(SRCSUFF)
<<
#${
<<
#${
- $_ = $project{"WXMSWOBJS1"} . $project{"WXMSWOBJS2"} . $project{"WXCOMMONOBJS"} . $project{"WXGENERICOBJS"};
+ $_ = $project{"WXMSWOBJS1"} . $project{"WXMSWOBJS2"} . $project{"WXCOMMONOBJS
1"} . $project{"WXCOMMONOBJS2
"} . $project{"WXGENERICOBJS"};
my @objs = split;
foreach (@objs) {
if ( $project{"WXCOBJS"} =~ / \Q$_\E / ) {
my @objs = split;
foreach (@objs) {
if ( $project{"WXCOBJS"} =~ / \Q$_\E / ) {
@@
-219,6
+235,8
@@
$(OBJECTS): $(WXDIR)/include/wx/setup.h
# Peripheral components
# Peripheral components
+$(WXDIR)\lib\xpm.lib: xpm
+
xpm:
cd $(WXDIR)\src\xpm
nmake -f makefile.dos FINAL=$(FINAL)
xpm:
cd $(WXDIR)\src\xpm
nmake -f makefile.dos FINAL=$(FINAL)