diff options
| author | Steve Huston <shuston@riverace.com> | 2003-03-21 00:45:52 +0000 |
|---|---|---|
| committer | Steve Huston <shuston@riverace.com> | 2003-03-21 00:45:52 +0000 |
| commit | 81c4ceab9254238637d6ee3d7b5c3cc82db673e0 (patch) | |
| tree | ad679e5704df425b684cdd29e2df820cbb263e06 | |
| parent | 36f775fa3d6cce7b16d3cbbb3f6a15282d8a1f90 (diff) | |
| download | ATCD-81c4ceab9254238637d6ee3d7b5c3cc82db673e0.tar.gz | |
ChangeLogTag:Thu Mar 20 17:51:39 2003 Steve Huston <shuston@riverace.com>
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | bin/MakeProjectCreator/templates/em3vcp.mpd | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 1946bef580e..e587972bf04 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Thu Mar 20 17:51:39 2003 Steve Huston <shuston@riverace.com> + + * bin/MakeProjectCreator/templates/em3vcp.mpd: Only output a linker + /entry option if building a DLL. Let binary programs pick up the + correct entrypoint from the subsystem type. It defaults to windowsce, + requiring WinMainCRTStartup. + Thu Mar 20 14:11:01 2003 Ossama Othman <ossama@uci.edu> * ace/Codecs.cpp (encode, decode): diff --git a/bin/MakeProjectCreator/templates/em3vcp.mpd b/bin/MakeProjectCreator/templates/em3vcp.mpd index 23f2ec7f112..655333866e7 100644 --- a/bin/MakeProjectCreator/templates/em3vcp.mpd +++ b/bin/MakeProjectCreator/templates/em3vcp.mpd @@ -69,7 +69,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo <%if(sharedname)%>/o"<%libout%>\<%sharedname%>.bsc"<%endif%> <%if(type_is_binary)%> LINK32=link.exe -# ADD LINK32 <%systemlibs("winsock.lib commctrl.lib coredll.lib iphlpapi.lib")%> <%if(ssl)%><%foreach(ssl_libs)%><%ssl_lib%>.lib <%endfor%><%endif%>/INCREMENTAL:<%incremental("NO")%> <%foreach(lit_libs)%><%lit_lib%>.lib <%endfor%><%foreach(libs defaultlibs)%><%lib%><%lib_modifier%>.lib <%endfor%><%foreach(libpaths)%>/libpath:"<%libpath%>\<%machine%>" <%endfor%>/nologo /base:"<%base("0x00100000")%>" /stack:<%stack("0x10000,0x1000")%> /entry:"_DllMainCRTStartup" /nodefaultlib:"$(CENoDefaultLib)" /version:<%version("1.0")%> /subsystem:$(CESubsystem) /align:"<%align("4096")%>"<%if(pdb)%><%if(sharedname)%> /pdb:"<%dllout%>\<%machine%>\<%sharedname%><%lib_modifier%>.pdb"<%else%><%if(exename)%> /pdb:"<%if(install)%><%install%>\<%endif%><%output_dir%>\<%machine%>\<%exename%>.pdb"<%endif%><%endif%><%endif%> <%if(type_is_dynamic)%> /dll<%endif%> <%if(use_debug_libraries)%>/debug<%endif%> /machine:<%machine%> /out:"<%if(sharedname)%><%dllout%>\<%machine%>\<%sharedname%><%lib_modifier%>.dll<%endif%><%if(exename)%><%if(install)%><%install%>\<%endif%><%output_dir%>\<%machine%>\<%exename%>.exe<%endif%>" +# ADD LINK32 <%systemlibs("winsock.lib commctrl.lib coredll.lib iphlpapi.lib")%> <%if(ssl)%><%foreach(ssl_libs)%><%ssl_lib%>.lib <%endfor%><%endif%>/INCREMENTAL:<%incremental("NO")%> <%foreach(lit_libs)%><%lit_lib%>.lib <%endfor%><%foreach(libs defaultlibs)%><%lib%><%lib_modifier%>.lib <%endfor%><%foreach(libpaths)%>/libpath:"<%libpath%>\<%machine%>" <%endfor%>/nologo /base:"<%base("0x00100000")%>" /stack:<%stack("0x10000,0x1000")%> <%if(type_is_dynamic)%>/entry:"_DllMainCRTStartup"<%endif%> /nodefaultlib:"$(CENoDefaultLib)" /version:<%version("1.0")%> /subsystem:$(CESubsystem) /align:"<%align("4096")%>"<%if(pdb)%><%if(sharedname)%> /pdb:"<%dllout%>\<%machine%>\<%sharedname%><%lib_modifier%>.pdb"<%else%><%if(exename)%> /pdb:"<%if(install)%><%install%>\<%endif%><%output_dir%>\<%machine%>\<%exename%>.pdb"<%endif%><%endif%><%endif%> <%if(type_is_dynamic)%> /dll<%endif%> <%if(use_debug_libraries)%>/debug<%endif%> /machine:<%machine%> /out:"<%if(sharedname)%><%dllout%>\<%machine%>\<%sharedname%><%lib_modifier%>.dll<%endif%><%if(exename)%><%if(install)%><%install%>\<%endif%><%output_dir%>\<%machine%>\<%exename%>.exe<%endif%>" <%if(link_flags_removed)%> # SUBTRACT LINK32 <%link_flags_removed%> <%endif%> |