diff options
| author | Christian Kamm <[email protected]> | 2010-04-08 10:39:55 +0200 |
|---|---|---|
| committer | Christian Kamm <[email protected]> | 2010-04-08 10:39:55 +0200 |
| commit | 81834daae23283c3b4253cd4f6606057fab2ddf6 (patch) | |
| tree | 71268f8ccc17ac0a2993e2f20c248fa5d992543d | |
| parent | 03e409d190953cc5b2fcf4ecb223014e8b338ee2 (diff) | |
| -rw-r--r-- | coroutine.pro | 2 | ||||
| -rw-r--r-- | src/backend/switchstack_gcc_32_win.s | 8 | ||||
| -rw-r--r-- | src/src.pro | 3 |
3 files changed, 6 insertions, 7 deletions
diff --git a/coroutine.pro b/coroutine.pro index 6b0e996..85d12ac 100644 --- a/coroutine.pro +++ b/coroutine.pro @@ -4,7 +4,7 @@ SUBDIRS = src include(doc/doc.pri) system(echo "INCLUDEPATH *= $$PWD/src" > use_coroutine.pri) -system(echo "LIBS *= -L$$OUT_PWD/lib" >> use_coroutine.pri) +system(echo "LIBS *= -L$$OUT_PWD/src/build" >> use_coroutine.pri) system(echo "LIBS *= -l$$qtLibraryTarget(coroutine)" >> use_coroutine.pri) system(echo "unix:LIBS *= -Wl,-rpath,$$OUT_PWD/lib" >> use_coroutine.pri) diff --git a/src/backend/switchstack_gcc_32_win.s b/src/backend/switchstack_gcc_32_win.s index 156e1ca..b2339fa 100644 --- a/src/backend/switchstack_gcc_32_win.s +++ b/src/backend/switchstack_gcc_32_win.s @@ -27,11 +27,11 @@ ## ########################################################################## -.global _switchStackInternal -.section .text -.def _switchStackInternal ; .scl 2 ; .type 32 ; .endef +.global __switchStackInternal +.section .text +.def __switchStackInternal ; .scl 2 ; .type 32 ; .endef -_switchStackInternal: +__switchStackInternal: // save callee-saved registers push %ebp movl %esp, %ebp diff --git a/src/src.pro b/src/src.pro index e086c79..efb0692 100644 --- a/src/src.pro +++ b/src/src.pro @@ -3,7 +3,6 @@ CONFIG += dll DEFINES += COROUTINE_LIBRARY unix: CONFIG += hide_symbols -DESTDIR = ../lib TARGET = coroutine include(adjusttarget.pri) @@ -23,7 +22,7 @@ contains(QMAKE_CXX,g++) { win32 { # will fail for 64 bit win! SOURCES += \ - backend/switchstack_gcc_32_win.cpp \ + backend/switchstack_gcc_32_win.s \ backend/initializestack_32.cpp } |