Mercurial > dwindows
annotate makefile.emx @ 928:43a5b3c78c41
Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues...
because the groupbox border height couldn't be calculated until it was size. So first time we size the groupbox to
100x100 and calculate the border size... then the title calculation also works since it has been sized.
Second is the first major update to the layout engine in probably 10 years. The layout engine has now been
divided into 3 passes instead of 2. Previously the calculation and layout were done together in the second
pass... but this could cause layout to happen before all the box variables were finalized causing occassional
layout issues. Now the layout is done separately in a third pass after all the calculation is settled.
author | bsmith@81767d24-ef19-dc11-ae90-00e081727c95 |
---|---|
date | Sat, 23 Apr 2011 13:05:03 +0000 |
parents | 3ce487327afd |
children | 3222905690f2 |
rev | line source |
---|---|
638
3ce487327afd
Support for building binary for OS/2
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
525
diff
changeset
|
1 # $Id$ |
25
f9fd7238635c
Added EMX makefile.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
2 |
26
5e38361f823b
Removed old include directives.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
25
diff
changeset
|
3 # Dynamic Windows EMX Makefile |
25
f9fd7238635c
Added EMX makefile.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
4 |
f9fd7238635c
Added EMX makefile.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5 CC = gcc |
f9fd7238635c
Added EMX makefile.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6 RM = rm -f |
f9fd7238635c
Added EMX makefile.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7 RC = rc |
f9fd7238635c
Added EMX makefile.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8 MAKE = make |
f9fd7238635c
Added EMX makefile.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9 COMPRESS = lxlite |
638
3ce487327afd
Support for building binary for OS/2
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
525
diff
changeset
|
10 VER = 11 |
3ce487327afd
Support for building binary for OS/2
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
525
diff
changeset
|
11 VERDOT = 1.1 |
25
f9fd7238635c
Added EMX makefile.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
12 |
f9fd7238635c
Added EMX makefile.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
13 DEFS = |
f9fd7238635c
Added EMX makefile.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
14 LIBS = |
f9fd7238635c
Added EMX makefile.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
15 |
525
2ff26b697877
Fixes for building with Innotek GCC. Will have to check for regressions
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
511
diff
changeset
|
16 CFLAGS = -O -g -Zomf -Zmt -D__OS2__ -D__ST_MT_ERRNO__ -I. -Wall -o $(@) |
25
f9fd7238635c
Added EMX makefile.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
17 LDFLAGS = -Zdll -Zcrtdll |
f9fd7238635c
Added EMX makefile.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
18 RCFLAGS = -r |
f9fd7238635c
Added EMX makefile.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
19 |
f9fd7238635c
Added EMX makefile.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
20 |
525
2ff26b697877
Fixes for building with Innotek GCC. Will have to check for regressions
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
511
diff
changeset
|
21 COMPATOBJECTS = compat.obj dirent.obj |
174
75bf3051235f
Fixes so you can mix compilers.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
26
diff
changeset
|
22 COMPATSOURCES = compat.c dirent.c |
25
f9fd7238635c
Added EMX makefile.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
23 |
263
10a34404c825
Add more dependencies.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
174
diff
changeset
|
24 all: dw.dll dwcompat.dll dwtest.exe |
10a34404c825
Add more dependencies.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
174
diff
changeset
|
25 |
10a34404c825
Add more dependencies.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
174
diff
changeset
|
26 dw.dll: os2\dw.c dw.def |
10a34404c825
Add more dependencies.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
174
diff
changeset
|
27 $(CC) $(CFLAGS) $(DEFS) -o dw.dll os2/dw.c $(LDFLAGS) dw.def |
10a34404c825
Add more dependencies.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
174
diff
changeset
|
28 |
10a34404c825
Add more dependencies.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
174
diff
changeset
|
29 dw.lib: dw.def |
10a34404c825
Add more dependencies.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
174
diff
changeset
|
30 emximp -o dw.lib dw.def |
10a34404c825
Add more dependencies.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
174
diff
changeset
|
31 copy dw.dll dll |
10a34404c825
Add more dependencies.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
174
diff
changeset
|
32 copy dw.lib lib |
638
3ce487327afd
Support for building binary for OS/2
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
525
diff
changeset
|
33 |
263
10a34404c825
Add more dependencies.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
174
diff
changeset
|
34 dwcompat.dll: $(COMPATOBJECTS) dwcompat.def |
10a34404c825
Add more dependencies.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
174
diff
changeset
|
35 $(CC) $(CFLAGS) $(DEFS) -o dwcompat.dll $(COMPATOBJECTS) $(LDFLAGS) -lsocket dwcompat.def |
25
f9fd7238635c
Added EMX makefile.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
36 |
263
10a34404c825
Add more dependencies.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
174
diff
changeset
|
37 dwcompat.lib: dwcompat.def |
10a34404c825
Add more dependencies.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
174
diff
changeset
|
38 emximp -o dwcompat.lib dwcompat.def |
10a34404c825
Add more dependencies.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
174
diff
changeset
|
39 copy dwcompat.dll dll |
10a34404c825
Add more dependencies.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
174
diff
changeset
|
40 copy dwcompat.lib lib |
25
f9fd7238635c
Added EMX makefile.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
41 |
511
80dbd5a1f403
Removed the increments parameter from dw_scrollbar_new().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
288
diff
changeset
|
42 dwtest.exe: dwtest.o dw.lib dwcompat.lib |
80dbd5a1f403
Removed the increments parameter from dw_scrollbar_new().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
288
diff
changeset
|
43 $(CC) $(CFLAGS) -Zcrtdll -Zomf -Zmt -o dwtest.exe dwtest.o -Llib -ldw -ldwcompat dwtest.def |
263
10a34404c825
Add more dependencies.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
174
diff
changeset
|
44 |
638
3ce487327afd
Support for building binary for OS/2
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
525
diff
changeset
|
45 clean: |
263
10a34404c825
Add more dependencies.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
174
diff
changeset
|
46 $(RM) $(OBJECTS) dwtest.exe |
10a34404c825
Add more dependencies.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
174
diff
changeset
|
47 |
525
2ff26b697877
Fixes for building with Innotek GCC. Will have to check for regressions
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
511
diff
changeset
|
48 dw.obj: dw.c |
25
f9fd7238635c
Added EMX makefile.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
49 $(CC) $(CFLAGS) -c $< |
f9fd7238635c
Added EMX makefile.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
50 |
525
2ff26b697877
Fixes for building with Innotek GCC. Will have to check for regressions
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
511
diff
changeset
|
51 compat.obj: compat.c |
263
10a34404c825
Add more dependencies.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
174
diff
changeset
|
52 $(CC) $(CFLAGS) -c $< |
25
f9fd7238635c
Added EMX makefile.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
53 |
525
2ff26b697877
Fixes for building with Innotek GCC. Will have to check for regressions
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
511
diff
changeset
|
54 dirent.obj: os2/dirent.c |
263
10a34404c825
Add more dependencies.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
174
diff
changeset
|
55 $(CC) $(CFLAGS) -c $< |
25
f9fd7238635c
Added EMX makefile.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
56 |
525
2ff26b697877
Fixes for building with Innotek GCC. Will have to check for regressions
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
511
diff
changeset
|
57 dwtest.obj: dwtest.c |
263
10a34404c825
Add more dependencies.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
174
diff
changeset
|
58 $(CC) $(CFLAGS) -c $< |
25
f9fd7238635c
Added EMX makefile.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
59 |
638
3ce487327afd
Support for building binary for OS/2
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
525
diff
changeset
|
60 zip: dw.dll |
3ce487327afd
Support for building binary for OS/2
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
525
diff
changeset
|
61 copy os2\readme-os2.txt . |
3ce487327afd
Support for building binary for OS/2
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
525
diff
changeset
|
62 zip dwindows-os2-$(VERDOT).zip readme-os2.txt dw.dll dwcompat.dll dw.lib dwcompat.lib dw.h |