diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2009-04-20 06:08:47 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2009-04-20 06:08:47 +0000 |
| commit | bd91999ea577266b0d899ea206cdaa8d19f486b2 (patch) | |
| tree | 6936e209210662a34db4f9b9c63d03b95e7d9956 /auto | |
| parent | b533e9825295a0855d78912dae9d8f1180df0900 (diff) | |
| download | nginx-bd91999ea577266b0d899ea206cdaa8d19f486b2.tar.gz nginx-bd91999ea577266b0d899ea206cdaa8d19f486b2.tar.bz2 | |
Win32 master/workers model
Diffstat (limited to 'auto')
| -rw-r--r-- | auto/cc/bcc | 2 | ||||
| -rw-r--r-- | auto/cc/msvc | 7 | ||||
| -rw-r--r-- | auto/cc/owc | 2 | ||||
| -rw-r--r-- | auto/sources | 7 |
4 files changed, 10 insertions, 8 deletions
diff --git a/auto/cc/bcc b/auto/cc/bcc index 638b7dc2f..9570a3c47 100644 --- a/auto/cc/bcc +++ b/auto/cc/bcc @@ -46,7 +46,7 @@ NGX_USE_PCH="-Hu -H=$NGX_OBJS/ngx_config.csm" # Win32 GUI mode application -LINK="\$(CC) -laa" +#LINK="\$(CC) -laa" # the resource file diff --git a/auto/cc/msvc b/auto/cc/msvc index 4a053283f..d002bec38 100644 --- a/auto/cc/msvc +++ b/auto/cc/msvc @@ -86,11 +86,14 @@ LIBC="-MT" CFLAGS="$CFLAGS $LIBC" -# Win32 GUI mode application CORE_LIBS="$CORE_LIBS kernel32.lib user32.lib" -CORE_LINK="$CORE_LINK -subsystem:windows -entry:mainCRTStartup" + +# Win32 GUI mode application +#CORE_LINK="$CORE_LINK -subsystem:windows -entry:mainCRTStartup" # debug +# msvc8 under Wine issues +# Program database manager mismatch; please check your installation if [ $NGX_CC_NAME != msvc8 ]; then CFLAGS="$CFLAGS -Zi" CORE_LINK="$CORE_LINK -debug" diff --git a/auto/cc/owc b/auto/cc/owc index 868860041..1a5fa210b 100644 --- a/auto/cc/owc +++ b/auto/cc/owc @@ -71,7 +71,7 @@ NGX_USE_PCH="-fh=$NGX_OBJS/ngx_config.pch" # the link flags, built target is NT GUI mode application -CORE_LINK="$CORE_LINK -l=nt_win" +#CORE_LINK="$CORE_LINK -l=nt_win" # the resource file diff --git a/auto/sources b/auto/sources index 4c14634de..7ee0d44e4 100644 --- a/auto/sources +++ b/auto/sources @@ -215,8 +215,6 @@ WIN32_DEPS="$CORE_DEPS $EVENT_DEPS \ src/os/win32/ngx_socket.h \ src/os/win32/ngx_os.h \ src/os/win32/ngx_user.h \ - src/os/win32/ngx_gui.h \ - src/os/win32/ngx_gui_resources.h \ src/os/win32/ngx_process_cycle.h" WIN32_CONFIG=src/os/win32/ngx_win32_config.h @@ -233,14 +231,15 @@ WIN32_SRCS="$CORE_SRCS $EVENT_SRCS \ src/os/win32/ngx_wsarecv.c \ src/os/win32/ngx_wsarecv_chain.c \ src/os/win32/ngx_udp_wsarecv.c \ + src/os/win32/ngx_wsasend.c \ src/os/win32/ngx_wsasend_chain.c \ src/os/win32/ngx_win32_init.c \ src/os/win32/ngx_user.c \ - src/os/win32/ngx_gui.c \ + src/os/win32/ngx_event_log.c \ src/os/win32/ngx_process_cycle.c \ src/event/ngx_event_acceptex.c" -NGX_WIN32_ICONS="src/os/win32/nginx.ico src/os/win32/nginx_tray.ico" +NGX_WIN32_ICONS="src/os/win32/nginx.ico" NGX_WIN32_RC="src/os/win32/nginx.rc" |