- German EmbeddedObjects.lyx: tiny beautification by Hartmut

[lyx.git] / development / cmake / build.bat

diff --git a/development/cmake/build.bat b/development/cmake/build.bat
index eaa36c6ad062f9bb04a11c7f0367aaca3a5f287f..a5597db2ffc810f30ad7008381d36d4919b91439 100755 (executable)
--- a/development/cmake/build.bat
+++ b/development/cmake/build.bat
@@ -1,11 +1,12 @@
 :: be sure there is a solution\r
-cmake ..\trunk\development\cmake\r
+cmake ..\trunk\development\cmake -Dmerge=1\r
 \r
 :: clean\r
-devenv lyx-qt4.sln /clean Release\r
+devenv lyx.sln /clean Release\r
 \r
 :: rebuild all generated files\r
 cmake ..\trunk\development\cmake -Dmerge_rebuild=1\r
 \r
 :: build release version\r
-devenv lyx-qt4.sln /build Release
\ No newline at end of file
+devenv lyx.sln /build Release\r
+\r