Skip to content

Commit

Permalink
-changes reverted
Browse files Browse the repository at this point in the history
  • Loading branch information
RuedKamp committed Jul 1, 2015
1 parent 876a710 commit afaf039
Showing 1 changed file with 6 additions and 10 deletions.
16 changes: 6 additions & 10 deletions SimulationRuntime/cpp/Makefile.omdev.mingw
Expand Up @@ -15,27 +15,24 @@ BUILDTYPE = Debug

CMAKE = $(OMDEV)/bin/cmake/bin/cmake -DCMAKE_VERBOSE_MAKEFILE:Bool=ON

runtimeCpp: clean
ifeq ("$(RUNTIME_STATIC_LINKING)","true")
cd ./Build; echo "change to Build"; \
$(CMAKE) -G "MSYS Makefiles" -D CMAKE_BUILD_TYPE=$(BUILDTYPE) -DRUNTIME_STATIC_LINKING=ON -D CMAKE_INSTALL_PREFIX:PATH="$(OMBUILDDIR)" MAKE_CXX_COMPILER=g++ ../; \
make;
else ifeq ("$(BUILD_DOCUMENTATION)","true")
runtimeCpp:
ifeq ("$(BUILD_DOCUMENTATION)","true")
cd ./Build; echo "change to Build"; \
$(CMAKE) -G "MSYS Makefiles" -D CMAKE_BUILD_TYPE=$(BUILDTYPE) -DBUILD_DOCUMENTATION=ON -D CMAKE_INSTALL_PREFIX:PATH="$(OMBUILDDIR)" MAKE_CXX_COMPILER=g++ ../; \
make;
else
mkdir -p Build
cd ./Build; echo "change to Build"; \
$(CMAKE) -G "MSYS Makefiles" -D CMAKE_BUILD_TYPE=$(BUILDTYPE) -D CMAKE_INSTALL_PREFIX:PATH="$(OMBUILDDIR)" MAKE_CXX_COMPILER=g++ ../; \
make;
endif

runtimeCPPmsvc:

runtimeCPPmsvc: #clean
test -f """${VS100COMNTOOLS}/../../VC/vcvarsall.bat"""
echo 'Build the cppRuntime with MSVC'
#rm -rf build_msvc
#mkdir -p build_msvc
rm -rf build_msvc
mkdir -p build_msvc
echo call '"%VS100COMNTOOLS%\\..\\..\\VC\\vcvarsall.bat"' > build_msvc/build.bat
#echo '%OMDEV%\\bin\\cmake\\bin\\cmake -DCMAKE_VERBOSE_MAKEFILE:Bool=ON -DCMAKE_BUILD_TYPE=$(BUILDTYPE) -DCMAKE_INSTALL_PREFIX=./tmp ../ -G "Visual Studio 10"' >> build_msvc/build.bat
ifeq ($(BUILDTYPE),Debug)
Expand Down Expand Up @@ -84,4 +81,3 @@ install: runtimeCpp

clean:
rm -R -f Build
mkdir Build

0 comments on commit afaf039

Please sign in to comment.