@@ -63,14 +63,14 @@ LOCAL_SRC_FILES := \ | |||||
../../../../../modules/juce_video/juce_video.cpp\ | ../../../../../modules/juce_video/juce_video.cpp\ | ||||
ifeq ($(CONFIG),Debug) | ifeq ($(CONFIG),Debug) | ||||
LOCAL_CPPFLAGS += -fsigned-char -fexceptions -frtti -g -I "../../JuceLibraryCode" -I "../../../../modules" -O0 -std=c++0x -std=gnu++0x -D "JUCE_ANDROID=1" -D "JUCE_ANDROID_API_VERSION=9" -D "JUCE_ANDROID_ACTIVITY_CLASSNAME=com_juce_jucedemo_JuceDemo" -D JUCE_ANDROID_ACTIVITY_CLASSPATH=\"com/juce/jucedemo/JuceDemo\" -D "DEBUG=1" -D "_DEBUG=1" -D "JUCE_UNIT_TESTS=1" -D "JUCER_ANDROID_7F0E4A25=1" | |||||
LOCAL_CPPFLAGS += -fsigned-char -fexceptions -frtti -g -I "../../JuceLibraryCode" -I "../../../../modules" -O0 -std=c++0x -std=gnu++0x -D "JUCE_ANDROID=1" -D "JUCE_ANDROID_API_VERSION=9" -D "JUCE_ANDROID_ACTIVITY_CLASSNAME=com_juce_jucedemo_JuceDemo" -D JUCE_ANDROID_ACTIVITY_CLASSPATH=\"com/juce/jucedemo/JuceDemo\" -D "DEBUG=1" -D "_DEBUG=1" -D "JUCE_UNIT_TESTS=1" -D "JUCER_ANDROID_7F0E4A25=1" -D "JUCE_APP_VERSION=3.0.0" -D "JUCE_APP_VERSION_HEX=0x30000" | |||||
LOCAL_LDLIBS := -llog -lGLESv2 | LOCAL_LDLIBS := -llog -lGLESv2 | ||||
LOCAL_CFLAGS += -fsigned-char -fexceptions -frtti -g -I "../../JuceLibraryCode" -I "../../../../modules" -O0 -std=c++0x -std=gnu++0x -D "JUCE_ANDROID=1" -D "JUCE_ANDROID_API_VERSION=9" -D "JUCE_ANDROID_ACTIVITY_CLASSNAME=com_juce_jucedemo_JuceDemo" -D JUCE_ANDROID_ACTIVITY_CLASSPATH=\"com/juce/jucedemo/JuceDemo\" -D "DEBUG=1" -D "_DEBUG=1" -D "JUCE_UNIT_TESTS=1" -D "JUCER_ANDROID_7F0E4A25=1" | |||||
LOCAL_CFLAGS += -fsigned-char -fexceptions -frtti -g -I "../../JuceLibraryCode" -I "../../../../modules" -O0 -std=c++0x -std=gnu++0x -D "JUCE_ANDROID=1" -D "JUCE_ANDROID_API_VERSION=9" -D "JUCE_ANDROID_ACTIVITY_CLASSNAME=com_juce_jucedemo_JuceDemo" -D JUCE_ANDROID_ACTIVITY_CLASSPATH=\"com/juce/jucedemo/JuceDemo\" -D "DEBUG=1" -D "_DEBUG=1" -D "JUCE_UNIT_TESTS=1" -D "JUCER_ANDROID_7F0E4A25=1" -D "JUCE_APP_VERSION=3.0.0" -D "JUCE_APP_VERSION_HEX=0x30000" | |||||
LOCAL_LDLIBS := -llog -lGLESv2 | LOCAL_LDLIBS := -llog -lGLESv2 | ||||
else | else | ||||
LOCAL_CPPFLAGS += -fsigned-char -fexceptions -frtti -I "../../JuceLibraryCode" -I "../../../../modules" -O3 -std=c++0x -std=gnu++0x -D "JUCE_ANDROID=1" -D "JUCE_ANDROID_API_VERSION=9" -D "JUCE_ANDROID_ACTIVITY_CLASSNAME=com_juce_jucedemo_JuceDemo" -D JUCE_ANDROID_ACTIVITY_CLASSPATH=\"com/juce/jucedemo/JuceDemo\" -D "NDEBUG=1" -D "JUCE_UNIT_TESTS=1" -D "JUCER_ANDROID_7F0E4A25=1" | |||||
LOCAL_CPPFLAGS += -fsigned-char -fexceptions -frtti -I "../../JuceLibraryCode" -I "../../../../modules" -O3 -std=c++0x -std=gnu++0x -D "JUCE_ANDROID=1" -D "JUCE_ANDROID_API_VERSION=9" -D "JUCE_ANDROID_ACTIVITY_CLASSNAME=com_juce_jucedemo_JuceDemo" -D JUCE_ANDROID_ACTIVITY_CLASSPATH=\"com/juce/jucedemo/JuceDemo\" -D "NDEBUG=1" -D "JUCE_UNIT_TESTS=1" -D "JUCER_ANDROID_7F0E4A25=1" -D "JUCE_APP_VERSION=3.0.0" -D "JUCE_APP_VERSION_HEX=0x30000" | |||||
LOCAL_LDLIBS := -llog -lGLESv2 | LOCAL_LDLIBS := -llog -lGLESv2 | ||||
LOCAL_CFLAGS += -fsigned-char -fexceptions -frtti -I "../../JuceLibraryCode" -I "../../../../modules" -O3 -std=c++0x -std=gnu++0x -D "JUCE_ANDROID=1" -D "JUCE_ANDROID_API_VERSION=9" -D "JUCE_ANDROID_ACTIVITY_CLASSNAME=com_juce_jucedemo_JuceDemo" -D JUCE_ANDROID_ACTIVITY_CLASSPATH=\"com/juce/jucedemo/JuceDemo\" -D "NDEBUG=1" -D "JUCE_UNIT_TESTS=1" -D "JUCER_ANDROID_7F0E4A25=1" | |||||
LOCAL_CFLAGS += -fsigned-char -fexceptions -frtti -I "../../JuceLibraryCode" -I "../../../../modules" -O3 -std=c++0x -std=gnu++0x -D "JUCE_ANDROID=1" -D "JUCE_ANDROID_API_VERSION=9" -D "JUCE_ANDROID_ACTIVITY_CLASSNAME=com_juce_jucedemo_JuceDemo" -D JUCE_ANDROID_ACTIVITY_CLASSPATH=\"com/juce/jucedemo/JuceDemo\" -D "NDEBUG=1" -D "JUCE_UNIT_TESTS=1" -D "JUCER_ANDROID_7F0E4A25=1" -D "JUCE_APP_VERSION=3.0.0" -D "JUCE_APP_VERSION_HEX=0x30000" | |||||
LOCAL_LDLIBS := -llog -lGLESv2 | LOCAL_LDLIBS := -llog -lGLESv2 | ||||
endif | endif | ||||
@@ -18,12 +18,12 @@ 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 "JUCE_UNIT_TESTS=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../../../modules | |||||
CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -D "JUCE_UNIT_TESTS=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=3.0.0" -D "JUCE_APP_VERSION_HEX=0x30000" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../../../modules | |||||
CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O0 | CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O0 | ||||
CXXFLAGS += $(CFLAGS) | CXXFLAGS += $(CFLAGS) | ||||
LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR) -L/usr/X11R6/lib/ -lGL -lX11 -lXext -lXinerama -lasound -ldl -lfreetype -lpthread -lrt | LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR) -L/usr/X11R6/lib/ -lGL -lX11 -lXext -lXinerama -lasound -ldl -lfreetype -lpthread -lrt | ||||
LDDEPS := | LDDEPS := | ||||
RESFLAGS := -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -D "JUCE_UNIT_TESTS=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../../../modules | |||||
RESFLAGS := -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -D "JUCE_UNIT_TESTS=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=3.0.0" -D "JUCE_APP_VERSION_HEX=0x30000" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../../../modules | |||||
TARGET := JuceDemo | TARGET := JuceDemo | ||||
BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH) | BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH) | ||||
endif | endif | ||||
@@ -38,12 +38,12 @@ ifeq ($(CONFIG),Release) | |||||
TARGET_ARCH := -march=native | TARGET_ARCH := -march=native | ||||
endif | endif | ||||
CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "NDEBUG=1" -D "JUCE_UNIT_TESTS=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../../../modules | |||||
CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "NDEBUG=1" -D "JUCE_UNIT_TESTS=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=3.0.0" -D "JUCE_APP_VERSION_HEX=0x30000" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../../../modules | |||||
CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -O3 | CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -O3 | ||||
CXXFLAGS += $(CFLAGS) | CXXFLAGS += $(CFLAGS) | ||||
LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR) -fvisibility=hidden -L/usr/X11R6/lib/ -lGL -lX11 -lXext -lXinerama -lasound -ldl -lfreetype -lpthread -lrt | LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR) -fvisibility=hidden -L/usr/X11R6/lib/ -lGL -lX11 -lXext -lXinerama -lasound -ldl -lfreetype -lpthread -lrt | ||||
LDDEPS := | LDDEPS := | ||||
RESFLAGS := -D "LINUX=1" -D "NDEBUG=1" -D "JUCE_UNIT_TESTS=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../../../modules | |||||
RESFLAGS := -D "LINUX=1" -D "NDEBUG=1" -D "JUCE_UNIT_TESTS=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=3.0.0" -D "JUCE_APP_VERSION_HEX=0x30000" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../../../modules | |||||
TARGET := JuceDemo | TARGET := JuceDemo | ||||
BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH) | BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH) | ||||
endif | endif | ||||
@@ -16,9 +16,9 @@ | |||||
<key>CFBundleSignature</key> | <key>CFBundleSignature</key> | ||||
<string>????</string> | <string>????</string> | ||||
<key>CFBundleShortVersionString</key> | <key>CFBundleShortVersionString</key> | ||||
<string>1.0.0</string> | |||||
<string>3.0.0</string> | |||||
<key>CFBundleVersion</key> | <key>CFBundleVersion</key> | ||||
<string>1.0.0</string> | |||||
<string>3.0.0</string> | |||||
<key>NSHumanReadableCopyright</key> | <key>NSHumanReadableCopyright</key> | ||||
<string></string> | <string></string> | ||||
<key>NSHighResolutionCapable</key> | <key>NSHighResolutionCapable</key> | ||||
@@ -2181,7 +2181,9 @@ | |||||
"_DEBUG=1", | "_DEBUG=1", | ||||
"DEBUG=1", | "DEBUG=1", | ||||
"JUCE_UNIT_TESTS=1", | "JUCE_UNIT_TESTS=1", | ||||
"JUCER_XCODE_MAC_F6D2F4CF=1"); }; name = Debug; }; | |||||
"JUCER_XCODE_MAC_F6D2F4CF=1", | |||||
"JUCE_APP_VERSION=3.0.0", | |||||
"JUCE_APP_VERSION_HEX=0x30000"); }; name = Debug; }; | |||||
80E4DBEBE0CE7D218C89F78C = { isa = XCBuildConfiguration; buildSettings = { | 80E4DBEBE0CE7D218C89F78C = { isa = XCBuildConfiguration; buildSettings = { | ||||
ARCHS = "$(NATIVE_ARCH_ACTUAL)"; | ARCHS = "$(NATIVE_ARCH_ACTUAL)"; | ||||
HEADER_SEARCH_PATHS = ("../../JuceLibraryCode", "../../../../modules", "$(inherited)"); | HEADER_SEARCH_PATHS = ("../../JuceLibraryCode", "../../../../modules", "$(inherited)"); | ||||
@@ -2204,7 +2206,9 @@ | |||||
"_NDEBUG=1", | "_NDEBUG=1", | ||||
"NDEBUG=1", | "NDEBUG=1", | ||||
"JUCE_UNIT_TESTS=1", | "JUCE_UNIT_TESTS=1", | ||||
"JUCER_XCODE_MAC_F6D2F4CF=1"); }; name = Release; }; | |||||
"JUCER_XCODE_MAC_F6D2F4CF=1", | |||||
"JUCE_APP_VERSION=3.0.0", | |||||
"JUCE_APP_VERSION_HEX=0x30000"); }; name = Release; }; | |||||
A16C0416417EF9DF7B09973F = { isa = XCBuildConfiguration; buildSettings = { | A16C0416417EF9DF7B09973F = { isa = XCBuildConfiguration; buildSettings = { | ||||
ALWAYS_SEARCH_USER_PATHS = NO; | ALWAYS_SEARCH_USER_PATHS = NO; | ||||
GCC_C_LANGUAGE_STANDARD = c99; | GCC_C_LANGUAGE_STANDARD = c99; | ||||
@@ -52,7 +52,7 @@ | |||||
<Optimization>Disabled</Optimization> | <Optimization>Disabled</Optimization> | ||||
<DebugInformationFormat>EditAndContinue</DebugInformationFormat> | <DebugInformationFormat>EditAndContinue</DebugInformationFormat> | ||||
<AdditionalIncludeDirectories>..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | <AdditionalIncludeDirectories>..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||||
<PreprocessorDefinitions>WIN32;_WINDOWS;DEBUG;_DEBUG;JUCE_UNIT_TESTS=1;JUCER_VS2010_78A501D=1;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |||||
<PreprocessorDefinitions>WIN32;_WINDOWS;DEBUG;_DEBUG;JUCE_UNIT_TESTS=1;JUCER_VS2010_78A501D=1;JUCE_APP_VERSION=3.0.0;JUCE_APP_VERSION_HEX=0x30000;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |||||
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> | <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> | ||||
<RuntimeTypeInfo>true</RuntimeTypeInfo> | <RuntimeTypeInfo>true</RuntimeTypeInfo> | ||||
<PrecompiledHeader/> | <PrecompiledHeader/> | ||||
@@ -93,7 +93,7 @@ | |||||
<ClCompile> | <ClCompile> | ||||
<Optimization>Full</Optimization> | <Optimization>Full</Optimization> | ||||
<AdditionalIncludeDirectories>..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | <AdditionalIncludeDirectories>..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||||
<PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;JUCE_UNIT_TESTS=1;JUCER_VS2010_78A501D=1;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |||||
<PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;JUCE_UNIT_TESTS=1;JUCER_VS2010_78A501D=1;JUCE_APP_VERSION=3.0.0;JUCE_APP_VERSION_HEX=0x30000;%(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 1,0,0,0 | |||||
FILEVERSION 3,0,0,0 | |||||
BEGIN | BEGIN | ||||
BLOCK "StringFileInfo" | BLOCK "StringFileInfo" | ||||
BEGIN | BEGIN | ||||
BLOCK "040904E4" | BLOCK "040904E4" | ||||
BEGIN | BEGIN | ||||
VALUE "FileDescription", "JuceDemo\0" | VALUE "FileDescription", "JuceDemo\0" | ||||
VALUE "FileVersion", "1.0.0\0" | |||||
VALUE "FileVersion", "3.0.0\0" | |||||
VALUE "ProductName", "JuceDemo\0" | VALUE "ProductName", "JuceDemo\0" | ||||
VALUE "ProductVersion", "1.0.0\0" | |||||
VALUE "ProductVersion", "3.0.0\0" | |||||
END | END | ||||
END | END | ||||
@@ -58,7 +58,7 @@ | |||||
<Optimization>Disabled</Optimization> | <Optimization>Disabled</Optimization> | ||||
<DebugInformationFormat>EditAndContinue</DebugInformationFormat> | <DebugInformationFormat>EditAndContinue</DebugInformationFormat> | ||||
<AdditionalIncludeDirectories>..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | <AdditionalIncludeDirectories>..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||||
<PreprocessorDefinitions>WIN32;_WINDOWS;DEBUG;_DEBUG;JUCE_UNIT_TESTS=1;JUCER_VS2012_78A501F=1;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |||||
<PreprocessorDefinitions>WIN32;_WINDOWS;DEBUG;_DEBUG;JUCE_UNIT_TESTS=1;JUCER_VS2012_78A501F=1;JUCE_APP_VERSION=3.0.0;JUCE_APP_VERSION_HEX=0x30000;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |||||
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> | <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> | ||||
<RuntimeTypeInfo>true</RuntimeTypeInfo> | <RuntimeTypeInfo>true</RuntimeTypeInfo> | ||||
<PrecompiledHeader/> | <PrecompiledHeader/> | ||||
@@ -99,7 +99,7 @@ | |||||
<ClCompile> | <ClCompile> | ||||
<Optimization>Full</Optimization> | <Optimization>Full</Optimization> | ||||
<AdditionalIncludeDirectories>..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | <AdditionalIncludeDirectories>..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||||
<PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;JUCE_UNIT_TESTS=1;JUCER_VS2012_78A501F=1;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |||||
<PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;JUCE_UNIT_TESTS=1;JUCER_VS2012_78A501F=1;JUCE_APP_VERSION=3.0.0;JUCE_APP_VERSION_HEX=0x30000;%(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 1,0,0,0 | |||||
FILEVERSION 3,0,0,0 | |||||
BEGIN | BEGIN | ||||
BLOCK "StringFileInfo" | BLOCK "StringFileInfo" | ||||
BEGIN | BEGIN | ||||
BLOCK "040904E4" | BLOCK "040904E4" | ||||
BEGIN | BEGIN | ||||
VALUE "FileDescription", "JuceDemo\0" | VALUE "FileDescription", "JuceDemo\0" | ||||
VALUE "FileVersion", "1.0.0\0" | |||||
VALUE "FileVersion", "3.0.0\0" | |||||
VALUE "ProductName", "JuceDemo\0" | VALUE "ProductName", "JuceDemo\0" | ||||
VALUE "ProductVersion", "1.0.0\0" | |||||
VALUE "ProductVersion", "3.0.0\0" | |||||
END | END | ||||
END | END | ||||
@@ -58,7 +58,7 @@ | |||||
<Optimization>Disabled</Optimization> | <Optimization>Disabled</Optimization> | ||||
<DebugInformationFormat>EditAndContinue</DebugInformationFormat> | <DebugInformationFormat>EditAndContinue</DebugInformationFormat> | ||||
<AdditionalIncludeDirectories>..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | <AdditionalIncludeDirectories>..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||||
<PreprocessorDefinitions>WIN32;_WINDOWS;DEBUG;_DEBUG;JUCE_UNIT_TESTS=1;JUCER_VS2013_78A5020=1;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |||||
<PreprocessorDefinitions>WIN32;_WINDOWS;DEBUG;_DEBUG;JUCE_UNIT_TESTS=1;JUCER_VS2013_78A5020=1;JUCE_APP_VERSION=3.0.0;JUCE_APP_VERSION_HEX=0x30000;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |||||
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> | <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> | ||||
<RuntimeTypeInfo>true</RuntimeTypeInfo> | <RuntimeTypeInfo>true</RuntimeTypeInfo> | ||||
<PrecompiledHeader/> | <PrecompiledHeader/> | ||||
@@ -99,7 +99,7 @@ | |||||
<ClCompile> | <ClCompile> | ||||
<Optimization>Full</Optimization> | <Optimization>Full</Optimization> | ||||
<AdditionalIncludeDirectories>..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | <AdditionalIncludeDirectories>..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||||
<PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;JUCE_UNIT_TESTS=1;JUCER_VS2013_78A5020=1;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |||||
<PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;JUCE_UNIT_TESTS=1;JUCER_VS2013_78A5020=1;JUCE_APP_VERSION=3.0.0;JUCE_APP_VERSION_HEX=0x30000;%(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 1,0,0,0 | |||||
FILEVERSION 3,0,0,0 | |||||
BEGIN | BEGIN | ||||
BLOCK "StringFileInfo" | BLOCK "StringFileInfo" | ||||
BEGIN | BEGIN | ||||
BLOCK "040904E4" | BLOCK "040904E4" | ||||
BEGIN | BEGIN | ||||
VALUE "FileDescription", "JuceDemo\0" | VALUE "FileDescription", "JuceDemo\0" | ||||
VALUE "FileVersion", "1.0.0\0" | |||||
VALUE "FileVersion", "3.0.0\0" | |||||
VALUE "ProductName", "JuceDemo\0" | VALUE "ProductName", "JuceDemo\0" | ||||
VALUE "ProductVersion", "1.0.0\0" | |||||
VALUE "ProductVersion", "3.0.0\0" | |||||
END | END | ||||
END | END | ||||
@@ -18,9 +18,9 @@ | |||||
<key>CFBundleSignature</key> | <key>CFBundleSignature</key> | ||||
<string>????</string> | <string>????</string> | ||||
<key>CFBundleShortVersionString</key> | <key>CFBundleShortVersionString</key> | ||||
<string>1.0.0</string> | |||||
<string>3.0.0</string> | |||||
<key>CFBundleVersion</key> | <key>CFBundleVersion</key> | ||||
<string>1.0.0</string> | |||||
<string>3.0.0</string> | |||||
<key>NSHumanReadableCopyright</key> | <key>NSHumanReadableCopyright</key> | ||||
<string></string> | <string></string> | ||||
<key>NSHighResolutionCapable</key> | <key>NSHighResolutionCapable</key> | ||||
@@ -2163,7 +2163,9 @@ | |||||
"_DEBUG=1", | "_DEBUG=1", | ||||
"DEBUG=1", | "DEBUG=1", | ||||
"JUCE_UNIT_TESTS=1", | "JUCE_UNIT_TESTS=1", | ||||
"JUCER_XCODE_IPHONE_5BC26AE3=1"); }; name = Debug; }; | |||||
"JUCER_XCODE_IPHONE_5BC26AE3=1", | |||||
"JUCE_APP_VERSION=3.0.0", | |||||
"JUCE_APP_VERSION_HEX=0x30000"); }; name = Debug; }; | |||||
80E4DBEBE0CE7D218C89F78C = { isa = XCBuildConfiguration; buildSettings = { | 80E4DBEBE0CE7D218C89F78C = { isa = XCBuildConfiguration; buildSettings = { | ||||
HEADER_SEARCH_PATHS = ("../../JuceLibraryCode", "../../../../modules", "$(inherited)"); | HEADER_SEARCH_PATHS = ("../../JuceLibraryCode", "../../../../modules", "$(inherited)"); | ||||
GCC_OPTIMIZATION_LEVEL = 3; | GCC_OPTIMIZATION_LEVEL = 3; | ||||
@@ -2181,7 +2183,9 @@ | |||||
"_NDEBUG=1", | "_NDEBUG=1", | ||||
"NDEBUG=1", | "NDEBUG=1", | ||||
"JUCE_UNIT_TESTS=1", | "JUCE_UNIT_TESTS=1", | ||||
"JUCER_XCODE_IPHONE_5BC26AE3=1"); }; name = Release; }; | |||||
"JUCER_XCODE_IPHONE_5BC26AE3=1", | |||||
"JUCE_APP_VERSION=3.0.0", | |||||
"JUCE_APP_VERSION_HEX=0x30000"); }; name = Release; }; | |||||
A16C0416417EF9DF7B09973F = { isa = XCBuildConfiguration; buildSettings = { | A16C0416417EF9DF7B09973F = { isa = XCBuildConfiguration; buildSettings = { | ||||
ALWAYS_SEARCH_USER_PATHS = NO; | ALWAYS_SEARCH_USER_PATHS = NO; | ||||
GCC_C_LANGUAGE_STANDARD = c99; | GCC_C_LANGUAGE_STANDARD = c99; | ||||
@@ -1,6 +1,6 @@ | |||||
<?xml version="1.0" encoding="UTF-8"?> | <?xml version="1.0" encoding="UTF-8"?> | ||||
<JUCERPROJECT id="sBBIzr" name="JuceDemo" projectType="guiapp" version="1.0.0" | |||||
<JUCERPROJECT id="sBBIzr" name="JuceDemo" projectType="guiapp" version="3.0.0" | |||||
juceLinkage="amalg_multi" buildVST="1" buildRTAS="0" buildAU="1" | juceLinkage="amalg_multi" buildVST="1" buildRTAS="0" buildAU="1" | ||||
pluginName="Juce Project" pluginDesc="Juce Project" pluginManufacturer="yourcompany" | pluginName="Juce Project" pluginDesc="Juce Project" pluginManufacturer="yourcompany" | ||||
pluginManufacturerCode="Manu" pluginCode="Plug" pluginChannelConfigs="{1, 1}, {2, 2}" | pluginManufacturerCode="Manu" pluginCode="Plug" pluginChannelConfigs="{1, 1}, {2, 2}" | ||||
@@ -40,8 +40,8 @@ | |||||
namespace ProjectInfo | namespace ProjectInfo | ||||
{ | { | ||||
const char* const projectName = "JuceDemo"; | const char* const projectName = "JuceDemo"; | ||||
const char* const versionString = "1.0.0"; | |||||
const int versionNumber = 0x10000; | |||||
const char* const versionString = "3.0.0"; | |||||
const int versionNumber = 0x30000; | |||||
} | } | ||||
#endif // __APPHEADERFILE_SBBIZR__ | #endif // __APPHEADERFILE_SBBIZR__ |
@@ -22,6 +22,8 @@ | |||||
<Add option="-D__MINGW__=1"/> | <Add option="-D__MINGW__=1"/> | ||||
<Add option="-D__MINGW_EXTENSION="/> | <Add option="-D__MINGW_EXTENSION="/> | ||||
<Add option="-DJUCER_CODEBLOCKS_20734A5D=1"/> | <Add option="-DJUCER_CODEBLOCKS_20734A5D=1"/> | ||||
<Add option="-DJUCE_APP_VERSION=3.1.0"/> | |||||
<Add option="-DJUCE_APP_VERSION_HEX=0x30100"/> | |||||
<Add directory="."/> | <Add directory="."/> | ||||
<Add directory="..\..\JuceLibraryCode"/> | <Add directory="..\..\JuceLibraryCode"/> | ||||
</Compiler> | </Compiler> | ||||
@@ -54,6 +56,8 @@ | |||||
<Add option="-D__MINGW__=1"/> | <Add option="-D__MINGW__=1"/> | ||||
<Add option="-D__MINGW_EXTENSION="/> | <Add option="-D__MINGW_EXTENSION="/> | ||||
<Add option="-DJUCER_CODEBLOCKS_20734A5D=1"/> | <Add option="-DJUCER_CODEBLOCKS_20734A5D=1"/> | ||||
<Add option="-DJUCE_APP_VERSION=3.1.0"/> | |||||
<Add option="-DJUCE_APP_VERSION_HEX=0x30100"/> | |||||
<Add directory="."/> | <Add directory="."/> | ||||
<Add directory="..\..\JuceLibraryCode"/> | <Add directory="..\..\JuceLibraryCode"/> | ||||
</Compiler> | </Compiler> | ||||
@@ -18,12 +18,12 @@ 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_7346DA2A=1" -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_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 | |||||
CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O0 -std=gnu++0x | CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O0 -std=gnu++0x | ||||
CXXFLAGS += $(CFLAGS) | CXXFLAGS += $(CFLAGS) | ||||
LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR) -L/usr/X11R6/lib/ -lX11 -lXext -lXinerama -ldl -lfreetype -lpthread -lrt | LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR) -L/usr/X11R6/lib/ -lX11 -lXext -lXinerama -ldl -lfreetype -lpthread -lrt | ||||
LDDEPS := | LDDEPS := | ||||
RESFLAGS := -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -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.0" -D "JUCE_APP_VERSION_HEX=0x30100" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../../../modules | |||||
TARGET := Introjucer | TARGET := Introjucer | ||||
BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH) | BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH) | ||||
endif | endif | ||||
@@ -38,12 +38,12 @@ 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_7346DA2A=1" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../../../modules | |||||
CPPFLAGS := $(DEPFLAGS) -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 | |||||
CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -O3 -std=gnu++0x | CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -O3 -std=gnu++0x | ||||
CXXFLAGS += $(CFLAGS) | CXXFLAGS += $(CFLAGS) | ||||
LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR) -fvisibility=hidden -L/usr/X11R6/lib/ -lX11 -lXext -lXinerama -ldl -lfreetype -lpthread -lrt | LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR) -fvisibility=hidden -L/usr/X11R6/lib/ -lX11 -lXext -lXinerama -ldl -lfreetype -lpthread -lrt | ||||
LDDEPS := | LDDEPS := | ||||
RESFLAGS := -D "LINUX=1" -D "NDEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -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.0" -D "JUCE_APP_VERSION_HEX=0x30100" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../../../modules | |||||
TARGET := Introjucer | TARGET := Introjucer | ||||
BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH) | BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH) | ||||
endif | endif | ||||
@@ -1906,7 +1906,9 @@ | |||||
GCC_PREPROCESSOR_DEFINITIONS = ( | GCC_PREPROCESSOR_DEFINITIONS = ( | ||||
"_DEBUG=1", | "_DEBUG=1", | ||||
"DEBUG=1", | "DEBUG=1", | ||||
"JUCER_XCODE_MAC_F6D2F4CF=1"); }; name = Debug; }; | |||||
"JUCER_XCODE_MAC_F6D2F4CF=1", | |||||
"JUCE_APP_VERSION=3.1.0", | |||||
"JUCE_APP_VERSION_HEX=0x30100"); }; name = Debug; }; | |||||
B159CF4275B8A90122629FF4 = { isa = XCBuildConfiguration; buildSettings = { | B159CF4275B8A90122629FF4 = { isa = XCBuildConfiguration; buildSettings = { | ||||
ARCHS = "$(NATIVE_ARCH_ACTUAL)"; | ARCHS = "$(NATIVE_ARCH_ACTUAL)"; | ||||
HEADER_SEARCH_PATHS = ("../../JuceLibraryCode", "../../../../modules", "$(inherited)"); | HEADER_SEARCH_PATHS = ("../../JuceLibraryCode", "../../../../modules", "$(inherited)"); | ||||
@@ -1928,7 +1930,9 @@ | |||||
GCC_PREPROCESSOR_DEFINITIONS = ( | GCC_PREPROCESSOR_DEFINITIONS = ( | ||||
"_NDEBUG=1", | "_NDEBUG=1", | ||||
"NDEBUG=1", | "NDEBUG=1", | ||||
"JUCER_XCODE_MAC_F6D2F4CF=1"); }; name = Release; }; | |||||
"JUCER_XCODE_MAC_F6D2F4CF=1", | |||||
"JUCE_APP_VERSION=3.1.0", | |||||
"JUCE_APP_VERSION_HEX=0x30100"); }; name = Release; }; | |||||
C42924A24AB55E6A940423EA = { isa = XCBuildConfiguration; buildSettings = { | C42924A24AB55E6A940423EA = { isa = XCBuildConfiguration; buildSettings = { | ||||
ALWAYS_SEARCH_USER_PATHS = NO; | ALWAYS_SEARCH_USER_PATHS = NO; | ||||
GCC_C_LANGUAGE_STANDARD = c99; | GCC_C_LANGUAGE_STANDARD = c99; | ||||
@@ -32,7 +32,7 @@ | |||||
BufferSecurityCheck="" | BufferSecurityCheck="" | ||||
DebugInformationFormat="4" | DebugInformationFormat="4" | ||||
AdditionalIncludeDirectories="..\..\JuceLibraryCode;..\..\..\..\modules" | AdditionalIncludeDirectories="..\..\JuceLibraryCode;..\..\..\..\modules" | ||||
PreprocessorDefinitions="WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2005_78A5003=1" | |||||
PreprocessorDefinitions="WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2005_78A5003=1;JUCE_APP_VERSION=3.1.0;JUCE_APP_VERSION_HEX=0x30100" | |||||
RuntimeLibrary="1" | RuntimeLibrary="1" | ||||
RuntimeTypeInfo="true" | RuntimeTypeInfo="true" | ||||
UsePrecompiledHeader="0" | UsePrecompiledHeader="0" | ||||
@@ -88,7 +88,7 @@ | |||||
InlineFunctionExpansion="1" | InlineFunctionExpansion="1" | ||||
StringPooling="true" | StringPooling="true" | ||||
AdditionalIncludeDirectories="..\..\JuceLibraryCode;..\..\..\..\modules" | AdditionalIncludeDirectories="..\..\JuceLibraryCode;..\..\..\..\modules" | ||||
PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;JUCER_VS2005_78A5003=1" | |||||
PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;JUCER_VS2005_78A5003=1;JUCE_APP_VERSION=3.1.0;JUCE_APP_VERSION_HEX=0x30100" | |||||
RuntimeLibrary="0" | RuntimeLibrary="0" | ||||
RuntimeTypeInfo="true" | RuntimeTypeInfo="true" | ||||
UsePrecompiledHeader="0" | UsePrecompiledHeader="0" | ||||
@@ -32,7 +32,7 @@ | |||||
BufferSecurityCheck="" | BufferSecurityCheck="" | ||||
DebugInformationFormat="4" | DebugInformationFormat="4" | ||||
AdditionalIncludeDirectories="..\..\JuceLibraryCode;..\..\..\..\modules" | AdditionalIncludeDirectories="..\..\JuceLibraryCode;..\..\..\..\modules" | ||||
PreprocessorDefinitions="WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2008_78A5006=1" | |||||
PreprocessorDefinitions="WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2008_78A5006=1;JUCE_APP_VERSION=3.1.0;JUCE_APP_VERSION_HEX=0x30100" | |||||
RuntimeLibrary="1" | RuntimeLibrary="1" | ||||
RuntimeTypeInfo="true" | RuntimeTypeInfo="true" | ||||
UsePrecompiledHeader="0" | UsePrecompiledHeader="0" | ||||
@@ -88,7 +88,7 @@ | |||||
InlineFunctionExpansion="1" | InlineFunctionExpansion="1" | ||||
StringPooling="true" | StringPooling="true" | ||||
AdditionalIncludeDirectories="..\..\JuceLibraryCode;..\..\..\..\modules" | AdditionalIncludeDirectories="..\..\JuceLibraryCode;..\..\..\..\modules" | ||||
PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;JUCER_VS2008_78A5006=1" | |||||
PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;JUCER_VS2008_78A5006=1;JUCE_APP_VERSION=3.1.0;JUCE_APP_VERSION_HEX=0x30100" | |||||
RuntimeLibrary="0" | RuntimeLibrary="0" | ||||
RuntimeTypeInfo="true" | RuntimeTypeInfo="true" | ||||
UsePrecompiledHeader="0" | UsePrecompiledHeader="0" | ||||
@@ -52,7 +52,7 @@ | |||||
<Optimization>Disabled</Optimization> | <Optimization>Disabled</Optimization> | ||||
<DebugInformationFormat>EditAndContinue</DebugInformationFormat> | <DebugInformationFormat>EditAndContinue</DebugInformationFormat> | ||||
<AdditionalIncludeDirectories>..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | <AdditionalIncludeDirectories>..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||||
<PreprocessorDefinitions>WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2010_78A501D=1;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |||||
<PreprocessorDefinitions>WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2010_78A501D=1;JUCE_APP_VERSION=3.1.0;JUCE_APP_VERSION_HEX=0x30100;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |||||
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> | <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> | ||||
<RuntimeTypeInfo>true</RuntimeTypeInfo> | <RuntimeTypeInfo>true</RuntimeTypeInfo> | ||||
<PrecompiledHeader/> | <PrecompiledHeader/> | ||||
@@ -93,7 +93,7 @@ | |||||
<ClCompile> | <ClCompile> | ||||
<Optimization>Full</Optimization> | <Optimization>Full</Optimization> | ||||
<AdditionalIncludeDirectories>..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | <AdditionalIncludeDirectories>..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||||
<PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;JUCER_VS2010_78A501D=1;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |||||
<PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;JUCER_VS2010_78A501D=1;JUCE_APP_VERSION=3.1.0;JUCE_APP_VERSION_HEX=0x30100;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |||||
<RuntimeLibrary>MultiThreaded</RuntimeLibrary> | <RuntimeLibrary>MultiThreaded</RuntimeLibrary> | ||||
<RuntimeTypeInfo>true</RuntimeTypeInfo> | <RuntimeTypeInfo>true</RuntimeTypeInfo> | ||||
<PrecompiledHeader/> | <PrecompiledHeader/> | ||||
@@ -58,7 +58,7 @@ | |||||
<Optimization>Disabled</Optimization> | <Optimization>Disabled</Optimization> | ||||
<DebugInformationFormat>EditAndContinue</DebugInformationFormat> | <DebugInformationFormat>EditAndContinue</DebugInformationFormat> | ||||
<AdditionalIncludeDirectories>..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | <AdditionalIncludeDirectories>..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||||
<PreprocessorDefinitions>WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2012_78A501F=1;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |||||
<PreprocessorDefinitions>WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2012_78A501F=1;JUCE_APP_VERSION=3.1.0;JUCE_APP_VERSION_HEX=0x30100;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |||||
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> | <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> | ||||
<RuntimeTypeInfo>true</RuntimeTypeInfo> | <RuntimeTypeInfo>true</RuntimeTypeInfo> | ||||
<PrecompiledHeader/> | <PrecompiledHeader/> | ||||
@@ -99,7 +99,7 @@ | |||||
<ClCompile> | <ClCompile> | ||||
<Optimization>MinSpace</Optimization> | <Optimization>MinSpace</Optimization> | ||||
<AdditionalIncludeDirectories>..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | <AdditionalIncludeDirectories>..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||||
<PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;JUCER_VS2012_78A501F=1;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |||||
<PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;JUCER_VS2012_78A501F=1;JUCE_APP_VERSION=3.1.0;JUCE_APP_VERSION_HEX=0x30100;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |||||
<RuntimeLibrary>MultiThreaded</RuntimeLibrary> | <RuntimeLibrary>MultiThreaded</RuntimeLibrary> | ||||
<RuntimeTypeInfo>true</RuntimeTypeInfo> | <RuntimeTypeInfo>true</RuntimeTypeInfo> | ||||
<PrecompiledHeader/> | <PrecompiledHeader/> | ||||
@@ -58,7 +58,7 @@ | |||||
<Optimization>Disabled</Optimization> | <Optimization>Disabled</Optimization> | ||||
<DebugInformationFormat>EditAndContinue</DebugInformationFormat> | <DebugInformationFormat>EditAndContinue</DebugInformationFormat> | ||||
<AdditionalIncludeDirectories>..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | <AdditionalIncludeDirectories>..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||||
<PreprocessorDefinitions>WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2013_78A5020=1;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |||||
<PreprocessorDefinitions>WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2013_78A5020=1;JUCE_APP_VERSION=3.1.0;JUCE_APP_VERSION_HEX=0x30100;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |||||
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> | <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> | ||||
<RuntimeTypeInfo>true</RuntimeTypeInfo> | <RuntimeTypeInfo>true</RuntimeTypeInfo> | ||||
<PrecompiledHeader/> | <PrecompiledHeader/> | ||||
@@ -99,7 +99,7 @@ | |||||
<ClCompile> | <ClCompile> | ||||
<Optimization>MinSpace</Optimization> | <Optimization>MinSpace</Optimization> | ||||
<AdditionalIncludeDirectories>..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | <AdditionalIncludeDirectories>..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||||
<PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;JUCER_VS2013_78A5020=1;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |||||
<PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;JUCER_VS2013_78A5020=1;JUCE_APP_VERSION=3.1.0;JUCE_APP_VERSION_HEX=0x30100;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |||||
<RuntimeLibrary>MultiThreaded</RuntimeLibrary> | <RuntimeLibrary>MultiThreaded</RuntimeLibrary> | ||||
<RuntimeTypeInfo>true</RuntimeTypeInfo> | <RuntimeTypeInfo>true</RuntimeTypeInfo> | ||||
<PrecompiledHeader/> | <PrecompiledHeader/> | ||||
@@ -238,7 +238,7 @@ StringPairArray ProjectExporter::getAllPreprocessorDefs (const ProjectExporter:: | |||||
{ | { | ||||
StringPairArray defs (mergePreprocessorDefs (config.getAllPreprocessorDefs(), | StringPairArray defs (mergePreprocessorDefs (config.getAllPreprocessorDefs(), | ||||
parsePreprocessorDefs (getExporterPreprocessorDefsString()))); | parsePreprocessorDefs (getExporterPreprocessorDefsString()))); | ||||
defs.set (getExporterIdentifierMacro(), "1"); | |||||
addDefaultPreprocessorDefs (defs); | |||||
return defs; | return defs; | ||||
} | } | ||||
@@ -246,10 +246,17 @@ StringPairArray ProjectExporter::getAllPreprocessorDefs() const | |||||
{ | { | ||||
StringPairArray defs (mergePreprocessorDefs (project.getPreprocessorDefs(), | StringPairArray defs (mergePreprocessorDefs (project.getPreprocessorDefs(), | ||||
parsePreprocessorDefs (getExporterPreprocessorDefsString()))); | parsePreprocessorDefs (getExporterPreprocessorDefsString()))); | ||||
defs.set (getExporterIdentifierMacro(), "1"); | |||||
addDefaultPreprocessorDefs (defs); | |||||
return defs; | return defs; | ||||
} | } | ||||
void ProjectExporter::addDefaultPreprocessorDefs (StringPairArray& defs) const | |||||
{ | |||||
defs.set (getExporterIdentifierMacro(), "1"); | |||||
defs.set ("JUCE_APP_VERSION", project.getVersionString()); | |||||
defs.set ("JUCE_APP_VERSION_HEX", project.getVersionAsHex()); | |||||
} | |||||
String ProjectExporter::replacePreprocessorTokens (const ProjectExporter::BuildConfiguration& config, const String& sourceString) const | String ProjectExporter::replacePreprocessorTokens (const ProjectExporter::BuildConfiguration& config, const String& sourceString) const | ||||
{ | { | ||||
return replacePreprocessorDefs (getAllPreprocessorDefs (config), sourceString); | return replacePreprocessorDefs (getAllPreprocessorDefs (config), sourceString); | ||||
@@ -320,14 +320,14 @@ protected: | |||||
virtual BuildConfiguration::Ptr createBuildConfig (const ValueTree&) const = 0; | virtual BuildConfiguration::Ptr createBuildConfig (const ValueTree&) const = 0; | ||||
void addDefaultPreprocessorDefs (StringPairArray&) const; | |||||
static String getDefaultBuildsRootFolder() { return "Builds/"; } | static String getDefaultBuildsRootFolder() { return "Builds/"; } | ||||
static String getLibbedFilename (String name) | static String getLibbedFilename (String name) | ||||
{ | { | ||||
if (! name.startsWith ("lib")) | |||||
name = "lib" + name; | |||||
if (! name.endsWithIgnoreCase (".a")) | |||||
name = name + ".a"; | |||||
if (! name.startsWith ("lib")) name = "lib" + name; | |||||
if (! name.endsWithIgnoreCase (".a")) name += ".a"; | |||||
return name; | return name; | ||||
} | } | ||||
@@ -432,25 +432,25 @@ void Project::createPropertyEditors (PropertyListBuilder& props) | |||||
} | } | ||||
//============================================================================== | //============================================================================== | ||||
static StringArray getConfigs (const Project& p) | |||||
static StringArray getVersionSegments (const Project& p) | |||||
{ | { | ||||
StringArray configs; | |||||
configs.addTokens (p.getVersionString(), ",.", String::empty); | |||||
configs.trim(); | |||||
configs.removeEmptyStrings(); | |||||
return configs; | |||||
StringArray segments; | |||||
segments.addTokens (p.getVersionString(), ",.", ""); | |||||
segments.trim(); | |||||
segments.removeEmptyStrings(); | |||||
return segments; | |||||
} | } | ||||
int Project::getVersionAsHexInteger() const | int Project::getVersionAsHexInteger() const | ||||
{ | { | ||||
const StringArray configs (getConfigs (*this)); | |||||
const StringArray segments (getVersionSegments (*this)); | |||||
int value = (configs[0].getIntValue() << 16) | |||||
+ (configs[1].getIntValue() << 8) | |||||
+ configs[2].getIntValue(); | |||||
int value = (segments[0].getIntValue() << 16) | |||||
+ (segments[1].getIntValue() << 8) | |||||
+ segments[2].getIntValue(); | |||||
if (configs.size() >= 4) | |||||
value = (value << 8) + configs[3].getIntValue(); | |||||
if (segments.size() >= 4) | |||||
value = (value << 8) + segments[3].getIntValue(); | |||||
return value; | return value; | ||||
} | } | ||||
@@ -18,12 +18,12 @@ 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_7346DA2A=1" -I /usr/include -I /usr/include/freetype2 -I ~/SDKs/vstsdk2.4 -I ../../JuceLibraryCode -I ../../../../modules | |||||
CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=1.0.0" -D "JUCE_APP_VERSION_HEX=0x10000" -I /usr/include -I /usr/include/freetype2 -I ~/SDKs/vstsdk2.4 -I ../../JuceLibraryCode -I ../../../../modules | |||||
CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -g -ggdb -fPIC -O0 | CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -g -ggdb -fPIC -O0 | ||||
CXXFLAGS += $(CFLAGS) | CXXFLAGS += $(CFLAGS) | ||||
LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR) -shared -L/usr/X11R6/lib/ -lX11 -lXext -lXinerama -lasound -ldl -lfreetype -lpthread -lrt | LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR) -shared -L/usr/X11R6/lib/ -lX11 -lXext -lXinerama -lasound -ldl -lfreetype -lpthread -lrt | ||||
LDDEPS := | LDDEPS := | ||||
RESFLAGS := -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -I /usr/include -I /usr/include/freetype2 -I ~/SDKs/vstsdk2.4 -I ../../JuceLibraryCode -I ../../../../modules | |||||
RESFLAGS := -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=1.0.0" -D "JUCE_APP_VERSION_HEX=0x10000" -I /usr/include -I /usr/include/freetype2 -I ~/SDKs/vstsdk2.4 -I ../../JuceLibraryCode -I ../../../../modules | |||||
TARGET := JuceDemoPlugin.so | TARGET := JuceDemoPlugin.so | ||||
BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH) | BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH) | ||||
endif | endif | ||||
@@ -38,12 +38,12 @@ 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_7346DA2A=1" -I /usr/include -I /usr/include/freetype2 -I ~/SDKs/vstsdk2.4 -I ../../JuceLibraryCode -I ../../../../modules | |||||
CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "NDEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=1.0.0" -D "JUCE_APP_VERSION_HEX=0x10000" -I /usr/include -I /usr/include/freetype2 -I ~/SDKs/vstsdk2.4 -I ../../JuceLibraryCode -I ../../../../modules | |||||
CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -fPIC -Os | CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -fPIC -Os | ||||
CXXFLAGS += $(CFLAGS) | CXXFLAGS += $(CFLAGS) | ||||
LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR) -shared -fvisibility=hidden -L/usr/X11R6/lib/ -lX11 -lXext -lXinerama -lasound -ldl -lfreetype -lpthread -lrt | LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR) -shared -fvisibility=hidden -L/usr/X11R6/lib/ -lX11 -lXext -lXinerama -lasound -ldl -lfreetype -lpthread -lrt | ||||
LDDEPS := | LDDEPS := | ||||
RESFLAGS := -D "LINUX=1" -D "NDEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -I /usr/include -I /usr/include/freetype2 -I ~/SDKs/vstsdk2.4 -I ../../JuceLibraryCode -I ../../../../modules | |||||
RESFLAGS := -D "LINUX=1" -D "NDEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=1.0.0" -D "JUCE_APP_VERSION_HEX=0x10000" -I /usr/include -I /usr/include/freetype2 -I ~/SDKs/vstsdk2.4 -I ../../JuceLibraryCode -I ../../../../modules | |||||
TARGET := JuceDemoPlugin.so | TARGET := JuceDemoPlugin.so | ||||
BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH) | BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH) | ||||
endif | endif | ||||
@@ -2085,7 +2085,9 @@ | |||||
GCC_PREPROCESSOR_DEFINITIONS = ( | GCC_PREPROCESSOR_DEFINITIONS = ( | ||||
"_DEBUG=1", | "_DEBUG=1", | ||||
"DEBUG=1", | "DEBUG=1", | ||||
"JUCER_XCODE_MAC_F6D2F4CF=1"); }; name = Debug; }; | |||||
"JUCER_XCODE_MAC_F6D2F4CF=1", | |||||
"JUCE_APP_VERSION=1.0.0", | |||||
"JUCE_APP_VERSION_HEX=0x10000"); }; name = Debug; }; | |||||
76082281008CF5F891C856DA = { isa = XCBuildConfiguration; buildSettings = { | 76082281008CF5F891C856DA = { isa = XCBuildConfiguration; buildSettings = { | ||||
HEADER_SEARCH_PATHS = ("~/SDKs/vstsdk2.4", "../../JuceLibraryCode", "../../../../modules", "$(DEVELOPER_DIR)/Extras/CoreAudio/PublicUtility", "$(DEVELOPER_DIR)/Extras/CoreAudio/AudioUnits/AUPublic/Utility", "$(DEVELOPER_DIR)/Extras/CoreAudio/AudioUnits/AUPublic/AUBase", "$(inherited)"); | HEADER_SEARCH_PATHS = ("~/SDKs/vstsdk2.4", "../../JuceLibraryCode", "../../../../modules", "$(DEVELOPER_DIR)/Extras/CoreAudio/PublicUtility", "$(DEVELOPER_DIR)/Extras/CoreAudio/AudioUnits/AUPublic/Utility", "$(DEVELOPER_DIR)/Extras/CoreAudio/AudioUnits/AUPublic/AUBase", "$(inherited)"); | ||||
GCC_OPTIMIZATION_LEVEL = s; | GCC_OPTIMIZATION_LEVEL = s; | ||||
@@ -2111,7 +2113,9 @@ | |||||
GCC_PREPROCESSOR_DEFINITIONS = ( | GCC_PREPROCESSOR_DEFINITIONS = ( | ||||
"_NDEBUG=1", | "_NDEBUG=1", | ||||
"NDEBUG=1", | "NDEBUG=1", | ||||
"JUCER_XCODE_MAC_F6D2F4CF=1"); }; name = Release; }; | |||||
"JUCER_XCODE_MAC_F6D2F4CF=1", | |||||
"JUCE_APP_VERSION=1.0.0", | |||||
"JUCE_APP_VERSION_HEX=0x10000"); }; name = Release; }; | |||||
6758D5C5D24024DB6F83E78F = { isa = XCBuildConfiguration; buildSettings = { | 6758D5C5D24024DB6F83E78F = { isa = XCBuildConfiguration; buildSettings = { | ||||
ALWAYS_SEARCH_USER_PATHS = NO; | ALWAYS_SEARCH_USER_PATHS = NO; | ||||
GCC_C_LANGUAGE_STANDARD = c99; | GCC_C_LANGUAGE_STANDARD = c99; | ||||
@@ -32,7 +32,7 @@ | |||||
BufferSecurityCheck="" | BufferSecurityCheck="" | ||||
DebugInformationFormat="4" | DebugInformationFormat="4" | ||||
AdditionalIncludeDirectories="..\..\JuceLibraryCode;..\..\..\..\modules;c:\SDKs\vstsdk2.4" | AdditionalIncludeDirectories="..\..\JuceLibraryCode;..\..\..\..\modules;c:\SDKs\vstsdk2.4" | ||||
PreprocessorDefinitions="WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2005_78A5003=1" | |||||
PreprocessorDefinitions="WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2005_78A5003=1;JUCE_APP_VERSION=1.0.0;JUCE_APP_VERSION_HEX=0x10000" | |||||
RuntimeLibrary="1" | RuntimeLibrary="1" | ||||
RuntimeTypeInfo="true" | RuntimeTypeInfo="true" | ||||
UsePrecompiledHeader="0" | UsePrecompiledHeader="0" | ||||
@@ -88,7 +88,7 @@ | |||||
InlineFunctionExpansion="1" | InlineFunctionExpansion="1" | ||||
StringPooling="true" | StringPooling="true" | ||||
AdditionalIncludeDirectories="..\..\JuceLibraryCode;..\..\..\..\modules;c:\SDKs\vstsdk2.4" | AdditionalIncludeDirectories="..\..\JuceLibraryCode;..\..\..\..\modules;c:\SDKs\vstsdk2.4" | ||||
PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;JUCER_VS2005_78A5003=1" | |||||
PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;JUCER_VS2005_78A5003=1;JUCE_APP_VERSION=1.0.0;JUCE_APP_VERSION_HEX=0x10000" | |||||
RuntimeLibrary="0" | RuntimeLibrary="0" | ||||
RuntimeTypeInfo="true" | RuntimeTypeInfo="true" | ||||
UsePrecompiledHeader="0" | UsePrecompiledHeader="0" | ||||
@@ -32,7 +32,7 @@ | |||||
BufferSecurityCheck="" | BufferSecurityCheck="" | ||||
DebugInformationFormat="4" | DebugInformationFormat="4" | ||||
AdditionalIncludeDirectories="..\..\JuceLibraryCode;..\..\..\..\modules;c:\SDKs\vstsdk2.4" | AdditionalIncludeDirectories="..\..\JuceLibraryCode;..\..\..\..\modules;c:\SDKs\vstsdk2.4" | ||||
PreprocessorDefinitions="WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2008_78A5006=1" | |||||
PreprocessorDefinitions="WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2008_78A5006=1;JUCE_APP_VERSION=1.0.0;JUCE_APP_VERSION_HEX=0x10000" | |||||
RuntimeLibrary="1" | RuntimeLibrary="1" | ||||
RuntimeTypeInfo="true" | RuntimeTypeInfo="true" | ||||
UsePrecompiledHeader="0" | UsePrecompiledHeader="0" | ||||
@@ -88,7 +88,7 @@ | |||||
InlineFunctionExpansion="1" | InlineFunctionExpansion="1" | ||||
StringPooling="true" | StringPooling="true" | ||||
AdditionalIncludeDirectories="..\..\JuceLibraryCode;..\..\..\..\modules;c:\SDKs\vstsdk2.4" | AdditionalIncludeDirectories="..\..\JuceLibraryCode;..\..\..\..\modules;c:\SDKs\vstsdk2.4" | ||||
PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;JUCER_VS2008_78A5006=1" | |||||
PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;JUCER_VS2008_78A5006=1;JUCE_APP_VERSION=1.0.0;JUCE_APP_VERSION_HEX=0x10000" | |||||
RuntimeLibrary="0" | RuntimeLibrary="0" | ||||
RuntimeTypeInfo="true" | RuntimeTypeInfo="true" | ||||
UsePrecompiledHeader="0" | UsePrecompiledHeader="0" | ||||
@@ -18,12 +18,12 @@ 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_7346DA2A=1" -I /usr/include -I /usr/include/freetype2 -I ~/SDKs/vstsdk2.4 -I ../../JuceLibraryCode -I ../../../../modules | |||||
CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=1.0.0" -D "JUCE_APP_VERSION_HEX=0x10000" -I /usr/include -I /usr/include/freetype2 -I ~/SDKs/vstsdk2.4 -I ../../JuceLibraryCode -I ../../../../modules | |||||
CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O0 | CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O0 | ||||
CXXFLAGS += $(CFLAGS) | CXXFLAGS += $(CFLAGS) | ||||
LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR) -L/usr/X11R6/lib/ -lGL -lX11 -lXext -lXinerama -lasound -ldl -lfreetype -lpthread -lrt | LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR) -L/usr/X11R6/lib/ -lGL -lX11 -lXext -lXinerama -lasound -ldl -lfreetype -lpthread -lrt | ||||
LDDEPS := | LDDEPS := | ||||
RESFLAGS := -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -I /usr/include -I /usr/include/freetype2 -I ~/SDKs/vstsdk2.4 -I ../../JuceLibraryCode -I ../../../../modules | |||||
RESFLAGS := -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=1.0.0" -D "JUCE_APP_VERSION_HEX=0x10000" -I /usr/include -I /usr/include/freetype2 -I ~/SDKs/vstsdk2.4 -I ../../JuceLibraryCode -I ../../../../modules | |||||
TARGET := Plugin\ Host | TARGET := Plugin\ Host | ||||
BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH) | BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH) | ||||
endif | endif | ||||
@@ -38,12 +38,12 @@ 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_7346DA2A=1" -I /usr/include -I /usr/include/freetype2 -I ~/SDKs/vstsdk2.4 -I ../../JuceLibraryCode -I ../../../../modules | |||||
CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "NDEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=1.0.0" -D "JUCE_APP_VERSION_HEX=0x10000" -I /usr/include -I /usr/include/freetype2 -I ~/SDKs/vstsdk2.4 -I ../../JuceLibraryCode -I ../../../../modules | |||||
CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -Os | CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -Os | ||||
CXXFLAGS += $(CFLAGS) | CXXFLAGS += $(CFLAGS) | ||||
LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR) -fvisibility=hidden -L/usr/X11R6/lib/ -lGL -lX11 -lXext -lXinerama -lasound -ldl -lfreetype -lpthread -lrt | LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR) -fvisibility=hidden -L/usr/X11R6/lib/ -lGL -lX11 -lXext -lXinerama -lasound -ldl -lfreetype -lpthread -lrt | ||||
LDDEPS := | LDDEPS := | ||||
RESFLAGS := -D "LINUX=1" -D "NDEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -I /usr/include -I /usr/include/freetype2 -I ~/SDKs/vstsdk2.4 -I ../../JuceLibraryCode -I ../../../../modules | |||||
RESFLAGS := -D "LINUX=1" -D "NDEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=1.0.0" -D "JUCE_APP_VERSION_HEX=0x10000" -I /usr/include -I /usr/include/freetype2 -I ~/SDKs/vstsdk2.4 -I ../../JuceLibraryCode -I ../../../../modules | |||||
TARGET := Plugin\ Host | TARGET := Plugin\ Host | ||||
BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH) | BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH) | ||||
endif | endif | ||||
@@ -2034,7 +2034,9 @@ | |||||
GCC_PREPROCESSOR_DEFINITIONS = ( | GCC_PREPROCESSOR_DEFINITIONS = ( | ||||
"_DEBUG=1", | "_DEBUG=1", | ||||
"DEBUG=1", | "DEBUG=1", | ||||
"JUCER_XCODE_MAC_F6D2F4CF=1"); }; name = Debug; }; | |||||
"JUCER_XCODE_MAC_F6D2F4CF=1", | |||||
"JUCE_APP_VERSION=1.0.0", | |||||
"JUCE_APP_VERSION_HEX=0x10000"); }; name = Debug; }; | |||||
20F59BC9E9ACBDF56007CE03 = { isa = XCBuildConfiguration; buildSettings = { | 20F59BC9E9ACBDF56007CE03 = { isa = XCBuildConfiguration; buildSettings = { | ||||
ARCHS = "$(ARCHS_STANDARD_32_BIT)"; | ARCHS = "$(ARCHS_STANDARD_32_BIT)"; | ||||
HEADER_SEARCH_PATHS = ("\"~/SDKs/VST3 SDK\"", "~/SDKs/vstsdk2.4", "../../JuceLibraryCode", "../../../../modules", "$(inherited)"); | HEADER_SEARCH_PATHS = ("\"~/SDKs/VST3 SDK\"", "~/SDKs/vstsdk2.4", "../../JuceLibraryCode", "../../../../modules", "$(inherited)"); | ||||
@@ -2055,7 +2057,9 @@ | |||||
GCC_PREPROCESSOR_DEFINITIONS = ( | GCC_PREPROCESSOR_DEFINITIONS = ( | ||||
"_NDEBUG=1", | "_NDEBUG=1", | ||||
"NDEBUG=1", | "NDEBUG=1", | ||||
"JUCER_XCODE_MAC_F6D2F4CF=1"); }; name = Release; }; | |||||
"JUCER_XCODE_MAC_F6D2F4CF=1", | |||||
"JUCE_APP_VERSION=1.0.0", | |||||
"JUCE_APP_VERSION_HEX=0x10000"); }; name = Release; }; | |||||
8D1CA827F1EFD443BDCF198A = { isa = XCBuildConfiguration; buildSettings = { | 8D1CA827F1EFD443BDCF198A = { isa = XCBuildConfiguration; buildSettings = { | ||||
ALWAYS_SEARCH_USER_PATHS = NO; | ALWAYS_SEARCH_USER_PATHS = NO; | ||||
GCC_C_LANGUAGE_STANDARD = c99; | GCC_C_LANGUAGE_STANDARD = c99; | ||||
@@ -52,7 +52,7 @@ | |||||
<Optimization>Disabled</Optimization> | <Optimization>Disabled</Optimization> | ||||
<DebugInformationFormat>EditAndContinue</DebugInformationFormat> | <DebugInformationFormat>EditAndContinue</DebugInformationFormat> | ||||
<AdditionalIncludeDirectories>..\..\JuceLibraryCode;..\..\..\..\modules;c:\SDKs\vstsdk2.4;c:\SDKs\VST3 SDK;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | <AdditionalIncludeDirectories>..\..\JuceLibraryCode;..\..\..\..\modules;c:\SDKs\vstsdk2.4;c:\SDKs\VST3 SDK;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||||
<PreprocessorDefinitions>WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2010_78A501D=1;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |||||
<PreprocessorDefinitions>WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2010_78A501D=1;JUCE_APP_VERSION=1.0.0;JUCE_APP_VERSION_HEX=0x10000;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |||||
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> | <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> | ||||
<RuntimeTypeInfo>true</RuntimeTypeInfo> | <RuntimeTypeInfo>true</RuntimeTypeInfo> | ||||
<PrecompiledHeader/> | <PrecompiledHeader/> | ||||
@@ -93,7 +93,7 @@ | |||||
<ClCompile> | <ClCompile> | ||||
<Optimization>MinSpace</Optimization> | <Optimization>MinSpace</Optimization> | ||||
<AdditionalIncludeDirectories>..\..\JuceLibraryCode;..\..\..\..\modules;c:\SDKs\vstsdk2.4;c:\SDKs\VST3 SDK;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | <AdditionalIncludeDirectories>..\..\JuceLibraryCode;..\..\..\..\modules;c:\SDKs\vstsdk2.4;c:\SDKs\VST3 SDK;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||||
<PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;JUCER_VS2010_78A501D=1;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |||||
<PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;JUCER_VS2010_78A501D=1;JUCE_APP_VERSION=1.0.0;JUCE_APP_VERSION_HEX=0x10000;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |||||
<RuntimeLibrary>MultiThreaded</RuntimeLibrary> | <RuntimeLibrary>MultiThreaded</RuntimeLibrary> | ||||
<RuntimeTypeInfo>true</RuntimeTypeInfo> | <RuntimeTypeInfo>true</RuntimeTypeInfo> | ||||
<PrecompiledHeader/> | <PrecompiledHeader/> | ||||
@@ -18,12 +18,12 @@ 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_7346DA2A=1" -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_7346DA2A=1" -D "JUCE_APP_VERSION=1.0.0" -D "JUCE_APP_VERSION_HEX=0x10000" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../../../modules | |||||
CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O0 | CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O0 | ||||
CXXFLAGS += $(CFLAGS) | CXXFLAGS += $(CFLAGS) | ||||
LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR) -L/usr/X11R6/lib/ -ldl -lpthread -lrt | LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR) -L/usr/X11R6/lib/ -ldl -lpthread -lrt | ||||
LDDEPS := | LDDEPS := | ||||
RESFLAGS := -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -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=1.0.0" -D "JUCE_APP_VERSION_HEX=0x10000" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../../../modules | |||||
TARGET := BinaryBuilder | TARGET := BinaryBuilder | ||||
BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH) | BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH) | ||||
endif | endif | ||||
@@ -38,12 +38,12 @@ 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_7346DA2A=1" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../../../modules | |||||
CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "NDEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=1.0.0" -D "JUCE_APP_VERSION_HEX=0x10000" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../../../modules | |||||
CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -Os | CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -Os | ||||
CXXFLAGS += $(CFLAGS) | CXXFLAGS += $(CFLAGS) | ||||
LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR) -fvisibility=hidden -L/usr/X11R6/lib/ -ldl -lpthread -lrt | LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR) -fvisibility=hidden -L/usr/X11R6/lib/ -ldl -lpthread -lrt | ||||
LDDEPS := | LDDEPS := | ||||
RESFLAGS := -D "LINUX=1" -D "NDEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -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=1.0.0" -D "JUCE_APP_VERSION_HEX=0x10000" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../../../modules | |||||
TARGET := BinaryBuilder | TARGET := BinaryBuilder | ||||
BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH) | BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH) | ||||
endif | endif | ||||
@@ -470,7 +470,9 @@ | |||||
GCC_PREPROCESSOR_DEFINITIONS = ( | GCC_PREPROCESSOR_DEFINITIONS = ( | ||||
"_DEBUG=1", | "_DEBUG=1", | ||||
"DEBUG=1", | "DEBUG=1", | ||||
"JUCER_XCODE_MAC_F6D2F4CF=1"); }; name = Debug; }; | |||||
"JUCER_XCODE_MAC_F6D2F4CF=1", | |||||
"JUCE_APP_VERSION=1.0.0", | |||||
"JUCE_APP_VERSION_HEX=0x10000"); }; name = Debug; }; | |||||
145C0C90E41D8DECE4DD66AD = { isa = XCBuildConfiguration; buildSettings = { | 145C0C90E41D8DECE4DD66AD = { isa = XCBuildConfiguration; buildSettings = { | ||||
HEADER_SEARCH_PATHS = ("../../JuceLibraryCode", "../../../../modules", "$(inherited)"); | HEADER_SEARCH_PATHS = ("../../JuceLibraryCode", "../../../../modules", "$(inherited)"); | ||||
GCC_OPTIMIZATION_LEVEL = s; | GCC_OPTIMIZATION_LEVEL = s; | ||||
@@ -489,7 +491,9 @@ | |||||
GCC_PREPROCESSOR_DEFINITIONS = ( | GCC_PREPROCESSOR_DEFINITIONS = ( | ||||
"_NDEBUG=1", | "_NDEBUG=1", | ||||
"NDEBUG=1", | "NDEBUG=1", | ||||
"JUCER_XCODE_MAC_F6D2F4CF=1"); }; name = Release; }; | |||||
"JUCER_XCODE_MAC_F6D2F4CF=1", | |||||
"JUCE_APP_VERSION=1.0.0", | |||||
"JUCE_APP_VERSION_HEX=0x10000"); }; name = Release; }; | |||||
D9552CAECBA3D7D5725848E5 = { isa = XCBuildConfiguration; buildSettings = { | D9552CAECBA3D7D5725848E5 = { isa = XCBuildConfiguration; buildSettings = { | ||||
ALWAYS_SEARCH_USER_PATHS = NO; | ALWAYS_SEARCH_USER_PATHS = NO; | ||||
GCC_C_LANGUAGE_STANDARD = c99; | GCC_C_LANGUAGE_STANDARD = c99; | ||||
@@ -32,7 +32,7 @@ | |||||
BufferSecurityCheck="" | BufferSecurityCheck="" | ||||
DebugInformationFormat="4" | DebugInformationFormat="4" | ||||
AdditionalIncludeDirectories="..\..\JuceLibraryCode;..\..\..\..\modules" | AdditionalIncludeDirectories="..\..\JuceLibraryCode;..\..\..\..\modules" | ||||
PreprocessorDefinitions="_CONSOLE;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2008_78A5006=1" | |||||
PreprocessorDefinitions="_CONSOLE;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2008_78A5006=1;JUCE_APP_VERSION=1.0.0;JUCE_APP_VERSION_HEX=0x10000" | |||||
RuntimeLibrary="1" | RuntimeLibrary="1" | ||||
RuntimeTypeInfo="true" | RuntimeTypeInfo="true" | ||||
UsePrecompiledHeader="0" | UsePrecompiledHeader="0" | ||||
@@ -88,7 +88,7 @@ | |||||
InlineFunctionExpansion="1" | InlineFunctionExpansion="1" | ||||
StringPooling="true" | StringPooling="true" | ||||
AdditionalIncludeDirectories="..\..\JuceLibraryCode;..\..\..\..\modules" | AdditionalIncludeDirectories="..\..\JuceLibraryCode;..\..\..\..\modules" | ||||
PreprocessorDefinitions="_CONSOLE;WIN32;_WINDOWS;NDEBUG;JUCER_VS2008_78A5006=1" | |||||
PreprocessorDefinitions="_CONSOLE;WIN32;_WINDOWS;NDEBUG;JUCER_VS2008_78A5006=1;JUCE_APP_VERSION=1.0.0;JUCE_APP_VERSION_HEX=0x10000" | |||||
RuntimeLibrary="0" | RuntimeLibrary="0" | ||||
RuntimeTypeInfo="true" | RuntimeTypeInfo="true" | ||||
UsePrecompiledHeader="0" | UsePrecompiledHeader="0" | ||||
@@ -18,12 +18,12 @@ 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_7346DA2A=1" -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_7346DA2A=1" -D "JUCE_APP_VERSION=1.0.0" -D "JUCE_APP_VERSION_HEX=0x10000" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../../../modules | |||||
CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O0 | CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O0 | ||||
CXXFLAGS += $(CFLAGS) | CXXFLAGS += $(CFLAGS) | ||||
LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR) -L/usr/X11R6/lib/ -lX11 -lXext -lXinerama -ldl -lfreetype -lpthread -lrt | LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR) -L/usr/X11R6/lib/ -lX11 -lXext -lXinerama -ldl -lfreetype -lpthread -lrt | ||||
LDDEPS := | LDDEPS := | ||||
RESFLAGS := -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -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=1.0.0" -D "JUCE_APP_VERSION_HEX=0x10000" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../../../modules | |||||
TARGET := HelloWorld | TARGET := HelloWorld | ||||
BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH) | BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH) | ||||
endif | endif | ||||
@@ -38,12 +38,12 @@ 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_7346DA2A=1" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../../../modules | |||||
CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "NDEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=1.0.0" -D "JUCE_APP_VERSION_HEX=0x10000" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../../../modules | |||||
CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -Os | CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -Os | ||||
CXXFLAGS += $(CFLAGS) | CXXFLAGS += $(CFLAGS) | ||||
LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR) -fvisibility=hidden -L/usr/X11R6/lib/ -lX11 -lXext -lXinerama -ldl -lfreetype -lpthread -lrt | LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR) -fvisibility=hidden -L/usr/X11R6/lib/ -lX11 -lXext -lXinerama -ldl -lfreetype -lpthread -lrt | ||||
LDDEPS := | LDDEPS := | ||||
RESFLAGS := -D "LINUX=1" -D "NDEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -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=1.0.0" -D "JUCE_APP_VERSION_HEX=0x10000" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../../../modules | |||||
TARGET := HelloWorld | TARGET := HelloWorld | ||||
BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH) | BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH) | ||||
endif | endif | ||||
@@ -1461,7 +1461,9 @@ | |||||
GCC_PREPROCESSOR_DEFINITIONS = ( | GCC_PREPROCESSOR_DEFINITIONS = ( | ||||
"_DEBUG=1", | "_DEBUG=1", | ||||
"DEBUG=1", | "DEBUG=1", | ||||
"JUCER_XCODE_MAC_F6D2F4CF=1"); }; name = Debug; }; | |||||
"JUCER_XCODE_MAC_F6D2F4CF=1", | |||||
"JUCE_APP_VERSION=1.0.0", | |||||
"JUCE_APP_VERSION_HEX=0x10000"); }; name = Debug; }; | |||||
339C95D5B2E96DD37B176D75 = { isa = XCBuildConfiguration; buildSettings = { | 339C95D5B2E96DD37B176D75 = { isa = XCBuildConfiguration; buildSettings = { | ||||
HEADER_SEARCH_PATHS = ("../../JuceLibraryCode", "../../../../modules", "$(inherited)"); | HEADER_SEARCH_PATHS = ("../../JuceLibraryCode", "../../../../modules", "$(inherited)"); | ||||
GCC_OPTIMIZATION_LEVEL = s; | GCC_OPTIMIZATION_LEVEL = s; | ||||
@@ -1480,7 +1482,9 @@ | |||||
GCC_PREPROCESSOR_DEFINITIONS = ( | GCC_PREPROCESSOR_DEFINITIONS = ( | ||||
"_NDEBUG=1", | "_NDEBUG=1", | ||||
"NDEBUG=1", | "NDEBUG=1", | ||||
"JUCER_XCODE_MAC_F6D2F4CF=1"); }; name = Release; }; | |||||
"JUCER_XCODE_MAC_F6D2F4CF=1", | |||||
"JUCE_APP_VERSION=1.0.0", | |||||
"JUCE_APP_VERSION_HEX=0x10000"); }; name = Release; }; | |||||
F6DA01300C80F2338FCBD24A = { isa = XCBuildConfiguration; buildSettings = { | F6DA01300C80F2338FCBD24A = { isa = XCBuildConfiguration; buildSettings = { | ||||
ALWAYS_SEARCH_USER_PATHS = NO; | ALWAYS_SEARCH_USER_PATHS = NO; | ||||
GCC_C_LANGUAGE_STANDARD = c99; | GCC_C_LANGUAGE_STANDARD = c99; | ||||
@@ -32,7 +32,7 @@ | |||||
BufferSecurityCheck="" | BufferSecurityCheck="" | ||||
DebugInformationFormat="4" | DebugInformationFormat="4" | ||||
AdditionalIncludeDirectories="..\..\JuceLibraryCode;..\..\..\..\modules" | AdditionalIncludeDirectories="..\..\JuceLibraryCode;..\..\..\..\modules" | ||||
PreprocessorDefinitions="WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2005_78A5003=1" | |||||
PreprocessorDefinitions="WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2005_78A5003=1;JUCE_APP_VERSION=1.0.0;JUCE_APP_VERSION_HEX=0x10000" | |||||
RuntimeLibrary="1" | RuntimeLibrary="1" | ||||
RuntimeTypeInfo="true" | RuntimeTypeInfo="true" | ||||
UsePrecompiledHeader="0" | UsePrecompiledHeader="0" | ||||
@@ -88,7 +88,7 @@ | |||||
InlineFunctionExpansion="1" | InlineFunctionExpansion="1" | ||||
StringPooling="true" | StringPooling="true" | ||||
AdditionalIncludeDirectories="..\..\JuceLibraryCode;..\..\..\..\modules" | AdditionalIncludeDirectories="..\..\JuceLibraryCode;..\..\..\..\modules" | ||||
PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;JUCER_VS2005_78A5003=1" | |||||
PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;JUCER_VS2005_78A5003=1;JUCE_APP_VERSION=1.0.0;JUCE_APP_VERSION_HEX=0x10000" | |||||
RuntimeLibrary="0" | RuntimeLibrary="0" | ||||
RuntimeTypeInfo="true" | RuntimeTypeInfo="true" | ||||
UsePrecompiledHeader="0" | UsePrecompiledHeader="0" | ||||
@@ -32,7 +32,7 @@ | |||||
BufferSecurityCheck="" | BufferSecurityCheck="" | ||||
DebugInformationFormat="4" | DebugInformationFormat="4" | ||||
AdditionalIncludeDirectories="..\..\JuceLibraryCode;..\..\..\..\modules" | AdditionalIncludeDirectories="..\..\JuceLibraryCode;..\..\..\..\modules" | ||||
PreprocessorDefinitions="WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2008_78A5006=1" | |||||
PreprocessorDefinitions="WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2008_78A5006=1;JUCE_APP_VERSION=1.0.0;JUCE_APP_VERSION_HEX=0x10000" | |||||
RuntimeLibrary="1" | RuntimeLibrary="1" | ||||
RuntimeTypeInfo="true" | RuntimeTypeInfo="true" | ||||
UsePrecompiledHeader="0" | UsePrecompiledHeader="0" | ||||
@@ -88,7 +88,7 @@ | |||||
InlineFunctionExpansion="1" | InlineFunctionExpansion="1" | ||||
StringPooling="true" | StringPooling="true" | ||||
AdditionalIncludeDirectories="..\..\JuceLibraryCode;..\..\..\..\modules" | AdditionalIncludeDirectories="..\..\JuceLibraryCode;..\..\..\..\modules" | ||||
PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;JUCER_VS2008_78A5006=1" | |||||
PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;JUCER_VS2008_78A5006=1;JUCE_APP_VERSION=1.0.0;JUCE_APP_VERSION_HEX=0x10000" | |||||
RuntimeLibrary="0" | RuntimeLibrary="0" | ||||
RuntimeTypeInfo="true" | RuntimeTypeInfo="true" | ||||
UsePrecompiledHeader="0" | UsePrecompiledHeader="0" | ||||
@@ -1456,7 +1456,9 @@ | |||||
GCC_PREPROCESSOR_DEFINITIONS = ( | GCC_PREPROCESSOR_DEFINITIONS = ( | ||||
"_DEBUG=1", | "_DEBUG=1", | ||||
"DEBUG=1", | "DEBUG=1", | ||||
"JUCER_XCODE_IPHONE_5BC26AE3=1"); }; name = Debug; }; | |||||
"JUCER_XCODE_IPHONE_5BC26AE3=1", | |||||
"JUCE_APP_VERSION=1.0.0", | |||||
"JUCE_APP_VERSION_HEX=0x10000"); }; name = Debug; }; | |||||
339C95D5B2E96DD37B176D75 = { isa = XCBuildConfiguration; buildSettings = { | 339C95D5B2E96DD37B176D75 = { isa = XCBuildConfiguration; buildSettings = { | ||||
HEADER_SEARCH_PATHS = ("../../JuceLibraryCode", "../../../../modules", "$(inherited)"); | HEADER_SEARCH_PATHS = ("../../JuceLibraryCode", "../../../../modules", "$(inherited)"); | ||||
GCC_OPTIMIZATION_LEVEL = s; | GCC_OPTIMIZATION_LEVEL = s; | ||||
@@ -1473,7 +1475,9 @@ | |||||
GCC_PREPROCESSOR_DEFINITIONS = ( | GCC_PREPROCESSOR_DEFINITIONS = ( | ||||
"_NDEBUG=1", | "_NDEBUG=1", | ||||
"NDEBUG=1", | "NDEBUG=1", | ||||
"JUCER_XCODE_IPHONE_5BC26AE3=1"); }; name = Release; }; | |||||
"JUCER_XCODE_IPHONE_5BC26AE3=1", | |||||
"JUCE_APP_VERSION=1.0.0", | |||||
"JUCE_APP_VERSION_HEX=0x10000"); }; name = Release; }; | |||||
F6DA01300C80F2338FCBD24A = { isa = XCBuildConfiguration; buildSettings = { | F6DA01300C80F2338FCBD24A = { isa = XCBuildConfiguration; buildSettings = { | ||||
ALWAYS_SEARCH_USER_PATHS = NO; | ALWAYS_SEARCH_USER_PATHS = NO; | ||||
GCC_C_LANGUAGE_STANDARD = c99; | GCC_C_LANGUAGE_STANDARD = c99; | ||||
@@ -25,7 +25,7 @@ | |||||
BufferSecurityCheck="" | BufferSecurityCheck="" | ||||
DebugInformationFormat="3" | DebugInformationFormat="3" | ||||
AdditionalIncludeDirectories="..\..\JuceLibraryCode;..\..\..\..\modules" | AdditionalIncludeDirectories="..\..\JuceLibraryCode;..\..\..\..\modules" | ||||
PreprocessorDefinitions="_LIB;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCE_DLL_BUILD=1;JUCER_VS2008_78A5006=1" | |||||
PreprocessorDefinitions="_LIB;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCE_DLL_BUILD=1;JUCER_VS2008_78A5006=1;JUCE_APP_VERSION=1.0.0;JUCE_APP_VERSION_HEX=0x10000" | |||||
RuntimeLibrary="1" | RuntimeLibrary="1" | ||||
RuntimeTypeInfo="true" | RuntimeTypeInfo="true" | ||||
UsePrecompiledHeader="0" | UsePrecompiledHeader="0" | ||||
@@ -67,7 +67,7 @@ | |||||
InlineFunctionExpansion="1" | InlineFunctionExpansion="1" | ||||
StringPooling="true" | StringPooling="true" | ||||
AdditionalIncludeDirectories="..\..\JuceLibraryCode;..\..\..\..\modules" | AdditionalIncludeDirectories="..\..\JuceLibraryCode;..\..\..\..\modules" | ||||
PreprocessorDefinitions="_LIB;WIN32;_WINDOWS;NDEBUG;JUCE_DLL_BUILD=1;JUCER_VS2008_78A5006=1" | |||||
PreprocessorDefinitions="_LIB;WIN32;_WINDOWS;NDEBUG;JUCE_DLL_BUILD=1;JUCER_VS2008_78A5006=1;JUCE_APP_VERSION=1.0.0;JUCE_APP_VERSION_HEX=0x10000" | |||||
RuntimeLibrary="0" | RuntimeLibrary="0" | ||||
RuntimeTypeInfo="true" | RuntimeTypeInfo="true" | ||||
UsePrecompiledHeader="0" | UsePrecompiledHeader="0" | ||||