From 76b7d649910aa9d52c2db2158256879eb5318805 Mon Sep 17 00:00:00 2001 From: Eduard Braun Date: Tue, 10 Oct 2017 21:26:31 +0200 Subject: root dir tidying: remove mingwenv.bat / msysenv.sh They were used to set up paths for devlibs builds but as master does not even build with devlibs anymore, nobody should miss them. Preferred way to build master on Windows is with MSYS2 now: http://wiki.inkscape.org/wiki/index.php/Compiling_Inkscape_on_Windows_with_MSYS2 --- mingwenv.bat | 25 ------------------------- msysenv.sh | 28 ---------------------------- 2 files changed, 53 deletions(-) delete mode 100644 mingwenv.bat delete mode 100755 msysenv.sh diff --git a/mingwenv.bat b/mingwenv.bat deleted file mode 100644 index e4b9047f1..000000000 --- a/mingwenv.bat +++ /dev/null @@ -1,25 +0,0 @@ -@echo off - -REM ----------------------------------------------------------------------------- -REM The paths in this file are used if you want to build Inkscape from the -REM the Windows built-in command line. -REM ----------------------------------------------------------------------------- - -REM Directory containing the precompiled Inkscape libraries. Usually c:\devlibs or c:\devlibs64 -if "%DEVLIBS_PATH%"=="" set DEVLIBS_PATH=c:\devlibs64 - -REM Directory containing the MinGW instance used for compilation. Usually c:\mingw or c:\mingw64 -REM Note: Make sure there are no whitespaces in the path. MinGW doesn't like that.. ;) -if "%MINGW_PATH%"=="" set MINGW_PATH=c:\mingw64 - -REM ----------------------------------------------------------------------------- -@echo Setting environment variables for MinGW build of Inkscape.. - -@echo DEVLIBS_PATH: %DEVLIBS_PATH% -@echo MINGW_PATH: %MINGW_PATH% - -REM Include the MinGW environment in the path to prevent error messages during CMake configure. -set PATH=%DEVLIBS_PATH%\bin;%DEVLIBS_PATH%\python;%MINGW_PATH%\bin;%PATH% - -REM Also set the pkgconfig path to prevent error messages during CMake configure. -set PKG_CONFIG_PATH=%DEVLIBS_PATH%\lib\pkgconfig \ No newline at end of file diff --git a/msysenv.sh b/msysenv.sh deleted file mode 100755 index d1639efbe..000000000 --- a/msysenv.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash -# ----------------------------------------------------------------------------- -# The paths in this file are used if you want to build Inkscape from the -# the MSYS command line for Windows. -# ----------------------------------------------------------------------------- - -# Directory containing the precompiled Inkscape libraries. Usually /c/devlibs or /c/devlibs64 -if [ -z $DEVLIBS_PATH ]; then - export DEVLIBS_PATH="/c/devlibs64"; -fi - -# Directory containing the MinGW instance used for compilation. Usually /c/mingw or /c/mingw64 -# Note: Make sure there are no whitespaces in the path. MinGW doesn't like that.. :) -if [ -z $MINGW_PATH ]; then - export MINGW_PATH="/c/mingw64"; -fi - -# ----------------------------------------------------------------------------- -echo Setting environment variables for MSYS build of Inkscape: -echo -echo "DEVLIBS_PATH: "$DEVLIBS_PATH -echo "MINGW_PATH: "$MINGW_PATH - -# Include the MinGW environment in the path to prevent error messages during CMake configure. -export PATH=$DEVLIBS_PATH/bin:$DEVLIBS_PATH/python:$MINGW_PATH/bin:$PATH - -# Also set the pkgconfig path to prevent error messages during CMake configure. -export PKG_CONFIG_PATH=$DEVLIBS_PATH/lib/pkgconfig -- cgit v1.2.3