[Gsdesign-commits] r311 - pkg/gsDesignExplorer-dev/branches/visualstudio/gsDesignExplorer
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Fri Aug 12 22:37:33 CEST 2011
Author: tonypujals
Date: 2011-08-12 22:37:32 +0200 (Fri, 12 Aug 2011)
New Revision: 311
Added:
pkg/gsDesignExplorer-dev/branches/visualstudio/gsDesignExplorer/Makefile
Removed:
pkg/gsDesignExplorer-dev/branches/visualstudio/gsDesignExplorer/Makefile.vstudio
Log:
Renamed makefile
Copied: pkg/gsDesignExplorer-dev/branches/visualstudio/gsDesignExplorer/Makefile (from rev 310, pkg/gsDesignExplorer-dev/branches/visualstudio/gsDesignExplorer/Makefile.vstudio)
===================================================================
--- pkg/gsDesignExplorer-dev/branches/visualstudio/gsDesignExplorer/Makefile (rev 0)
+++ pkg/gsDesignExplorer-dev/branches/visualstudio/gsDesignExplorer/Makefile 2011-08-12 20:37:32 UTC (rev 311)
@@ -0,0 +1,39 @@
+# gsDesignExplorer project base directory
+PROJECTROOT=%CD%
+
+# PATH TO VISUAL STUDIO TOOLCHAIN
+# ===============================
+INCLUDE=C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\INCLUDE;C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\ATLMFC\INCLUDE;C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\include;
+LIB=C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\LIB;C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\ATLMFC\LIB;C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\lib;
+LIBPATH=C:\Windows\Microsoft.NET\Framework\v4.0.30319;C:\Windows\Microsoft.NET\Framework\v3.5;C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\LIB;C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\ATLMFC\LIB;
+VSPATH=C:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7\IDE\;C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\BIN;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7\Tools;C:\Windows\Microsoft.NET\Framework\v4.0.30319;C:\Windows\Microsoft.NET\Framework\v3.5;C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\VCPackages;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Performance Tools;C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\bin\NETFX 4.0 Tools;C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\bin;
+
+
+# PATH TO INSTALLED TOOLS
+# =======================
+RPATH=C:\dev\tools\R\R-2.13.1
+# RTOOLS=C:\dev\tools\Rtools
+# QTDIR=C:\QtSDK\Desktop\Qt\4.7.3\MSVC2008
+
+# PATH TO VERSIONED TOOLS
+# =======================
+QTDIR=$(PROJECTROOT)\libs\msvc\Qt\4.7.3\msvc2008
+
+
+
+PATH=$(VSPATH);$(QTDIR)\bin;$(RPATH)\bin;$(PATH);C:\dev\tools\cmake\cmake-2.8.4\bin
+
+
+
+
+all :
+ cd ..
+ R CMD INSTALL --no-clean-on-error gsDesignExplorer
+
+create-r-import-lib :
+ pushd $(RPATH)\bin\i386
+ tools\DLLImportTool\ImgDef.exe R.dll > R.def
+ popd
+ mv $(RPATH)\bin\i386\R.def libs\msvc\R\R-2.13.1
+ lib /machine:x86 /subsystem:windows /def:libs\msvc\R\R-2.13.1\R.def /out:libs\msvc\R\R-2.13.1\R.lib
+
Deleted: pkg/gsDesignExplorer-dev/branches/visualstudio/gsDesignExplorer/Makefile.vstudio
===================================================================
--- pkg/gsDesignExplorer-dev/branches/visualstudio/gsDesignExplorer/Makefile.vstudio 2011-08-12 20:34:21 UTC (rev 310)
+++ pkg/gsDesignExplorer-dev/branches/visualstudio/gsDesignExplorer/Makefile.vstudio 2011-08-12 20:37:32 UTC (rev 311)
@@ -1,39 +0,0 @@
-# gsDesignExplorer project base directory
-PROJECTROOT=%CD%
-
-# PATH TO VISUAL STUDIO TOOLCHAIN
-# ===============================
-INCLUDE=C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\INCLUDE;C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\ATLMFC\INCLUDE;C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\include;
-LIB=C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\LIB;C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\ATLMFC\LIB;C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\lib;
-LIBPATH=C:\Windows\Microsoft.NET\Framework\v4.0.30319;C:\Windows\Microsoft.NET\Framework\v3.5;C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\LIB;C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\ATLMFC\LIB;
-VSPATH=C:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7\IDE\;C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\BIN;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7\Tools;C:\Windows\Microsoft.NET\Framework\v4.0.30319;C:\Windows\Microsoft.NET\Framework\v3.5;C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\VCPackages;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Performance Tools;C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\bin\NETFX 4.0 Tools;C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\bin;
-
-
-# PATH TO INSTALLED TOOLS
-# =======================
-RPATH=C:\dev\tools\R\R-2.13.1
-# RTOOLS=C:\dev\tools\Rtools
-# QTDIR=C:\QtSDK\Desktop\Qt\4.7.3\MSVC2008
-
-# PATH TO VERSIONED TOOLS
-# =======================
-QTDIR=$(PROJECTROOT)\libs\msvc\Qt\4.7.3\msvc2008
-
-
-
-PATH=$(VSPATH);$(QTDIR)\bin;$(RPATH)\bin;$(PATH);C:\dev\tools\cmake\cmake-2.8.4\bin
-
-
-
-
-all :
- cd ..
- R CMD INSTALL --no-clean-on-error gsDesignExplorer
-
-create-r-import-lib :
- pushd $(RPATH)\bin\i386
- tools\DLLImportTool\ImgDef.exe R.dll > R.def
- popd
- mv $(RPATH)\bin\i386\R.def libs\msvc\R\R-2.13.1
- lib /machine:x86 /subsystem:windows /def:libs\msvc\R\R-2.13.1\R.def /out:libs\msvc\R\R-2.13.1\R.lib
-
More information about the Gsdesign-commits
mailing list