Mac .jucer file quitting windows Producer

Hi, i’ve just compiled the latest ‘producer’ on Windows and Mac. When I save a mac jucer file and try and load it on Windows, I get an invalid error, and it exits with code 0 in the debugger, which is no help. This is my Jucer file, can anybody tell why this is happening please?

<?xml version="1.0" encoding="UTF-8"?>

<<<<<<< HEAD
<JUCERPROJECT id="kz9a2h" name="UpStereoPro" projectType="audioplug" jucerVersion="5.4.3"
              version="3.0.0" companyName="QuikQuak" companyCopyright="(C)2018 David J. Hoskins"
=======
<JUCERPROJECT id="kz9a2h" name="UpStereoPro" projectType="audioplug" jucerVersion="5.4.5"
              version="3.0.1" companyName="QuikQuak" companyCopyright="(C) David J. Hoskins"
>>>>>>> d29bed49ee0b4f6be577cdd0e75957b868b2ed3b
              companyWebsite="www.quikquak.com" companyEmail="########"
              pluginFormats="buildAAX,buildAU,buildVST,buildVST3" pluginManufacturer="QuikQuak"
              pluginManufacturerCode="QkQk" pluginCode="UpSp" aaxIdentifier="com.quikquak.upstereopro"
              pluginAUMainType="'aumf'" pluginVSTCategory="kPlugCategEffect"
              bundleIdentifier="com.quikquak.upstereopro" pluginAAXCategory="1,512,8192"
<<<<<<< HEAD
              pluginVST3Category="Analyzer,EQ,Fx,Mastering,Spatial" pluginCharacteristicsValue="pluginWantsMidiIn">
=======
              pluginVST3Category="Analyzer,EQ,Fx,Mastering,Spatial" pluginCharacteristicsValue="pluginWantsMidiIn"
              cppLanguageStandard="11" reportAppUsage="0">
