зеркало из https://github.com/mozilla/pjs.git
Wince tool fixes. Removes msvcrt linkage which hoses us on device. Cleans up whitespace. npodb
This commit is contained in:
Родитель
80d3ef61c4
Коммит
3c1165faf9
|
@ -15,41 +15,41 @@ main(int argc, char **argv)
|
||||||
args[i++] = "/LIBPATH:\"" WCE_CRT "\"";
|
args[i++] = "/LIBPATH:\"" WCE_CRT "\"";
|
||||||
args[i++] = "/LIBPATH:\"" SHUNT_LIB "\"";
|
args[i++] = "/LIBPATH:\"" SHUNT_LIB "\"";
|
||||||
|
|
||||||
args[i++] = "winsock.lib";
|
|
||||||
args[i++] = "corelibc.lib";
|
args[i++] = "corelibc.lib";
|
||||||
args[i++] = "coredll.lib";
|
args[i++] = "coredll.lib";
|
||||||
args[i++] = "ceshell.lib";
|
args[i++] = "ceshell.lib";
|
||||||
args[i++] = "ole32.lib";
|
|
||||||
args[i++] = "mmtimer.lib";
|
args[i++] = "mmtimer.lib";
|
||||||
args[i++] = "mozce_shunt.lib";
|
args[i++] = "mozce_shunt.lib";
|
||||||
|
|
||||||
args[i++] = "/NODEFAULTLIB:LIBC";
|
args[i++] = "/NODEFAULTLIB:LIBC";
|
||||||
args[i++] = "/NODEFAULTLIB:OLDNAMES";
|
args[i++] = "/NODEFAULTLIB:OLDNAMES";
|
||||||
|
args[i++] = "/NODEFAULTLIB:MSVCRT";
|
||||||
|
|
||||||
// if -DLL is not passed, then change the entry to 'main'
|
// if -DLL is not passed, then change the entry to 'main'
|
||||||
while(argv[j])
|
while(argv[j]) {
|
||||||
{
|
|
||||||
if (strncmp(argv[j], "-DLL", 4) == 0 || strncmp(argv[j], "/DLL", 4) == 0)
|
|
||||||
{
|
|
||||||
k = 1;
|
|
||||||
|
|
||||||
}
|
if (strncmp(argv[j], "-DLL", 4) == 0 ||
|
||||||
if (strncmp(argv[j], "-entry", 6) == 0 || strncmp(argv[j], "/entry", 6) == 0 || strncmp(argv[j], "-ENTRY", 6) == 0 || strncmp(argv[j], "/ENTRY",6 ) == 0)
|
strncmp(argv[j], "/DLL", 4) == 0) {
|
||||||
{
|
k = 1;
|
||||||
k = 1;
|
}
|
||||||
|
if (strncmp(argv[j], "-entry", 6) == 0 ||
|
||||||
}
|
strncmp(argv[j], "/entry", 6) == 0 ||
|
||||||
if (strncmp(argv[j], "-subsystem:", 11) == 0 || strncmp(argv[j], "/subsystem:", 11) == 0 || strncmp(argv[j], "-SUBSYSTEM:", 11) == 0 || strncmp(argv[j], "/SUBSYSTEM:", 11) == 0)
|
strncmp(argv[j], "-ENTRY", 6) == 0 ||
|
||||||
{
|
strncmp(argv[j], "/ENTRY",6 ) == 0) {
|
||||||
s = 1;
|
k = 1;
|
||||||
|
}
|
||||||
}
|
if (strncmp(argv[j], "-subsystem:", 11) == 0 ||
|
||||||
|
strncmp(argv[j], "/subsystem:", 11) == 0 ||
|
||||||
|
strncmp(argv[j], "-SUBSYSTEM:", 11) == 0 ||
|
||||||
|
strncmp(argv[j], "/SUBSYSTEM:", 11) == 0) {
|
||||||
|
s = 1;
|
||||||
|
}
|
||||||
j++;
|
j++;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (k==0)
|
if (k==0)
|
||||||
args[i++] = "/ENTRY:main";
|
args[i++] = "/ENTRY:main";
|
||||||
|
|
||||||
if (s==0){
|
if (s==0){
|
||||||
args[i++] = "/subsystem:\"WINDOWSCE,5.02\"";
|
args[i++] = "/subsystem:\"WINDOWSCE,5.02\"";
|
||||||
}
|
}
|
||||||
|
|
|
@ -15,37 +15,37 @@ main(int argc, char **argv)
|
||||||
args[i++] = "/LIBPATH:\"" WCE_CRT "\"";
|
args[i++] = "/LIBPATH:\"" WCE_CRT "\"";
|
||||||
args[i++] = "/LIBPATH:\"" SHUNT_LIB "\"";
|
args[i++] = "/LIBPATH:\"" SHUNT_LIB "\"";
|
||||||
|
|
||||||
args[i++] = "winsock.lib";
|
|
||||||
args[i++] = "corelibc.lib";
|
args[i++] = "corelibc.lib";
|
||||||
args[i++] = "coredll.lib";
|
args[i++] = "coredll.lib";
|
||||||
args[i++] = "ceshell.lib";
|
args[i++] = "ceshell.lib";
|
||||||
args[i++] = "ole32.lib";
|
|
||||||
args[i++] = "mmtimer.lib";
|
args[i++] = "mmtimer.lib";
|
||||||
args[i++] = "mozce_shunt.lib";
|
args[i++] = "mozce_shunt.lib";
|
||||||
|
|
||||||
args[i++] = "/NODEFAULTLIB:LIBC";
|
args[i++] = "/NODEFAULTLIB:LIBC";
|
||||||
args[i++] = "/NODEFAULTLIB:OLDNAMES";
|
args[i++] = "/NODEFAULTLIB:OLDNAMES";
|
||||||
|
args[i++] = "/NODEFAULTLIB:MSVCRT";
|
||||||
|
|
||||||
// if -DLL is not passed, then change the entry to 'main'
|
// if -DLL is not passed, then change the entry to 'main'
|
||||||
while(argv[j])
|
while(argv[j]) {
|
||||||
{
|
|
||||||
if (strncmp(argv[j], "-DLL", 4) == 0 || strncmp(argv[j], "/DLL", 4) == 0)
|
|
||||||
{
|
|
||||||
k = 1;
|
|
||||||
|
|
||||||
}
|
if (strncmp(argv[j], "-DLL", 4) == 0 ||
|
||||||
if (strncmp(argv[j], "-entry", 6) == 0 || strncmp(argv[j], "/entry", 6) == 0 || strncmp(argv[j], "-ENTRY", 6) == 0 || strncmp(argv[j], "/ENTRY",6 ) == 0)
|
strncmp(argv[j], "/DLL", 4) == 0) {
|
||||||
{
|
k = 1;
|
||||||
k = 1;
|
}
|
||||||
|
if (strncmp(argv[j], "-entry", 6) == 0 ||
|
||||||
}
|
strncmp(argv[j], "/entry", 6) == 0 ||
|
||||||
if (strncmp(argv[j], "-subsystem:", 11) == 0 || strncmp(argv[j], "/subsystem:", 11) == 0 || strncmp(argv[j], "-SUBSYSTEM:", 11) == 0 || strncmp(argv[j], "/SUBSYSTEM:", 11) == 0)
|
strncmp(argv[j], "-ENTRY", 6) == 0 ||
|
||||||
{
|
strncmp(argv[j], "/ENTRY",6 ) == 0) {
|
||||||
s = 1;
|
k = 1;
|
||||||
|
}
|
||||||
}
|
if (strncmp(argv[j], "-subsystem:", 11) == 0 ||
|
||||||
|
strncmp(argv[j], "/subsystem:", 11) == 0 ||
|
||||||
|
strncmp(argv[j], "-SUBSYSTEM:", 11) == 0 ||
|
||||||
|
strncmp(argv[j], "/SUBSYSTEM:", 11) == 0) {
|
||||||
|
s = 1;
|
||||||
|
}
|
||||||
j++;
|
j++;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (k==0)
|
if (k==0)
|
||||||
args[i++] = "/ENTRY:main";
|
args[i++] = "/ENTRY:main";
|
||||||
|
|
Загрузка…
Ссылка в новой задаче