@@ -18,7 +18,7 @@ ifeq ($(CONFIG),Debug) | |||||
TARGET_ARCH := -march=native | TARGET_ARCH := -march=native | ||||
endif | endif | ||||
CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -D "JUCER_LINUX_MAKE_6D53C8B4=1" -D "JUCE_APP_VERSION=4.2.1" -D "JUCE_APP_VERSION_HEX=0x40201" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../../../modules | |||||
CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -D "JUCER_LINUX_MAKE_6D53C8B4=1" -D "JUCE_APP_VERSION=4.2.2" -D "JUCE_APP_VERSION_HEX=0x40202" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../../../modules | |||||
CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O0 -std=c++11 | CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O0 -std=c++11 | ||||
CXXFLAGS += $(CFLAGS) -std=c++11 | CXXFLAGS += $(CFLAGS) -std=c++11 | ||||
LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR) -L/usr/X11R6/lib/ -lX11 -lXext -lXinerama -ldl -lfreetype -lpthread -lrt -lcurl | LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR) -L/usr/X11R6/lib/ -lX11 -lXext -lXinerama -ldl -lfreetype -lpthread -lrt -lcurl | ||||
@@ -38,7 +38,7 @@ ifeq ($(CONFIG),Release) | |||||
TARGET_ARCH := -march=native | TARGET_ARCH := -march=native | ||||
endif | endif | ||||
CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "NDEBUG=1" -D "JUCER_LINUX_MAKE_6D53C8B4=1" -D "JUCE_APP_VERSION=4.2.1" -D "JUCE_APP_VERSION_HEX=0x40201" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../../../modules | |||||
CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "NDEBUG=1" -D "JUCER_LINUX_MAKE_6D53C8B4=1" -D "JUCE_APP_VERSION=4.2.2" -D "JUCE_APP_VERSION_HEX=0x40202" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../../../modules | |||||
CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -O3 -std=c++11 | CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -O3 -std=c++11 | ||||
CXXFLAGS += $(CFLAGS) -std=c++11 | CXXFLAGS += $(CFLAGS) -std=c++11 | ||||
LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR) -fvisibility=hidden -L/usr/X11R6/lib/ -lX11 -lXext -lXinerama -ldl -lfreetype -lpthread -lrt -lcurl | LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR) -fvisibility=hidden -L/usr/X11R6/lib/ -lX11 -lXext -lXinerama -ldl -lfreetype -lpthread -lrt -lcurl | ||||
@@ -33,9 +33,9 @@ | |||||
<key>CFBundleSignature</key> | <key>CFBundleSignature</key> | ||||
<string>????</string> | <string>????</string> | ||||
<key>CFBundleShortVersionString</key> | <key>CFBundleShortVersionString</key> | ||||
<string>4.2.1</string> | |||||
<string>4.2.2</string> | |||||
<key>CFBundleVersion</key> | <key>CFBundleVersion</key> | ||||
<string>4.2.1</string> | |||||
<string>4.2.2</string> | |||||
<key>NSHumanReadableCopyright</key> | <key>NSHumanReadableCopyright</key> | ||||
<string></string> | <string></string> | ||||
<key>NSHighResolutionCapable</key> | <key>NSHighResolutionCapable</key> | ||||
@@ -2372,8 +2372,8 @@ | |||||
"_DEBUG=1", | "_DEBUG=1", | ||||
"DEBUG=1", | "DEBUG=1", | ||||
"JUCER_XCODE_MAC_F6D2F4CF=1", | "JUCER_XCODE_MAC_F6D2F4CF=1", | ||||
"JUCE_APP_VERSION=4.2.1", | |||||
"JUCE_APP_VERSION_HEX=0x40201", ); | |||||
"JUCE_APP_VERSION=4.2.2", | |||||
"JUCE_APP_VERSION_HEX=0x40202", ); | |||||
GCC_VERSION = com.apple.compilers.llvm.clang.1_0; | GCC_VERSION = com.apple.compilers.llvm.clang.1_0; | ||||
HEADER_SEARCH_PATHS = ("../../JuceLibraryCode", "../../../../modules", "$(inherited)"); | HEADER_SEARCH_PATHS = ("../../JuceLibraryCode", "../../../../modules", "$(inherited)"); | ||||
INFOPLIST_FILE = Info-App.plist; | INFOPLIST_FILE = Info-App.plist; | ||||
@@ -2396,8 +2396,8 @@ | |||||
"_NDEBUG=1", | "_NDEBUG=1", | ||||
"NDEBUG=1", | "NDEBUG=1", | ||||
"JUCER_XCODE_MAC_F6D2F4CF=1", | "JUCER_XCODE_MAC_F6D2F4CF=1", | ||||
"JUCE_APP_VERSION=4.2.1", | |||||
"JUCE_APP_VERSION_HEX=0x40201", ); | |||||
"JUCE_APP_VERSION=4.2.2", | |||||
"JUCE_APP_VERSION_HEX=0x40202", ); | |||||
GCC_SYMBOLS_PRIVATE_EXTERN = YES; | GCC_SYMBOLS_PRIVATE_EXTERN = YES; | ||||
GCC_VERSION = com.apple.compilers.llvm.clang.1_0; | GCC_VERSION = com.apple.compilers.llvm.clang.1_0; | ||||
HEADER_SEARCH_PATHS = ("../../JuceLibraryCode", "../../../../modules", "$(inherited)"); | HEADER_SEARCH_PATHS = ("../../JuceLibraryCode", "../../../../modules", "$(inherited)"); | ||||
@@ -58,7 +58,7 @@ | |||||
<Optimization>Disabled</Optimization> | <Optimization>Disabled</Optimization> | ||||
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> | <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> | ||||
<AdditionalIncludeDirectories>..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | <AdditionalIncludeDirectories>..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||||
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2013_78A5020=1;JUCE_APP_VERSION=4.2.1;JUCE_APP_VERSION_HEX=0x40201;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |||||
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2013_78A5020=1;JUCE_APP_VERSION=4.2.2;JUCE_APP_VERSION_HEX=0x40202;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |||||
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> | <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> | ||||
<RuntimeTypeInfo>true</RuntimeTypeInfo> | <RuntimeTypeInfo>true</RuntimeTypeInfo> | ||||
<PrecompiledHeader/> | <PrecompiledHeader/> | ||||
@@ -97,7 +97,7 @@ | |||||
<ClCompile> | <ClCompile> | ||||
<Optimization>Full</Optimization> | <Optimization>Full</Optimization> | ||||
<AdditionalIncludeDirectories>..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | <AdditionalIncludeDirectories>..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||||
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;JUCER_VS2013_78A5020=1;JUCE_APP_VERSION=4.2.1;JUCE_APP_VERSION_HEX=0x40201;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |||||
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;JUCER_VS2013_78A5020=1;JUCE_APP_VERSION=4.2.2;JUCE_APP_VERSION_HEX=0x40202;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |||||
<RuntimeLibrary>MultiThreaded</RuntimeLibrary> | <RuntimeLibrary>MultiThreaded</RuntimeLibrary> | ||||
<RuntimeTypeInfo>true</RuntimeTypeInfo> | <RuntimeTypeInfo>true</RuntimeTypeInfo> | ||||
<PrecompiledHeader/> | <PrecompiledHeader/> | ||||
@@ -7,16 +7,16 @@ | |||||
#include <windows.h> | #include <windows.h> | ||||
VS_VERSION_INFO VERSIONINFO | VS_VERSION_INFO VERSIONINFO | ||||
FILEVERSION 4,2,1,0 | |||||
FILEVERSION 4,2,2,0 | |||||
BEGIN | BEGIN | ||||
BLOCK "StringFileInfo" | BLOCK "StringFileInfo" | ||||
BEGIN | BEGIN | ||||
BLOCK "040904E4" | BLOCK "040904E4" | ||||
BEGIN | BEGIN | ||||
VALUE "FileDescription", "Projucer\0" | VALUE "FileDescription", "Projucer\0" | ||||
VALUE "FileVersion", "4.2.1\0" | |||||
VALUE "FileVersion", "4.2.2\0" | |||||
VALUE "ProductName", "Projucer\0" | VALUE "ProductName", "Projucer\0" | ||||
VALUE "ProductVersion", "4.2.1\0" | |||||
VALUE "ProductVersion", "4.2.2\0" | |||||
END | END | ||||
END | END | ||||
@@ -58,7 +58,7 @@ | |||||
<Optimization>Disabled</Optimization> | <Optimization>Disabled</Optimization> | ||||
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> | <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> | ||||
<AdditionalIncludeDirectories>..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | <AdditionalIncludeDirectories>..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||||
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2015_78A5022=1;JUCE_APP_VERSION=4.2.1;JUCE_APP_VERSION_HEX=0x40201;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |||||
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2015_78A5022=1;JUCE_APP_VERSION=4.2.2;JUCE_APP_VERSION_HEX=0x40202;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |||||
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> | <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> | ||||
<RuntimeTypeInfo>true</RuntimeTypeInfo> | <RuntimeTypeInfo>true</RuntimeTypeInfo> | ||||
<PrecompiledHeader/> | <PrecompiledHeader/> | ||||
@@ -97,7 +97,7 @@ | |||||
<ClCompile> | <ClCompile> | ||||
<Optimization>Full</Optimization> | <Optimization>Full</Optimization> | ||||
<AdditionalIncludeDirectories>..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | <AdditionalIncludeDirectories>..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||||
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;JUCER_VS2015_78A5022=1;JUCE_APP_VERSION=4.2.1;JUCE_APP_VERSION_HEX=0x40201;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |||||
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;JUCER_VS2015_78A5022=1;JUCE_APP_VERSION=4.2.2;JUCE_APP_VERSION_HEX=0x40202;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |||||
<RuntimeLibrary>MultiThreaded</RuntimeLibrary> | <RuntimeLibrary>MultiThreaded</RuntimeLibrary> | ||||
<RuntimeTypeInfo>true</RuntimeTypeInfo> | <RuntimeTypeInfo>true</RuntimeTypeInfo> | ||||
<PrecompiledHeader/> | <PrecompiledHeader/> | ||||
@@ -7,16 +7,16 @@ | |||||
#include <windows.h> | #include <windows.h> | ||||
VS_VERSION_INFO VERSIONINFO | VS_VERSION_INFO VERSIONINFO | ||||
FILEVERSION 4,2,1,0 | |||||
FILEVERSION 4,2,2,0 | |||||
BEGIN | BEGIN | ||||
BLOCK "StringFileInfo" | BLOCK "StringFileInfo" | ||||
BEGIN | BEGIN | ||||
BLOCK "040904E4" | BLOCK "040904E4" | ||||
BEGIN | BEGIN | ||||
VALUE "FileDescription", "Projucer\0" | VALUE "FileDescription", "Projucer\0" | ||||
VALUE "FileVersion", "4.2.1\0" | |||||
VALUE "FileVersion", "4.2.2\0" | |||||
VALUE "ProductName", "Projucer\0" | VALUE "ProductName", "Projucer\0" | ||||
VALUE "ProductVersion", "4.2.1\0" | |||||
VALUE "ProductVersion", "4.2.2\0" | |||||
END | END | ||||
END | END | ||||
@@ -35,8 +35,8 @@ | |||||
namespace ProjectInfo | namespace ProjectInfo | ||||
{ | { | ||||
const char* const projectName = "Projucer"; | const char* const projectName = "Projucer"; | ||||
const char* const versionString = "4.2.1"; | |||||
const int versionNumber = 0x40201; | |||||
const char* const versionString = "4.2.2"; | |||||
const int versionNumber = 0x40202; | |||||
} | } | ||||
#endif | #endif | ||||
@@ -1,7 +1,7 @@ | |||||
<?xml version="1.0" encoding="UTF-8"?> | <?xml version="1.0" encoding="UTF-8"?> | ||||
<JUCERPROJECT id="M70qfTRRk" name="Projucer" projectType="guiapp" juceFolder="../../juce" | <JUCERPROJECT id="M70qfTRRk" name="Projucer" projectType="guiapp" juceFolder="../../juce" | ||||
jucerVersion="4.2.1" version="4.2.1" bundleIdentifier="com.juce.theprojucer" | |||||
jucerVersion="4.2.2" version="4.2.2" bundleIdentifier="com.juce.theprojucer" | |||||
defines="" includeBinaryInAppConfig="1"> | defines="" includeBinaryInAppConfig="1"> | ||||
<EXPORTFORMATS> | <EXPORTFORMATS> | ||||
<XCODE_MAC targetFolder="Builds/MacOSX" vstFolder="~/SDKs/vstsdk2.4" rtasFolder="~/SDKs/PT_80_SDK" | <XCODE_MAC targetFolder="Builds/MacOSX" vstFolder="~/SDKs/vstsdk2.4" rtasFolder="~/SDKs/PT_80_SDK" | ||||