forked from 0ad/0ad
Autobuild fixes (untested)
This was SVN commit r7597.
This commit is contained in:
parent
7dca91f26b
commit
47ca9fc6cb
@ -635,6 +635,9 @@ function setup_main_exe ()
|
||||
|
||||
tinsert(package.buildflags, "no-rtti")
|
||||
|
||||
-- this seems to be required when using vcbuild but not the IDE (?!)
|
||||
tinsert(package.links, "ws2_32")
|
||||
|
||||
package.linkoptions = {
|
||||
-- wraps main thread in a __try block(see wseh.cpp). replace with mainCRTStartup if that's undesired.
|
||||
"/ENTRY:wseh_EntryPoint",
|
||||
@ -1050,6 +1053,9 @@ function setup_tests()
|
||||
-- from "lowlevel" static lib; must be added here to be linked in
|
||||
tinsert(package.files, source_root.."lib/sysdep/os/win/error_dialog.rc")
|
||||
|
||||
-- this seems to be required when using vcbuild but not the IDE (?!)
|
||||
tinsert(package.links, "ws2_32")
|
||||
|
||||
-- see wstartup.h
|
||||
tinsert(package.linkoptions, "/INCLUDE:_wstartup_InitAndRegisterShutdown")
|
||||
|
||||
|
@ -21,6 +21,10 @@ use Amazon::S3;
|
||||
use LWP::Simple();
|
||||
use DateTime;
|
||||
|
||||
# Fix clock drift, else S3 will be unhappy
|
||||
system("net time /setsntp:time.windows.com");
|
||||
system("w32tm /resync /rediscover");
|
||||
|
||||
my %config = (load_conf("c:\\0ad\\autobuild\\aws.conf"), load_conf("d:\\0ad\\autobuild\\run.conf"));
|
||||
my $timestamp = DateTime->now->iso8601;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user