@@ -24,8 +24,8 @@ | |||
<Add option="-DDEBUG=1"/> | |||
<Add option="-D_DEBUG=1"/> | |||
<Add option="-DJUCER_CODEBLOCKS_20734A5D=1"/> | |||
<Add option="-DJUCE_APP_VERSION=3.1.0"/> | |||
<Add option="-DJUCE_APP_VERSION_HEX=0x30100"/> | |||
<Add option="-DJUCE_APP_VERSION=3.1.1"/> | |||
<Add option="-DJUCE_APP_VERSION_HEX=0x30101"/> | |||
<Add directory="."/> | |||
<Add directory="..\..\JuceLibraryCode"/> | |||
</Compiler> | |||
@@ -59,8 +59,8 @@ | |||
<Add option="-D__MINGW_EXTENSION="/> | |||
<Add option="-DNDEBUG=1"/> | |||
<Add option="-DJUCER_CODEBLOCKS_20734A5D=1"/> | |||
<Add option="-DJUCE_APP_VERSION=3.1.0"/> | |||
<Add option="-DJUCE_APP_VERSION_HEX=0x30100"/> | |||
<Add option="-DJUCE_APP_VERSION=3.1.1"/> | |||
<Add option="-DJUCE_APP_VERSION_HEX=0x30101"/> | |||
<Add directory="."/> | |||
<Add directory="..\..\JuceLibraryCode"/> | |||
</Compiler> | |||
@@ -18,12 +18,12 @@ ifeq ($(CONFIG),Debug) | |||
TARGET_ARCH := -march=native | |||
endif | |||
CPPFLAGS := $(DEPFLAGS) -std=c++11 -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=3.1.0" -D "JUCE_APP_VERSION_HEX=0x30100" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../../../modules | |||
CPPFLAGS := $(DEPFLAGS) -std=c++11 -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=3.1.1" -D "JUCE_APP_VERSION_HEX=0x30101" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../../../modules | |||
CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O0 -std=gnu++0x | |||
CXXFLAGS += $(CFLAGS) | |||
LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR) -L/usr/X11R6/lib/ -lX11 -lXext -lXinerama -ldl -lfreetype -lpthread -lrt | |||
LDDEPS := | |||
RESFLAGS := -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=3.1.0" -D "JUCE_APP_VERSION_HEX=0x30100" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../../../modules | |||
RESFLAGS := -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=3.1.1" -D "JUCE_APP_VERSION_HEX=0x30101" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../../../modules | |||
TARGET := Introjucer | |||
BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH) | |||
CLEANCMD = rm -rf $(OUTDIR)/$(TARGET) $(OBJDIR) | |||
@@ -39,12 +39,12 @@ ifeq ($(CONFIG),Release) | |||
TARGET_ARCH := -march=native | |||
endif | |||
CPPFLAGS := $(DEPFLAGS) -std=c++11 -D "LINUX=1" -D "NDEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=3.1.0" -D "JUCE_APP_VERSION_HEX=0x30100" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../../../modules | |||
CPPFLAGS := $(DEPFLAGS) -std=c++11 -D "LINUX=1" -D "NDEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=3.1.1" -D "JUCE_APP_VERSION_HEX=0x30101" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../../../modules | |||
CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -O3 -std=gnu++0x | |||
CXXFLAGS += $(CFLAGS) | |||
LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR) -fvisibility=hidden -L/usr/X11R6/lib/ -lX11 -lXext -lXinerama -ldl -lfreetype -lpthread -lrt | |||
LDDEPS := | |||
RESFLAGS := -D "LINUX=1" -D "NDEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=3.1.0" -D "JUCE_APP_VERSION_HEX=0x30100" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../../../modules | |||
RESFLAGS := -D "LINUX=1" -D "NDEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=3.1.1" -D "JUCE_APP_VERSION_HEX=0x30101" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../../../modules | |||
TARGET := Introjucer | |||
BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH) | |||
CLEANCMD = rm -rf $(OUTDIR)/$(TARGET) $(OBJDIR) | |||
@@ -16,9 +16,9 @@ | |||
<key>CFBundleSignature</key> | |||
<string>????</string> | |||
<key>CFBundleShortVersionString</key> | |||
<string>3.1.0</string> | |||
<string>3.1.1</string> | |||
<key>CFBundleVersion</key> | |||
<string>3.1.0</string> | |||
<string>3.1.1</string> | |||
<key>NSHumanReadableCopyright</key> | |||
<string>Raw Material Software Ltd.</string> | |||
<key>NSHighResolutionCapable</key> | |||
@@ -1991,8 +1991,8 @@ | |||
"_DEBUG=1", | |||
"DEBUG=1", | |||
"JUCER_XCODE_MAC_F6D2F4CF=1", | |||
"JUCE_APP_VERSION=3.1.0", | |||
"JUCE_APP_VERSION_HEX=0x30100", ); | |||
"JUCE_APP_VERSION=3.1.1", | |||
"JUCE_APP_VERSION_HEX=0x30101", ); | |||
GCC_VERSION = com.apple.compilers.llvm.clang.1_0; | |||
HEADER_SEARCH_PATHS = ("../../JuceLibraryCode", "../../../../modules", "$(inherited)"); | |||
INFOPLIST_FILE = Info.plist; | |||
@@ -2013,8 +2013,8 @@ | |||
"_NDEBUG=1", | |||
"NDEBUG=1", | |||
"JUCER_XCODE_MAC_F6D2F4CF=1", | |||
"JUCE_APP_VERSION=3.1.0", | |||
"JUCE_APP_VERSION_HEX=0x30100", ); | |||
"JUCE_APP_VERSION=3.1.1", | |||
"JUCE_APP_VERSION_HEX=0x30101", ); | |||
GCC_SYMBOLS_PRIVATE_EXTERN = YES; | |||
GCC_VERSION = com.apple.compilers.llvm.clang.1_0; | |||
HEADER_SEARCH_PATHS = ("../../JuceLibraryCode", "../../../../modules", "$(inherited)"); | |||
@@ -32,7 +32,7 @@ | |||
BufferSecurityCheck="" | |||
DebugInformationFormat="4" | |||
AdditionalIncludeDirectories="..\..\JuceLibraryCode;..\..\..\..\modules" | |||
PreprocessorDefinitions="WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2005_78A5003=1;JUCE_APP_VERSION=3.1.0;JUCE_APP_VERSION_HEX=0x30100" | |||
PreprocessorDefinitions="WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2005_78A5003=1;JUCE_APP_VERSION=3.1.1;JUCE_APP_VERSION_HEX=0x30101" | |||
RuntimeLibrary="1" | |||
RuntimeTypeInfo="true" | |||
UsePrecompiledHeader="0" | |||
@@ -88,7 +88,7 @@ | |||
InlineFunctionExpansion="1" | |||
StringPooling="true" | |||
AdditionalIncludeDirectories="..\..\JuceLibraryCode;..\..\..\..\modules" | |||
PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;JUCER_VS2005_78A5003=1;JUCE_APP_VERSION=3.1.0;JUCE_APP_VERSION_HEX=0x30100" | |||
PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;JUCER_VS2005_78A5003=1;JUCE_APP_VERSION=3.1.1;JUCE_APP_VERSION_HEX=0x30101" | |||
RuntimeLibrary="0" | |||
RuntimeTypeInfo="true" | |||
UsePrecompiledHeader="0" | |||
@@ -7,7 +7,7 @@ | |||
#include <windows.h> | |||
VS_VERSION_INFO VERSIONINFO | |||
FILEVERSION 3,1,0,0 | |||
FILEVERSION 3,1,1,0 | |||
BEGIN | |||
BLOCK "StringFileInfo" | |||
BEGIN | |||
@@ -15,9 +15,9 @@ BEGIN | |||
BEGIN | |||
VALUE "CompanyName", "Raw Material Software Ltd.\0" | |||
VALUE "FileDescription", "The Introjucer\0" | |||
VALUE "FileVersion", "3.1.0\0" | |||
VALUE "FileVersion", "3.1.1\0" | |||
VALUE "ProductName", "The Introjucer\0" | |||
VALUE "ProductVersion", "3.1.0\0" | |||
VALUE "ProductVersion", "3.1.1\0" | |||
END | |||
END | |||
@@ -32,7 +32,7 @@ | |||
BufferSecurityCheck="" | |||
DebugInformationFormat="4" | |||
AdditionalIncludeDirectories="..\..\JuceLibraryCode;..\..\..\..\modules" | |||
PreprocessorDefinitions="WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2008_78A5006=1;JUCE_APP_VERSION=3.1.0;JUCE_APP_VERSION_HEX=0x30100" | |||
PreprocessorDefinitions="WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2008_78A5006=1;JUCE_APP_VERSION=3.1.1;JUCE_APP_VERSION_HEX=0x30101" | |||
RuntimeLibrary="1" | |||
RuntimeTypeInfo="true" | |||
UsePrecompiledHeader="0" | |||
@@ -88,7 +88,7 @@ | |||
InlineFunctionExpansion="1" | |||
StringPooling="true" | |||
AdditionalIncludeDirectories="..\..\JuceLibraryCode;..\..\..\..\modules" | |||
PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;JUCER_VS2008_78A5006=1;JUCE_APP_VERSION=3.1.0;JUCE_APP_VERSION_HEX=0x30100" | |||
PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;JUCER_VS2008_78A5006=1;JUCE_APP_VERSION=3.1.1;JUCE_APP_VERSION_HEX=0x30101" | |||
RuntimeLibrary="0" | |||
RuntimeTypeInfo="true" | |||
UsePrecompiledHeader="0" | |||
@@ -7,7 +7,7 @@ | |||
#include <windows.h> | |||
VS_VERSION_INFO VERSIONINFO | |||
FILEVERSION 3,1,0,0 | |||
FILEVERSION 3,1,1,0 | |||
BEGIN | |||
BLOCK "StringFileInfo" | |||
BEGIN | |||
@@ -15,9 +15,9 @@ BEGIN | |||
BEGIN | |||
VALUE "CompanyName", "Raw Material Software Ltd.\0" | |||
VALUE "FileDescription", "The Introjucer\0" | |||
VALUE "FileVersion", "3.1.0\0" | |||
VALUE "FileVersion", "3.1.1\0" | |||
VALUE "ProductName", "The Introjucer\0" | |||
VALUE "ProductVersion", "3.1.0\0" | |||
VALUE "ProductVersion", "3.1.1\0" | |||
END | |||
END | |||
@@ -52,7 +52,7 @@ | |||
<Optimization>Disabled</Optimization> | |||
<DebugInformationFormat>EditAndContinue</DebugInformationFormat> | |||
<AdditionalIncludeDirectories>..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | |||
<PreprocessorDefinitions>WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2010_78A501D=1;JUCE_APP_VERSION=3.1.0;JUCE_APP_VERSION_HEX=0x30100;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |||
<PreprocessorDefinitions>WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2010_78A501D=1;JUCE_APP_VERSION=3.1.1;JUCE_APP_VERSION_HEX=0x30101;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |||
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> | |||
<RuntimeTypeInfo>true</RuntimeTypeInfo> | |||
<PrecompiledHeader/> | |||
@@ -93,7 +93,7 @@ | |||
<ClCompile> | |||
<Optimization>Full</Optimization> | |||
<AdditionalIncludeDirectories>..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | |||
<PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;JUCER_VS2010_78A501D=1;JUCE_APP_VERSION=3.1.0;JUCE_APP_VERSION_HEX=0x30100;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |||
<PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;JUCER_VS2010_78A501D=1;JUCE_APP_VERSION=3.1.1;JUCE_APP_VERSION_HEX=0x30101;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |||
<RuntimeLibrary>MultiThreaded</RuntimeLibrary> | |||
<RuntimeTypeInfo>true</RuntimeTypeInfo> | |||
<PrecompiledHeader/> | |||
@@ -7,7 +7,7 @@ | |||
#include <windows.h> | |||
VS_VERSION_INFO VERSIONINFO | |||
FILEVERSION 3,1,0,0 | |||
FILEVERSION 3,1,1,0 | |||
BEGIN | |||
BLOCK "StringFileInfo" | |||
BEGIN | |||
@@ -15,9 +15,9 @@ BEGIN | |||
BEGIN | |||
VALUE "CompanyName", "Raw Material Software Ltd.\0" | |||
VALUE "FileDescription", "The Introjucer\0" | |||
VALUE "FileVersion", "3.1.0\0" | |||
VALUE "FileVersion", "3.1.1\0" | |||
VALUE "ProductName", "The Introjucer\0" | |||
VALUE "ProductVersion", "3.1.0\0" | |||
VALUE "ProductVersion", "3.1.1\0" | |||
END | |||
END | |||
@@ -58,7 +58,7 @@ | |||
<Optimization>Disabled</Optimization> | |||
<DebugInformationFormat>EditAndContinue</DebugInformationFormat> | |||
<AdditionalIncludeDirectories>..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | |||
<PreprocessorDefinitions>WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2012_78A501F=1;JUCE_APP_VERSION=3.1.0;JUCE_APP_VERSION_HEX=0x30100;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |||
<PreprocessorDefinitions>WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2012_78A501F=1;JUCE_APP_VERSION=3.1.1;JUCE_APP_VERSION_HEX=0x30101;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |||
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> | |||
<RuntimeTypeInfo>true</RuntimeTypeInfo> | |||
<PrecompiledHeader/> | |||
@@ -99,7 +99,7 @@ | |||
<ClCompile> | |||
<Optimization>MinSpace</Optimization> | |||
<AdditionalIncludeDirectories>..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | |||
<PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;JUCER_VS2012_78A501F=1;JUCE_APP_VERSION=3.1.0;JUCE_APP_VERSION_HEX=0x30100;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |||
<PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;JUCER_VS2012_78A501F=1;JUCE_APP_VERSION=3.1.1;JUCE_APP_VERSION_HEX=0x30101;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |||
<RuntimeLibrary>MultiThreaded</RuntimeLibrary> | |||
<RuntimeTypeInfo>true</RuntimeTypeInfo> | |||
<PrecompiledHeader/> | |||
@@ -7,7 +7,7 @@ | |||
#include <windows.h> | |||
VS_VERSION_INFO VERSIONINFO | |||
FILEVERSION 3,1,0,0 | |||
FILEVERSION 3,1,1,0 | |||
BEGIN | |||
BLOCK "StringFileInfo" | |||
BEGIN | |||
@@ -15,9 +15,9 @@ BEGIN | |||
BEGIN | |||
VALUE "CompanyName", "Raw Material Software Ltd.\0" | |||
VALUE "FileDescription", "The Introjucer\0" | |||
VALUE "FileVersion", "3.1.0\0" | |||
VALUE "FileVersion", "3.1.1\0" | |||
VALUE "ProductName", "The Introjucer\0" | |||
VALUE "ProductVersion", "3.1.0\0" | |||
VALUE "ProductVersion", "3.1.1\0" | |||
END | |||
END | |||
@@ -58,7 +58,7 @@ | |||
<Optimization>Disabled</Optimization> | |||
<DebugInformationFormat>EditAndContinue</DebugInformationFormat> | |||
<AdditionalIncludeDirectories>..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | |||
<PreprocessorDefinitions>WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2013_78A5020=1;JUCE_APP_VERSION=3.1.0;JUCE_APP_VERSION_HEX=0x30100;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |||
<PreprocessorDefinitions>WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2013_78A5020=1;JUCE_APP_VERSION=3.1.1;JUCE_APP_VERSION_HEX=0x30101;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |||
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> | |||
<RuntimeTypeInfo>true</RuntimeTypeInfo> | |||
<PrecompiledHeader/> | |||
@@ -99,7 +99,7 @@ | |||
<ClCompile> | |||
<Optimization>MinSpace</Optimization> | |||
<AdditionalIncludeDirectories>..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | |||
<PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;JUCER_VS2013_78A5020=1;JUCE_APP_VERSION=3.1.0;JUCE_APP_VERSION_HEX=0x30100;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |||
<PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;JUCER_VS2013_78A5020=1;JUCE_APP_VERSION=3.1.1;JUCE_APP_VERSION_HEX=0x30101;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |||
<RuntimeLibrary>MultiThreaded</RuntimeLibrary> | |||
<RuntimeTypeInfo>true</RuntimeTypeInfo> | |||
<PrecompiledHeader/> | |||
@@ -7,7 +7,7 @@ | |||
#include <windows.h> | |||
VS_VERSION_INFO VERSIONINFO | |||
FILEVERSION 3,1,0,0 | |||
FILEVERSION 3,1,1,0 | |||
BEGIN | |||
BLOCK "StringFileInfo" | |||
BEGIN | |||
@@ -15,9 +15,9 @@ BEGIN | |||
BEGIN | |||
VALUE "CompanyName", "Raw Material Software Ltd.\0" | |||
VALUE "FileDescription", "The Introjucer\0" | |||
VALUE "FileVersion", "3.1.0\0" | |||
VALUE "FileVersion", "3.1.1\0" | |||
VALUE "ProductName", "The Introjucer\0" | |||
VALUE "ProductVersion", "3.1.0\0" | |||
VALUE "ProductVersion", "3.1.1\0" | |||
END | |||
END | |||
@@ -1,7 +1,7 @@ | |||
<?xml version="1.0" encoding="UTF-8"?> | |||
<JUCERPROJECT id="M70qfTRRk" name="The Introjucer" projectType="guiapp" juceLinkage="amalg_multi" | |||
juceFolder="../../juce" jucerVersion="3.1.0" version="3.1.0" | |||
juceFolder="../../juce" jucerVersion="3.1.0" version="3.1.1" | |||
buildVST="1" buildRTAS="0" buildAU="1" vstFolderMac="~/SDKs/vstsdk2.4" | |||
vstFolderPC="c:\SDKs\vstsdk2.4" rtasFolderMac="~/SDKs/PT_80_SDK" | |||
rtasFolderPC="c:\SDKs\PT_80_SDK" pluginName="The Introjucer" | |||
@@ -33,8 +33,8 @@ | |||
namespace ProjectInfo | |||
{ | |||
const char* const projectName = "The Introjucer"; | |||
const char* const versionString = "3.1.0"; | |||
const int versionNumber = 0x30100; | |||
const char* const versionString = "3.1.1"; | |||
const int versionNumber = 0x30101; | |||
} | |||
#endif | |||