Mercurial > dwindows
annotate makefile.vac @ 1483:73f2ad84d4ec
Fixed OS/2 windows being shown when setting position/size.
Moved the OS/2 specific DW_OS2_NEW_WINDOW flag into os2/dw.c.
Deprecated and essentially removed DW_FCF_SHELLPOSITION and
DW_FCF_NOBYTEALIGN. These were OS/2 specific and are set
automatically now... FCF_SHELLPOSITION was causing the
positioning problems that necessitated the window being shown
to set the size and position. Right now SHELLPOSITION isn't
used at all... causing shell positioning to not work.
I hope to have a way to allow shell positioning to work again
soon but the idea I had to do this did not work.
| author | bsmith@81767d24-ef19-dc11-ae90-00e081727c95 |
|---|---|
| date | Fri, 23 Dec 2011 15:58:13 +0000 |
| parents | e79cf0d73caf |
| children | 623a42cf06f4 |
| rev | line source |
|---|---|
| 3 | 1 .SUFFIXES: .c .obj |
| 2 | |
|
1166
568b37e4b167
Attempt at importing the svn revision with VAC/nmake.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
300
diff
changeset
|
3 !if ![cmd /c os2\svnrev.cmd] |
|
568b37e4b167
Attempt at importing the svn revision with VAC/nmake.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
300
diff
changeset
|
4 !include SVN.REV |
|
568b37e4b167
Attempt at importing the svn revision with VAC/nmake.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
300
diff
changeset
|
5 !endif |
|
568b37e4b167
Attempt at importing the svn revision with VAC/nmake.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
300
diff
changeset
|
6 |
| 3 | 7 .all: \ |
| 8 .\dw.dll \ | |
|
1379
e79cf0d73caf
Revert dwtest change to test deleting menu items...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1361
diff
changeset
|
9 .\dwcompat.dll \ |
|
e79cf0d73caf
Revert dwtest change to test deleting menu items...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1361
diff
changeset
|
10 .\dwtest.exe |
| 3 | 11 |
| 12 .c.obj: | |
|
1166
568b37e4b167
Attempt at importing the svn revision with VAC/nmake.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
300
diff
changeset
|
13 icc.exe /DOS2 /DTCPV40HDRS /DBUILD_DLL /DVER_REV=$(VERREV) /I. /Tm+ /Tdc /Ss /Wprorearet /Wpro+ /V"Dynamic Windows Compatibility" /Ti /Gm /Gd- /G5 /Ge- /C /W3 /Wini+ /Wpar+ /Wpro+ /Wuse+ %s |
| 3 | 14 |
| 15 .\dw.dll: \ | |
| 16 .\os2\dw.obj | |
| 17 @echo " Link::Linker " | |
| 18 icc.exe @<< | |
| 19 /B" /NOE /de /ST:32768 /nologo /li" | |
|
1360
32a5be18e187
Source tree cleanup, move import/export definition files to their platform folder.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1167
diff
changeset
|
20 /Fe"dw.dll" os2\dw.def |
| 3 | 21 .\dw.obj |
| 22 so32dll.lib | |
| 23 tcp32dll.lib | |
| 24 << | |
|
1361
324812debcc9
Missed a couple .DEF file references on OS/2 and...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1360
diff
changeset
|
25 IMPLIB DW.LIB OS2\DW.DEF |
| 3 | 26 copy dw.lib lib\dw.lib |
| 27 copy dw.dll dll\dw.dll | |
| 28 | |
| 29 .\dwcompat.dll: \ | |
| 30 .\os2\dirent.obj \ | |
| 31 .\compat.obj | |
| 32 @echo " Link::Linker " | |
| 33 icc.exe @<< | |
| 34 /B" /NOE /de /ST:32768 /nologo /li" | |
|
1360
32a5be18e187
Source tree cleanup, move import/export definition files to their platform folder.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1167
diff
changeset
|
35 /Fe"dwcompat.dll" os2\dwcompat.def |
| 3 | 36 .\dirent.obj |
| 37 .\compat.obj | |
| 38 so32dll.lib | |
| 39 tcp32dll.lib | |
| 40 << | |
|
1361
324812debcc9
Missed a couple .DEF file references on OS/2 and...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1360
diff
changeset
|
41 IMPLIB DWCOMPAT.LIB OS2\DWCOMPAT.DEF |
| 3 | 42 copy dwcompat.lib lib\dwcompat.lib |
| 43 copy dwcompat.dll dll\dwcompat.dll | |
| 44 | |
|
192
d946e329670c
Added test application for OS/2, and allow dw_color_xxx_set() to use OS/2
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
56
diff
changeset
|
45 dwtest.obj: |
|
300
4559a2fd2db2
Keypress handler fixes, more need to be done, because I screwed up and
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
192
diff
changeset
|
46 icc /Ti /DOS2 /DTCPV40HDRS /Sp1 /I. /Sm /Ss /Q /Gm /Gt /C dwtest.c |
|
192
d946e329670c
Added test application for OS/2, and allow dw_color_xxx_set() to use OS/2
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
56
diff
changeset
|
47 dwtest.exe: dwtest.obj |
|
d946e329670c
Added test application for OS/2, and allow dw_color_xxx_set() to use OS/2
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
56
diff
changeset
|
48 icc @<< |
|
d946e329670c
Added test application for OS/2, and allow dw_color_xxx_set() to use OS/2
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
56
diff
changeset
|
49 /B" /DE /optfunc" |
|
d946e329670c
Added test application for OS/2, and allow dw_color_xxx_set() to use OS/2
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
56
diff
changeset
|
50 /Fedwtest.exe |
|
d946e329670c
Added test application for OS/2, and allow dw_color_xxx_set() to use OS/2
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
56
diff
changeset
|
51 lib\dw.lib lib\dwcompat.lib |
|
d946e329670c
Added test application for OS/2, and allow dw_color_xxx_set() to use OS/2
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
56
diff
changeset
|
52 dwtest.obj |
|
1360
32a5be18e187
Source tree cleanup, move import/export definition files to their platform folder.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1167
diff
changeset
|
53 os2\dwtest.def |
|
192
d946e329670c
Added test application for OS/2, and allow dw_color_xxx_set() to use OS/2
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
56
diff
changeset
|
54 << |
| 3 | 55 clean : |
| 56 @if exist *.obj del *.obj | |
| 57 @if exist *.map del *.map | |
| 58 @if exist *.lib del *.lib | |
| 59 @if exist *.dll del *.dll | |
| 60 @if exist *.exe del *.exe | |
|
1167
5668d269beb3
Add *.REV to the clean rules on Windows and OS/2 when using nmake.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1166
diff
changeset
|
61 @if exist *.REV del *.REV |
| 3 | 62 |