>>>>>>> d29bed49ee0b4f6be577cdd0e75957b868b2ed3b
  <MAINGROUP id="UCEsH6" name="UpStereoPro">
    <GROUP id="{01FFB30B-60C8-367E-A7B3-DC651D405BB1}" name="Resources">
      <FILE id="aC8pbF" name="Futura Medium.ttf" compile="0" resource="1"
            file="Resources/Futura Medium.ttf"/>
      <FILE id="SRAqag" name="Button_off.png" compile="0" resource="1" file="Resources/Button_off.png"/>
      <FILE id="FLhX7T" name="Button_on.png" compile="0" resource="1" file="Resources/Button_on.png"/>
      <FILE id="huE0NF" name="MenuOff.png" compile="0" resource="1" file="Resources/MenuOff.png"/>
      <FILE id="nZFro2" name="MenuOn.png" compile="0" resource="1" file="Resources/MenuOn.png"/>
      <FILE id="LSOGg8" name="Puck_EQ.png" compile="0" resource="1" file="Resources/Puck_EQ.png"/>
      <FILE id="ziC5fH" name="Puck_hori.png" compile="0" resource="1" file="Resources/Puck_hori.png"/>
      <FILE id="J3tz81" name="Puck_vert.png" compile="0" resource="1" file="Resources/Puck_vert.png"/>
      <FILE id="Rt5fTU" name="Register_off.png" compile="0" resource="1"
            file="Resources/Register_off.png"/>
      <FILE id="wifM2Q" name="Register_on.png" compile="0" resource="1" file="Resources/Register_on.png"/>
      <FILE id="wZEGgd" name="thankyou.wav" compile="0" resource="1" file="Resources/thankyou.wav"/>
      <FILE id="G7d1zO" name="UpStereoPro.png" compile="0" resource="1" file="Resources/UpStereoPro.png"/>
      <FILE id="SH651u" name="UpStereoPro_Logo.png" compile="0" resource="1"
            file="Resources/UpStereoPro_Logo.png"/>
    </GROUP>
    <GROUP id="{9BE4BDCD-F58C-E449-AADD-9B9368DC5AFF}" name="Source">
      <FILE id="AvAkEo" name="EQpoint.h" compile="0" resource="0" file="Source/EQpoint.h"/>
      <FILE id="iCN6EE" name="cEqualiser.h" compile="0" resource="0" file="Source/cEqualiser.h"/>
      <FILE id="nxPJdN" name="curve.frag" compile="0" resource="1" file="Source/curve.frag"/>
      <FILE id="RP51WG" name="dispGreenRings.frag" compile="0" resource="1"
            file="Source/dispGreenRings.frag"/>
      <FILE id="PkRxTq" name="display.frag" compile="0" resource="1" file="Source/display.frag"/>
      <FILE id="XCxEwI" name="display.vert" compile="0" resource="1" file="Source/display.vert"/>
      <FILE id="ik8eDF" name="displayBlue.frag" compile="0" resource="1"
            file="Source/displayBlue.frag"/>
      <FILE id="ITxmaG" name="displayGhost.frag" compile="0" resource="1"
            file="Source/displayGhost.frag"/>
      <FILE id="RlJ8cl" name="EQlabel.h" compile="0" resource="0" file="Source/EQlabel.h"/>
      <FILE id="AYZwZV" name="fft_back.frag" compile="0" resource="1" file="Source/fft_back.frag"/>
      <FILE id="c4JfKj" name="GL_EqualiserPanel.h" compile="0" resource="0"
            file="Source/GL_EqualiserPanel.h"/>
      <FILE id="PUZYaA" name="GL_MainPanel.h" compile="0" resource="0" file="Source/GL_MainPanel.h"/>
      <FILE id="Mw54WJ" name="GL_ShapePanel.h" compile="0" resource="0" file="Source/GL_ShapePanel.h"/>
      <FILE id="VrDCNd" name="GL_WidthPanel.h" compile="0" resource="0" file="Source/GL_WidthPanel.h"/>
      <FILE id="TPdltC" name="InfoPanel.h" compile="0" resource="0" file="Source/InfoPanel.h"/>
      <FILE id="eUsRYI" name="LookAndFeel.h" compile="0" resource="0" file="Source/LookAndFeel.h"/>
      <FILE id="O0OJd4" name="MemAlloc.cpp" compile="1" resource="0" file="Source/MemAlloc.cpp"/>
      <FILE id="WblnKq" name="MemAlloc.h" compile="0" resource="0" file="Source/MemAlloc.h"/>
      <FILE id="p0o73s" name="MyFHT2.cpp" compile="1" resource="0" file="Source/MyFHT2.cpp"/>
      <FILE id="bfEuwC" name="MyFHT2.h" compile="0" resource="0" file="Source/MyFHT2.h"/>
      <FILE id="PSE8vh" name="OldProgramData.h" compile="0" resource="0"
            file="Source/OldProgramData.h"/>
      <FILE id="rrnUaM" name="PlayThankyou.h" compile="0" resource="0" file="Source/PlayThankyou.h"/>
      <FILE id="kem5cL" name="Registration.cpp" compile="1" resource="0"
            file="Source/Registration.cpp"/>
      <FILE id="XiS99Y" name="Registration.h" compile="0" resource="0" file="Source/Registration.h"/>
      <FILE id="BrAvrf" name="RegWindow.cpp" compile="1" resource="0" file="Source/RegWindow.cpp"/>
      <FILE id="fbYKqe" name="RegWindow.h" compile="0" resource="0" file="Source/RegWindow.h"/>
      <FILE id="KfkyDr" name="SnapSlider.h" compile="0" resource="0" file="Source/SnapSlider.h"/>
      <FILE id="W34KmY" name="SpecVocoder.cpp" compile="1" resource="0" file="Source/SpecVocoder.cpp"/>
      <FILE id="nmhstQ" name="SpecVocoder.h" compile="0" resource="0" file="Source/SpecVocoder.h"/>
      <FILE id="udZkLV" name="WidthDisplay.frag" compile="0" resource="1"
            file="Source/WidthDisplay.frag"/>
      <FILE id="gFZwYj" name="PluginProcessor.cpp" compile="1" resource="0"
            file="Source/PluginProcessor.cpp"/>
      <FILE id="CPMiPt" name="PluginProcessor.h" compile="0" resource="0"
            file="Source/PluginProcessor.h"/>
      <FILE id="wc1Q1R" name="PluginEditor.cpp" compile="1" resource="0"
            file="Source/PluginEditor.cpp"/>
      <FILE id="RiZ0CO" name="PluginEditor.h" compile="0" resource="0" file="Source/PluginEditor.h"/>
    </GROUP>
  </MAINGROUP>
  <EXPORTFORMATS>
    <VS2017 targetFolder="Builds/VisualStudio2017" vstLegacyFolder="E:\Plug-ins\SDKs\VST_SDK\VST2_SDK\">
      <CONFIGURATIONS>
        <CONFIGURATION isDebug="1" name="Debug" targetName="UpStereo Pro" enablePluginBinaryCopyStep="1"
                       useRuntimeLibDLL="0" fastMath="1" characterSet="MultiByte" headerPath="E:\Plug-ins\QuikQuak_JUCE\r8brain-free-src"/>
        <CONFIGURATION isDebug="0" name="Release" targetName="UpStereo Pro" enablePluginBinaryCopyStep="1"
                       fastMath="1" useRuntimeLibDLL="0" characterSet="MultiByte" headerPath="E:\Plug-ins\QuikQuak_JUCE\r8brain-free-src"/>
      </CONFIGURATIONS>
      <MODULEPATHS>
        <MODULEPATH id="juce_core" path="../../JUCE/modules"/>
        <MODULEPATH id="juce_events" path="../../JUCE/modules"/>
        <MODULEPATH id="juce_graphics" path="../../JUCE/modules"/>
        <MODULEPATH id="juce_data_structures" path="../../JUCE/modules"/>
        <MODULEPATH id="juce_gui_basics" path="../../JUCE/modules"/>
        <MODULEPATH id="juce_gui_extra" path="../../JUCE/modules"/>
        <MODULEPATH id="juce_cryptography" path="../../JUCE/modules"/>
        <MODULEPATH id="juce_opengl" path="../../JUCE/modules"/>
        <MODULEPATH id="juce_audio_basics" path="../../JUCE/modules"/>
        <MODULEPATH id="juce_audio_devices" path="../../JUCE/modules"/>
        <MODULEPATH id="juce_audio_formats" path="../../JUCE/modules"/>
        <MODULEPATH id="juce_audio_processors" path="../../JUCE/modules"/>
        <MODULEPATH id="juce_audio_plugin_client" path="../../JUCE/modules"/>
        <MODULEPATH id="juce_audio_utils" path="../../JUCE/modules"/>
      </MODULEPATHS>
    </VS2017>
    <XCODE_MAC targetFolder="Builds/MacOSX" vst3Folder="/SDKs/VST_SDK/VST3_SDK"
               iosDevelopmentTeamID="232AHUS656">
      <CONFIGURATIONS>
        <CONFIGURATION isDebug="1" name="Debug" osxCompatibility="10.7 SDK" osxSDK="10.8 SDK"
                       vst3BinaryLocation="/Library/Audio/Plug-Ins/VST3" vstBinaryLocation="/Library/Audio/Plug-Ins/VST"
                       auBinaryLocation="/Library/Audio/Plug-Ins/Components" fastMath="1"
                       osxArchitecture="Native"/>
        <CONFIGURATION isDebug="0" name="Release" auBinaryLocation="/Library/Audio/Plug-Ins/Components"
                       vst3BinaryLocation="/Library/Audio/Plug-Ins/VST3" vstBinaryLocation="/Library/Audio/Plug-Ins/VST"
                       fastMath="1" stripLocalSymbols="1" osxCompatibility="10.7 SDK"
                       osxSDK="10.8 SDK" osxArchitecture="64BitUniversal"/>
      </CONFIGURATIONS>
      <MODULEPATHS>
        <MODULEPATH id="juce_opengl" path="../../juce"/>
        <MODULEPATH id="juce_gui_extra" path="../../juce"/>
        <MODULEPATH id="juce_gui_basics" path="../../juce"/>
        <MODULEPATH id="juce_graphics" path="../../juce"/>
        <MODULEPATH id="juce_events" path="../../juce"/>
        <MODULEPATH id="juce_data_structures" path="../../juce"/>
        <MODULEPATH id="juce_cryptography" path="../../juce"/>
        <MODULEPATH id="juce_core" path="../../juce"/>
        <MODULEPATH id="juce_audio_utils" path="../../juce"/>
        <MODULEPATH id="juce_audio_processors" path="../../juce"/>
        <MODULEPATH id="juce_audio_plugin_client" path="../../juce"/>
        <MODULEPATH id="juce_audio_formats" path="../../juce"/>
        <MODULEPATH id="juce_audio_devices" path="../../juce"/>
        <MODULEPATH id="juce_audio_basics" path="../../juce"/>
      </MODULEPATHS>
    </XCODE_MAC>
  </EXPORTFORMATS>
  <MODULES>
    <MODULE id="juce_audio_basics" showAllCode="1" useLocalCopy="0" useGlobalPath="1"/>
    <MODULE id="juce_audio_devices" showAllCode="1" useLocalCopy="0" useGlobalPath="1"/>
    <MODULE id="juce_audio_formats" showAllCode="1" useLocalCopy="0" useGlobalPath="1"/>
    <MODULE id="juce_audio_plugin_client" showAllCode="1" useLocalCopy="0"
            useGlobalPath="1"/>
    <MODULE id="juce_audio_processors" showAllCode="1" useLocalCopy="0" useGlobalPath="1"/>
    <MODULE id="juce_audio_utils" showAllCode="1" useLocalCopy="0" useGlobalPath="1"/>
    <MODULE id="juce_core" showAllCode="1" useLocalCopy="0" useGlobalPath="1"/>
    <MODULE id="juce_cryptography" showAllCode="1" useLocalCopy="0" useGlobalPath="1"/>
    <MODULE id="juce_data_structures" showAllCode="1" useLocalCopy="0" useGlobalPath="1"/>
    <MODULE id="juce_events" showAllCode="1" useLocalCopy="0" useGlobalPath="1"/>
    <MODULE id="juce_graphics" showAllCode="1" useLocalCopy="0" useGlobalPath="1"/>
    <MODULE id="juce_gui_basics" showAllCode="1" useLocalCopy="0" useGlobalPath="1"/>
    <MODULE id="juce_gui_extra" showAllCode="1" useLocalCopy="0" useGlobalPath="1"/>
    <MODULE id="juce_opengl" showAllCode="1" useLocalCopy="0" useGlobalPath="1"/>
  </MODULES>
  <LIVE_SETTINGS>
    <WINDOWS/>
    <OSX/>
  </LIVE_SETTINGS>
  <JUCEOPTIONS/>
</JUCERPROJECT>

Oh it looks like GIT decided to put some extra HEAD shit in there. EEK, now how did that happen.

This is a git merge conflict – see here for tips on resolving and getting things working again.

https://githowto.com/resolving_conflicts

2 Likes

Thanks, I did something similar, bloody annoying though.