We do not use the env.var OPENMODELICAHOME

Makefile.in

@@ -25,6 +25,8 @@ omedit: mkbuilddirs qjson
 	$(MAKE) -C OMEdit/OMEditGUI -f Makefile.unix
 clean:
 	$(MAKE) -C OMEdit/OMEditGUI -f Makefile.unix clean
+	test ! -f qjson-0.8.1/build/Makefile || $(MAKE) -C qjson-0.8.1/build clean
+	rm -f qjson-0.8.1/build/Makefile
 distclean: clean
 	rm -f config.status configure Makefile OMEdit/OMEditGUI/Makefile.unix OMEdit/OMEditGUI/OMEdit.config
 Makefile: Makefile.in config.status

OMEdit/OMEditGUI/OMEditGUI.pro

@@ -57,6 +57,7 @@ evil_hack_to_fool_lupdate {
 
 # Windows libraries and includes
 win32 {
+  OPENMODELICAHOME = $$(OPENMODELICAHOME)
   QMAKE_LFLAGS += -enable-auto-import
 
   DEFINES += IMPORT_INTO=1
@@ -93,7 +94,7 @@ SOURCES += main.cpp \
   Util/backtrace.c \
   Util/Helper.cpp \
   MainWindow.cpp \
-  $$(OPENMODELICAHOME)/include/omc/scripting-API/OpenModelicaScriptingAPIQt.cpp \
+  $$OPENMODELICAHOME/include/omc/scripting-API/OpenModelicaScriptingAPIQt.cpp \
   OMC/OMCProxy.cpp \
   Util/StringHandler.cpp \
   Modeling/MessagesWidget.cpp \
@@ -212,7 +213,7 @@ HEADERS  += Util/backtrace.h \
   CrashReport/CrashReportDialog.h \
   OMC/Parser/OMCOutputParser.h \
   OMC/Parser/OMCOutputLexer.h \
-  $$(OPENMODELICAHOME)/include/omc/scripting-API/OpenModelicaScriptingAPIQt.h
+  $$OPENMODELICAHOME/include/omc/scripting-API/OpenModelicaScriptingAPIQt.h
 
 LIBS += -lqjson
 INCLUDEPATH += ../../qjson-0.8.1/build/include
@@ -237,7 +238,7 @@ INCLUDEPATH += . \
   Simulation \
   TransformationalDebugger \
   Util \
-  $$(OPENMODELICAHOME)/include/omc/scripting-API
+  $$OPENMODELICAHOME/include/omc/scripting-API
 
 OTHER_FILES += Resources/css/stylesheet.qss \
   Debugger/Parser/GDBMIOutput.g \

OMEdit/OMEditGUI/main.cpp

@@ -74,6 +74,10 @@
 #include "CrashReportDialog.h"
 #include "meta/meta_modelica.h"
 
+#ifndef WIN32
+#include "omc_config.h"
+#endif
+
 #ifdef QT_NO_DEBUG
 #ifndef WIN32
 #include <signal.h>