diff options
Diffstat (limited to 'auto/cc')
| -rw-r--r-- | auto/cc/bcc | 14 | ||||
| -rw-r--r-- | auto/cc/conf | 10 | ||||
| -rw-r--r-- | auto/cc/icc | 2 | ||||
| -rw-r--r-- | auto/cc/msvc | 10 | ||||
| -rw-r--r-- | auto/cc/owc | 11 |
5 files changed, 24 insertions, 23 deletions
diff --git a/auto/cc/bcc b/auto/cc/bcc index a76b68f70..4b8812924 100644 --- a/auto/cc/bcc +++ b/auto/cc/bcc @@ -34,10 +34,10 @@ CFLAGS="$CFLAGS -q" # precompiled headers -CORE_DEPS="$CORE_DEPS $OBJS/ngx_config.csm" -NGX_PCH="$OBJS/ngx_config.csm" -NGX_BUILD_PCH="-H=$OBJS/ngx_config.csm" -NGX_USE_PCH="-Hu -H=$OBJS/ngx_config.csm" +CORE_DEPS="$CORE_DEPS $NGX_OBJS/ngx_config.csm" +NGX_PCH="$NGX_OBJS/ngx_config.csm" +NGX_BUILD_PCH="-H=$NGX_OBJS/ngx_config.csm" +NGX_USE_PCH="-Hu -H=$NGX_OBJS/ngx_config.csm" # Win32 GUI mode application @@ -45,11 +45,11 @@ LINK="\$(CC) -laa" # the resource file -NGX_RES="$OBJS/nginx.res" -NGX_RCC="brcc32 -fo$OBJS/nginx.res \$(CORE_INCS) $NGX_WIN32_RC" +NGX_RES="$NGX_OBJS/nginx.res" +NGX_RCC="brcc32 -fo$NGX_OBJS/nginx.res \$(CORE_INCS) $NGX_WIN32_RC" # the pragma allows to link the resource file using bcc32 and # to avoid the direct ilink32 calling and the c0w32.obj's WinMain/main problem -NGX_PRAGMA="#pragma resource \"$OBJS/nginx.res\"" +NGX_PRAGMA="#pragma resource \"$NGX_OBJS/nginx.res\"" ngx_include_opt="-I" diff --git a/auto/cc/conf b/auto/cc/conf index c1f577e4e..0a5db9e34 100644 --- a/auto/cc/conf +++ b/auto/cc/conf @@ -92,11 +92,11 @@ fi CFLAGS="$CFLAGS $NGX_CC_OPT" -if [ "$PLATFORM" != win32 ]; then +if [ "$NGX_PLATFORM" != win32 ]; then if test -n "$NGX_LD_OPT"; then ngx_feature=--with-ld-opt=\"$NGX_LD_OPT\" - ngx_feature_name="DUMMY" + ngx_feature_name= ngx_feature_run=no ngx_feature_incs= ngx_feature_libs= @@ -111,7 +111,7 @@ if [ "$PLATFORM" != win32 ]; then fi ngx_feature="gcc variadic macros" - ngx_feature_name="HAVE_GCC_VARIADIC_MACROS" + ngx_feature_name="NGX_HAVE_GCC_VARIADIC_MACROS" ngx_feature_run=yes ngx_feature_incs="#include <stdio.h> #define var(dummy, args...) sprintf(args)" @@ -123,7 +123,7 @@ if [ "$PLATFORM" != win32 ]; then ngx_feature="C99 variadic macros" - ngx_feature_name="HAVE_C99_VARIADIC_MACROS" + ngx_feature_name="NGX_HAVE_C99_VARIADIC_MACROS" ngx_feature_run=yes ngx_feature_incs="#include <stdio.h> #define var(dummy, ...) sprintf(__VA_ARGS__)" @@ -135,7 +135,7 @@ if [ "$PLATFORM" != win32 ]; then # ngx_feature="inline" -# ngx_feature_name="DUMMY" +# ngx_feature_name= # ngx_feature_run=no # ngx_feature_incs="int inline f(void) { return 1 }" # ngx_feature_libs= diff --git a/auto/cc/icc b/auto/cc/icc index 89c6f3500..a32eec459 100644 --- a/auto/cc/icc +++ b/auto/cc/icc @@ -18,7 +18,7 @@ CFLAGS="$CFLAGS -Ob2" IPO="-ipo -ipo_obj" CFLAGS="$CFLAGS $IPO" CORE_LINK="$CORE_LINK $IPO" -CORE_LINK="$CORE_LINK -opt_report_file=$OBJS/opt_report_file" +CORE_LINK="$CORE_LINK -opt_report_file=$NGX_OBJS/opt_report_file" case $CPU in pentium) diff --git a/auto/cc/msvc b/auto/cc/msvc index 8272cac9a..0fa1a2c7e 100644 --- a/auto/cc/msvc +++ b/auto/cc/msvc @@ -77,15 +77,15 @@ CORE_LINK="$CORE_LINK -debug -debugtype:coff" # precompiled headers if [ $NGX_CC_NAME != msvc7 ]; then - CORE_DEPS="$CORE_DEPS $OBJS/ngx_config.pch" - NGX_PCH="$OBJS/ngx_config.pch" - NGX_BUILD_PCH="-Ycngx_config.h -Fp$OBJS/ngx_config.pch" - NGX_USE_PCH="-Yungx_config.h -Fp$OBJS/ngx_config.pch" + CORE_DEPS="$CORE_DEPS $NGX_OBJS/ngx_config.pch" + NGX_PCH="$NGX_OBJS/ngx_config.pch" + NGX_BUILD_PCH="-Ycngx_config.h -Fp$NGX_OBJS/ngx_config.pch" + NGX_USE_PCH="-Yungx_config.h -Fp$NGX_OBJS/ngx_config.pch" fi # the resource file -NGX_RES="$OBJS/nginx.res" +NGX_RES="$NGX_OBJS/nginx.res" NGX_RCC="rc -fo$NGX_RES \$(CORE_INCS) $NGX_WIN32_RC" CORE_LINK="$NGX_RES $CORE_LINK" diff --git a/auto/cc/owc b/auto/cc/owc index 789ffadae..88ffdb1f8 100644 --- a/auto/cc/owc +++ b/auto/cc/owc @@ -63,10 +63,10 @@ CFLAGS="$CFLAGS -zq" # the precompiled headers -CORE_DEPS="$CORE_DEPS $OBJS/ngx_config.pch" -NGX_PCH="$OBJS/ngx_config.pch" -NGX_BUILD_PCH="-fhq=$OBJS/ngx_config.pch" -NGX_USE_PCH="-fh=$OBJS/ngx_config.pch" +CORE_DEPS="$CORE_DEPS $NGX_OBJS/ngx_config.pch" +NGX_PCH="$NGX_OBJS/ngx_config.pch" +NGX_BUILD_PCH="-fhq=$NGX_OBJS/ngx_config.pch" +NGX_USE_PCH="-fh=$NGX_OBJS/ngx_config.pch" LINK="\$(CC)" @@ -76,7 +76,8 @@ CORE_LINK="$CORE_LINK -l=nt_win" # the resource file -NGX_RCC="wrc \$(CORE_INCS) -fo=$OBJS/nginx.res $NGX_WIN32_RC $OBJS/nginx.exe" +NGX_RCC="wrc \$(CORE_INCS) -fo=$NGX_OBJS/nginx.res " +NGX_RCC="$NGX_RCC $NGX_WIN32_RC $NGX_OBJS/nginx.exe" ngx_include_opt="-i=" |