diff options
| author | grischka <grischka> | 2017-02-20 18:58:08 +0100 |
|---|---|---|
| committer | grischka <grischka> | 2017-02-20 18:58:08 +0100 |
| commit | 5f33d313c8a2455ff9036cd7f7028339bdbde622 (patch) | |
| tree | e620f3c5a67e0f785046ee188ffbd00e593c2212 /win32/lib | |
| parent | 399237850d87be8ef1179d2592ade660152aaabc (diff) | |
| download | tinycc-5f33d313c8a2455ff9036cd7f7028339bdbde622.tar.gz tinycc-5f33d313c8a2455ff9036cd7f7028339bdbde622.tar.bz2 | |
tcc: re-enable correct option -r support
Forgot about it. It allows to compile several
sources (and other .o's) to one single .o file;
tcc -r -o all.o f1.c f2.c f3.S o4.o ...
Also:
- option -fold-struct-init-code removed, no effect anymore
- (tcc_)set_environment() moved to tcc.c
- win32/lib/(win)crt1 minor fix & add dependency
- debug line output for asm (tcc -c -g xxx.S) enabled
- configure/Makefiles: x86-64 -> x86_64 changes
- README: cleanup
Diffstat (limited to 'win32/lib')
| -rw-r--r-- | win32/lib/crt1.c | 5 | ||||
| -rw-r--r-- | win32/lib/user32.def | 4 | ||||
| -rw-r--r-- | win32/lib/wincrt1.c | 2 |
3 files changed, 10 insertions, 1 deletions
diff --git a/win32/lib/crt1.c b/win32/lib/crt1.c index a9b1a30..2cb25c0 100644 --- a/win32/lib/crt1.c +++ b/win32/lib/crt1.c @@ -73,15 +73,18 @@ int _runtmain(int argc, /* as tcc passed in */ char **argv) _startupinfo start_info = {0}; __tgetmainargs(&wargc, &wargv, &wenv, _dowildcard, &start_info); + /* may be wrong when tcc has received wildcards (*.c) */ if (argc < wargc) wargv += wargc - argc; + else + argc = wargc; #define argv wargv #endif #ifdef __i386 _controlfp(_PC_53, _MCW_PC); #endif - return _tmain(argc, argv, NULL); + return _tmain(argc, argv, _tenviron); } // ============================================= diff --git a/win32/lib/user32.def b/win32/lib/user32.def index 4d2f704..a034dac 100644 --- a/win32/lib/user32.def +++ b/win32/lib/user32.def @@ -336,6 +336,10 @@ GetWindow GetWindowContextHelpId GetWindowDC GetWindowInfo +GetWindowLongPtrA +GetWindowLongPtrW +SetWindowLongPtrA +SetWindowLongPtrW GetWindowLongA GetWindowLongW GetWindowModuleFileNameA diff --git a/win32/lib/wincrt1.c b/win32/lib/wincrt1.c index a4197bb..0a5036e 100644 --- a/win32/lib/wincrt1.c +++ b/win32/lib/wincrt1.c @@ -80,6 +80,8 @@ int _runtwinmain(int argc, /* as tcc passed in */ char **argv) __tgetmainargs(&wargc, &wargv, &wenv, 0, &start_info); if (argc < wargc) wargv += wargc - argc; + else + argc = wargc; #define argv wargv #endif |
