Mercurial > dwindows
annotate makefile.vac @ 2873:0bbfb19022e7
C++: GCC prior to 4.7 does not support the override keyword.
So if using earlier versions of GCC, just remove override.
This allows compilation on ancient GCC and GCC based Xcode.
Also remove virtual from the application, I don't think it
is needed and old GCC pukes on it when it is there.
author | bsmith@81767d24-ef19-dc11-ae90-00e081727c95 |
---|---|
date | Mon, 19 Dec 2022 07:42:12 +0000 |
parents | 1660b4ecb92f |
children |
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 |
2778
1660b4ecb92f
Win/OS2: Remove the lib and dll folders and their placeholders.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1746
diff
changeset
|
5 !endif |
1166
568b37e4b167
Attempt at importing the svn revision with VAC/nmake.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
300
diff
changeset
|
6 |
3 | 7 .all: \ |
2778
1660b4ecb92f
Win/OS2: Remove the lib and dll folders and their placeholders.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1746
diff
changeset
|
8 .\dw.dll \ |
1660b4ecb92f
Win/OS2: Remove the lib and dll folders and their placeholders.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1746
diff
changeset
|
9 .\dwcompat.dll \ |
1660b4ecb92f
Win/OS2: Remove the lib and dll folders and their placeholders.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1746
diff
changeset
|
10 .\dwtest.exe |
3 | 11 |
12 .c.obj: | |
2778
1660b4ecb92f
Win/OS2: Remove the lib and dll folders and their placeholders.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1746
diff
changeset
|
13 icc.exe /DOS2 /DTCPV40HDRS /DBUILD_DLL /DUNICODE /DVER_REV=$(VERREV) /I. /Tm+ /Tdc /Ss /V"Dynamic Windows Compatibility" /Ti /Gm /Gd- /G5 /Ge- /C /W3 %s |
3 | 14 |
15 .\dw.dll: \ | |
2778
1660b4ecb92f
Win/OS2: Remove the lib and dll folders and their placeholders.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1746
diff
changeset
|
16 .\os2\dw.obj |
1660b4ecb92f
Win/OS2: Remove the lib and dll folders and their placeholders.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1746
diff
changeset
|
17 @echo " Link::Linker " |
1660b4ecb92f
Win/OS2: Remove the lib and dll folders and their placeholders.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1746
diff
changeset
|
18 icc.exe @<< |
1660b4ecb92f
Win/OS2: Remove the lib and dll folders and their placeholders.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1746
diff
changeset
|
19 /B" /NOE /de /ST:32768 /nologo /li" |
1660b4ecb92f
Win/OS2: Remove the lib and dll folders and their placeholders.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1746
diff
changeset
|
20 /Fe"dw.dll" os2\dw.def |
1660b4ecb92f
Win/OS2: Remove the lib and dll folders and their placeholders.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1746
diff
changeset
|
21 .\dw.obj |
1660b4ecb92f
Win/OS2: Remove the lib and dll folders and their placeholders.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1746
diff
changeset
|
22 so32dll.lib |
1660b4ecb92f
Win/OS2: Remove the lib and dll folders and their placeholders.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1746
diff
changeset
|
23 tcp32dll.lib |
1660b4ecb92f
Win/OS2: Remove the lib and dll folders and their placeholders.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1746
diff
changeset
|
24 libuls.lib |
1660b4ecb92f
Win/OS2: Remove the lib and dll folders and their placeholders.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1746
diff
changeset
|
25 libconv.lib |
1660b4ecb92f
Win/OS2: Remove the lib and dll folders and their placeholders.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1746
diff
changeset
|
26 unikbd.lib |
3 | 27 << |
2778
1660b4ecb92f
Win/OS2: Remove the lib and dll folders and their placeholders.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1746
diff
changeset
|
28 IMPLIB DW.LIB OS2\DW.DEF |
3 | 29 |
30 .\dwcompat.dll: \ | |
2778
1660b4ecb92f
Win/OS2: Remove the lib and dll folders and their placeholders.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1746
diff
changeset
|
31 .\os2\dirent.obj \ |
1660b4ecb92f
Win/OS2: Remove the lib and dll folders and their placeholders.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1746
diff
changeset
|
32 .\dwcompat.obj |
1660b4ecb92f
Win/OS2: Remove the lib and dll folders and their placeholders.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1746
diff
changeset
|
33 @echo " Link::Linker " |
1660b4ecb92f
Win/OS2: Remove the lib and dll folders and their placeholders.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1746
diff
changeset
|
34 icc.exe @<< |
1660b4ecb92f
Win/OS2: Remove the lib and dll folders and their placeholders.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1746
diff
changeset
|
35 /B" /NOE /de /ST:32768 /nologo /li" |
1660b4ecb92f
Win/OS2: Remove the lib and dll folders and their placeholders.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1746
diff
changeset
|
36 /Fe"dwcompat.dll" os2\dwcompat.def |
1660b4ecb92f
Win/OS2: Remove the lib and dll folders and their placeholders.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1746
diff
changeset
|
37 .\dirent.obj |
1660b4ecb92f
Win/OS2: Remove the lib and dll folders and their placeholders.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1746
diff
changeset
|
38 .\dwcompat.obj |
1660b4ecb92f
Win/OS2: Remove the lib and dll folders and their placeholders.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1746
diff
changeset
|
39 so32dll.lib |
1660b4ecb92f
Win/OS2: Remove the lib and dll folders and their placeholders.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1746
diff
changeset
|
40 tcp32dll.lib |
3 | 41 << |
2778
1660b4ecb92f
Win/OS2: Remove the lib and dll folders and their placeholders.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1746
diff
changeset
|
42 IMPLIB DWCOMPAT.LIB OS2\DWCOMPAT.DEF |
3 | 43 |
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
|
44 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
|
45 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
|
46 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
|
47 icc @<< |
2778
1660b4ecb92f
Win/OS2: Remove the lib and dll folders and their placeholders.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1746
diff
changeset
|
48 /B" /DE /optfunc /pm:pm" |
1660b4ecb92f
Win/OS2: Remove the lib and dll folders and their placeholders.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1746
diff
changeset
|
49 /Fedwtest.exe |
1660b4ecb92f
Win/OS2: Remove the lib and dll folders and their placeholders.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1746
diff
changeset
|
50 dw.lib dwcompat.lib |
1660b4ecb92f
Win/OS2: Remove the lib and dll folders and their placeholders.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1746
diff
changeset
|
51 dwtest.obj |
1660b4ecb92f
Win/OS2: Remove the lib and dll folders and their placeholders.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1746
diff
changeset
|
52 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
|
53 << |
3 | 54 clean : |
2778
1660b4ecb92f
Win/OS2: Remove the lib and dll folders and their placeholders.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1746
diff
changeset
|
55 @if exist *.obj del *.obj |
1660b4ecb92f
Win/OS2: Remove the lib and dll folders and their placeholders.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1746
diff
changeset
|
56 @if exist *.map del *.map |
1660b4ecb92f
Win/OS2: Remove the lib and dll folders and their placeholders.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1746
diff
changeset
|
57 @if exist *.lib del *.lib |
1660b4ecb92f
Win/OS2: Remove the lib and dll folders and their placeholders.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1746
diff
changeset
|
58 @if exist *.dll del *.dll |
1660b4ecb92f
Win/OS2: Remove the lib and dll folders and their placeholders.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1746
diff
changeset
|
59 @if exist *.exe del *.exe |
1660b4ecb92f
Win/OS2: Remove the lib and dll folders and their placeholders.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1746
diff
changeset
|
60 @if exist *.REV del *.REV |