Author: faridz Date: Wed Sep 26 01:12:36 2007 New Revision: 579502 URL: http://svn.apache.org/viewvc?rev=579502&view=rev Log: 2007-09-26 Farid Zaripov <[EMAIL PROTECTED]>
* msvc-7.0.config: Added new config variable: LIBS. * utilities.js: Ditto. * msvcex-8.0.config: Set LIBS=user32.lib (by default the VCExpress links with kernel32.lib only). * projects.js: Use LIBS config variable instead of hardcoded commonLibs. Modified: incubator/stdcxx/trunk/etc/config/windows/msvc-7.0.config incubator/stdcxx/trunk/etc/config/windows/msvcex-8.0.config incubator/stdcxx/trunk/etc/config/windows/projects.js incubator/stdcxx/trunk/etc/config/windows/utilities.js Modified: incubator/stdcxx/trunk/etc/config/windows/msvc-7.0.config URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/etc/config/windows/msvc-7.0.config?rev=579502&r1=579501&r2=579502&view=diff ============================================================================== --- incubator/stdcxx/trunk/etc/config/windows/msvc-7.0.config (original) +++ incubator/stdcxx/trunk/etc/config/windows/msvc-7.0.config Wed Sep 26 01:12:36 2007 @@ -56,6 +56,8 @@ CPPFLAGS= // additional flags for the linker LDFLAGS= +// additional libraries +LIBS= // CXX, LD, AR used only at configure build step // CXX - command invoked to compile the test source file Modified: incubator/stdcxx/trunk/etc/config/windows/msvcex-8.0.config URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/etc/config/windows/msvcex-8.0.config?rev=579502&r1=579501&r2=579502&view=diff ============================================================================== --- incubator/stdcxx/trunk/etc/config/windows/msvcex-8.0.config (original) +++ incubator/stdcxx/trunk/etc/config/windows/msvcex-8.0.config Wed Sep 26 01:12:36 2007 @@ -27,3 +27,4 @@ #include msvc-8.0 DEVENV=VCExpress.exe SLNCOMMENT=Visual C++ Express 2005 +LIBS=user32.lib Modified: incubator/stdcxx/trunk/etc/config/windows/projects.js URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/etc/config/windows/projects.js?rev=579502&r1=579501&r2=579502&view=diff ============================================================================== --- incubator/stdcxx/trunk/etc/config/windows/projects.js (original) +++ incubator/stdcxx/trunk/etc/config/windows/projects.js Wed Sep 26 01:12:36 2007 @@ -27,7 +27,6 @@ var commonIncludes = "$(SolutionDir)%CONFIG%\\include"; var stdcxxIncludes = "%SRCDIR%\\include;%SRCDIR%\\include\\ansi;" + commonIncludes; var rwtestIncludes = "%SRCDIR%\\tests\\include;" + stdcxxIncludes; -var commonLibs = "kernel32.lib user32.lib"; var binPath = "$(SolutionDir)%CONFIG%\\bin"; var libPath = "$(SolutionDir)%CONFIG%\\lib"; @@ -99,7 +98,7 @@ stdcxxDef.Includes = stdcxxIncludes; stdcxxDef.OutDir = libPath; stdcxxDef.IntDir = "$(SolutionDir)%CONFIG%\\src"; - stdcxxDef.Libs = commonLibs; + stdcxxDef.Libs = LIBS; stdcxxDef.OutFile = "$(OutDir)\\libstd%CONFIG%%EXT%"; stdcxxDef.PrjDeps.push(configureDef); @@ -120,7 +119,7 @@ rwtestDef.Includes = rwtestIncludes; rwtestDef.OutDir = "$(SolutionDir)%CONFIG%\\tests"; rwtestDef.IntDir = rwtestDef.OutDir + "\\src"; - rwtestDef.Libs = commonLibs; + rwtestDef.Libs = LIBS; rwtestDef.PrjRefs.push(stdcxxDef); projectDefs.push(new Array(rwtestDef)); @@ -141,7 +140,7 @@ execDef.Defines = ""; execDef.Includes = commonIncludes; execDef.OutDir = binPath; - execDef.Libs = commonLibs; + execDef.Libs = LIBS; execDef.OutFile = "$(OutDir)\\exec.exe"; execDef.PrjDeps.push(configureDef); @@ -168,7 +167,7 @@ localedefDef.Defines = commonDefines; localedefDef.Includes = stdcxxIncludes; localedefDef.OutDir = binPath; - localedefDef.Libs = commonLibs; + localedefDef.Libs = LIBS; localedefDef.OutFile = "$(OutDir)\\localedef.exe"; localedefDef.PrjRefs.push(stdcxxDef); @@ -184,7 +183,7 @@ localeDef.Defines = commonDefines; localeDef.Includes = stdcxxIncludes; localeDef.OutDir = binPath; - localeDef.Libs = commonLibs; + localeDef.Libs = LIBS; localeDef.OutFile = "$(OutDir)\\locale.exe"; localeDef.PrjDeps.push(configureDef); @@ -200,7 +199,7 @@ gencatDef.Defines = commonDefines; gencatDef.Includes = stdcxxIncludes; gencatDef.OutDir = binPath; - gencatDef.Libs = commonLibs; + gencatDef.Libs = LIBS; gencatDef.OutFile = "$(OutDir)\\gencat.exe"; gencatDef.PrjRefs.push(stdcxxDef); @@ -228,7 +227,7 @@ exampleTplDef.Defines = commonDefines; exampleTplDef.Includes = "%SRCDIR%\\examples\\include;" + stdcxxIncludes; exampleTplDef.OutDir = "$(SolutionDir)%CONFIG%\\examples"; - exampleTplDef.Libs = commonLibs; + exampleTplDef.Libs = LIBS; exampleTplDef.PrjRefs.push(stdcxxDef); var exampleDefs = exampleTplDef.createProjectDefsFromFolder( @@ -290,7 +289,7 @@ testTplDef.Defines = commonDefines; testTplDef.Includes = rwtestIncludes; testTplDef.OutDir = "$(SolutionDir)%CONFIG%\\tests"; - testTplDef.Libs = commonLibs; + testTplDef.Libs = LIBS; testTplDef.PrjRefs.push(stdcxxDef); testTplDef.PrjRefs.push(rwtestDef); Modified: incubator/stdcxx/trunk/etc/config/windows/utilities.js URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/etc/config/windows/utilities.js?rev=579502&r1=579501&r2=579502&view=diff ============================================================================== --- incubator/stdcxx/trunk/etc/config/windows/utilities.js (original) +++ incubator/stdcxx/trunk/etc/config/windows/utilities.js Wed Sep 26 01:12:36 2007 @@ -28,6 +28,7 @@ var DEVENVFLAGS = ""; var CPPFLAGS = ""; var LDFLAGS = ""; +var LIBS = ""; var CONVERT = false; var CXX = ""; var LD = ""; @@ -134,6 +135,9 @@ case "LDFLAGS": LDFLAGS = arr[2]; break; + case "LIBS": + LIBS = arr[2]; + break; case "CONVERT": CONVERT = parseInt(arr[2]) != 0; break; @@ -189,6 +193,7 @@ DEVENVFLAGS = ""; CPPFLAGS = ""; LDFLAGS = ""; + LIBS = ""; CONVERT = false; CXX = ""; LD = ""; @@ -236,6 +241,7 @@ stream.WriteLine(" DEVENVFLAGS=" + DEVENVFLAGS); stream.WriteLine(" CPPFLAGS=" + CPPFLAGS); stream.WriteLine(" LDFLAGS=" + LDFLAGS); + stream.WriteLine(" LIBS=" + LIBS); stream.WriteLine(" CONVERT=" + CONVERT); stream.WriteLine(" CXX=" + CXX); stream.WriteLine(" LD=" + LD);