some improvement towards a full functional implementation of musrWiz and musrStep under macos.

src/musredit_qt5/musrStep/musrStep.pro

@@ -1,14 +1,60 @@
 TEMPLATE = app
 TARGET = musrStep
 
+# install path for musrStep via given prefix
+count( PREFIX, 1 ) {
+	MUSRSTEP_INSTALL_PATH = $${PREFIX}/bin
+}
+isEmpty( MUSRSTEP_INSTALL_PATH ) {
+	MUSR_FIT_PATH = $$(MUSRFITPATH)
+	count( MUSR_FIT_PATH, 1) {
+		MUSRSTEP_INSTALL_PATH = $$(MUSRFITPATH)
+	}
+}
+isEmpty( MUSRSTEP_INSTALL_PATH ) {
+	ROOT_SYS_PATH = $$(ROOTSYS)
+	count( ROOT_SYS_PATH, 1) {
+		MUSRSTEP_INSTALL_PATH = $$(ROOTSYS)/bin
+	}
+}
+isEmpty( MUSRSTEP_INSTALL_PATH ) {
+	MUSRSTEP_INSTALL_PATH = /usr/local/bin
+}
+
+exists( /usr/bin/cygwin1.dll ) {
+      QMAKE_CXXFLAGS += -D_WIN32GCC
+      QMAKE_LFLAGS_APP = -Wl,--enable-auto-import
+}
+
+isEmpty( CC ) {
+    CC = gcc
+}
+
+isEmpty( CXX ) {
+    CXX = g++
+}
+
+QMAKE_CC = $${CC}
+QMAKE_CXX = $${CXX}
+QMAKE_LINK = $${CXX}
+
+# set proper permission for Mac OSX
+macx {
+   QMAKE_INSTALL_FILE = install -m 6755 -p -o $$(USER) -g staff
+   QMAKE_INSTALL_PROGRAM = install -m 6755 -p -o root -g admin
+}
+
 # install path for the application
 unix:target.path = $$(ROOTSYS)/bin
+macx:target.path = /Applications
+win32:target.path = c:/musrfit/bin
+
 INSTALLS += target
 
 CONFIG += qt \
     warn_on \
-    debug \
+    release \
-CONFIG += console
+    console
 
 QT += widgets
 QT += svg
@@ -23,3 +69,4 @@ SOURCES = PMusrStep.cpp \
 
 RESOURCES = musrStep.qrc
 
+macx:ICON = icons/musrStep.icns

src/musredit_qt5/musrWiz/musrWiz.pro

@@ -3,42 +3,56 @@ TARGET = musrWiz
 
 # install path for the application
 unix:target.path = $$(ROOTSYS)/bin
+macx:target.path = /Applications
+win32:target.path = c:/musrfit/bin
+
 INSTALLS += target
 
 # install path for the XML instrument def file
 unix:instrumendDef.path = $$(HOME)/.musrfit/musrWiz
+macx:instrumendDef.path = $$(HOME)/.musrfit/musrWiz
 instrumendDef.files = instrument_defs/instrument_def_psi.xml
 exists( $$(HOME)/.musrfit/musrWiz/instrument_def_psi.xml ) {
   unix:instrumendDef.extra =  mv $$(HOME)/.musrfit/musrWiz/instrument_def_psi.xml $$(HOME)/.musrfit/musrWiz/instrument_def_psi.xml.backup 
+  macx:instrumendDef.extra =  mv $$(HOME)/.musrfit/musrWiz/instrument_def_psi.xml $$(HOME)/.musrfit/musrWiz/instrument_def_psi.xml.backup 
 }
 INSTALLS += instrumendDef
 
 # install path for the XML musrfit funcs file
 unix:musrfitFunc.path = $$(HOME)/.musrfit/musrWiz
+macx:musrfitFunc.path = $$(HOME)/.musrfit/musrWiz
 musrfitFunc.files = func_defs/musrfit_funcs.xml
 exists( $$(HOME)/.musrfit/musrWiz/musrfit_funcs.xml ) {
   unix:musrfitFunc.extra = mv $$(HOME)/.musrfit/musrWiz/musrfit_funcs.xml $$(HOME)/.musrfit/musrWiz/musrfit_funcs.xml.backup 
+  macx:musrfitFunc.extra = mv $$(HOME)/.musrfit/musrWiz/musrfit_funcs.xml $$(HOME)/.musrfit/musrWiz/musrfit_funcs.xml.backup 
 }
 INSTALLS += musrfitFunc
 
 # install path for the musrWiz defaults XML
 unix:musrWizDefault.path = $$(HOME)/.musrfit/musrWiz
+macx:musrWizDefault.path = $$(HOME)/.musrfit/musrWiz
 musrWizDefault.files = musrWiz.xml
 exists( $$(HOME)/.musrfit/musrWiz/musrWiz.xml ) {
   unix:musrWizDefault.extra = mv $$(HOME)/.musrfit/musrWiz/musrWiz.xml $$(HOME)/.musrfit/musrWiz/musrWiz.xml.backup
+  macx:musrWizDefault.extra = mv $$(HOME)/.musrfit/musrWiz/musrWiz.xml $$(HOME)/.musrfit/musrWiz/musrWiz.xml.backup
 }
 INSTALLS += musrWizDefault
 
 CONFIG += qt \
     warn_on \
-    release \
+    release
-#CONFIG += console
 
 QT += widgets
 QT += xml
 QT += core
 QT += svg
 
+# set proper permission for Mac OSX
+macx {
+   QMAKE_INSTALL_FILE = install -m 6755 -p -o $$(USER) -g staff
+   QMAKE_INSTALL_PROGRAM = install -m 6755 -p -o root -g admin
+}
+
 INCLUDEPATH += "../../include"
 
 HEADERS = musrWiz.h \
@@ -56,3 +70,5 @@ SOURCES = PTheoTemplate.cpp \
           musrWiz.cpp
 
 RESOURCES = musrWiz.qrc
+
+macx:ICON = icons/musrWiz.icns