diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-01-19 01:46:38 -0600 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-02-05 19:34:03 -0600 |
| commit | 2e954ee1175938948742f7d5f1e85d06a9a41ba3 (patch) | |
| tree | fc1e36d9e73eaff70e93bec7f5f1dba972404f6e | |
| parent | a552c45af133910b0f2bc279995e4cafa2823b71 (diff) | |
WITH_VC_REDIST does not need exporting. it is a SCPDEFS only info
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | scp2/source/ooo/makefile.mk | 4 | ||||
| -rwxr-xr-x | set_soenv.in | 3 |
3 files changed, 1 insertions, 8 deletions
diff --git a/configure.in b/configure.in index 7fb6f0a24885..8a4720b3c773 100644 --- a/configure.in +++ b/configure.in @@ -4472,7 +4472,7 @@ fi AC_SUBST([JITC_PROCESSOR_TYPE]) if test $_os = "WINNT"; then - WITH_VC_REDIST="TRUE" + SCPDEFS="$SCPDEFS -DWITH_VC_REDIST" fi AC_SUBST(WITH_VC_REDIST) diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk index ccba4f87b468..244cf558d9df 100644 --- a/scp2/source/ooo/makefile.mk +++ b/scp2/source/ooo/makefile.mk @@ -245,10 +245,6 @@ SCPDEFS+=-DSYSTEM_PYTHON SCPDEFS+=-DSYSTEM_LIBEXTTEXTCAT .ENDIF -.IF "$(WITH_VC_REDIST)" == "TRUE" -SCPDEFS+=-DWITH_VC_REDIST -.ENDIF - .IF "$(MINGW_GCCDLL)"!="" SCPDEFS+=-DMINGW_GCCDLL=\""$(MINGW_GCCDLL)"\" .ENDIF diff --git a/set_soenv.in b/set_soenv.in index 515ffe1227e2..59f8f05da6ed 100755 --- a/set_soenv.in +++ b/set_soenv.in @@ -590,9 +590,6 @@ elsif ( $platform =~ m/mingw32/ ) } -if ("@WITH_VC_REDIST@" eq "TRUE") { -ToFile( "WITH_VC_REDIST", "TRUE", "e" ); -} ToFile( "PERL", $PERL, "e" ); ToFile( "SOLARVER", $SOLARVER, "e" ); ToFile( "SOLARVERSION", $SOLARVERSION, "e" ); |