diff --git a/extras/amalgamator/Amalgamator.jucer b/extras/amalgamator/Amalgamator.jucer new file mode 100644 index 0000000000..484266de77 --- /dev/null +++ b/extras/amalgamator/Amalgamator.jucer @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + diff --git a/extras/amalgamator/Builds/Linux/Makefile b/extras/amalgamator/Builds/Linux/Makefile new file mode 100644 index 0000000000..fca83753cd --- /dev/null +++ b/extras/amalgamator/Builds/Linux/Makefile @@ -0,0 +1,69 @@ +# Automatically generated makefile, created by the Jucer +# Don't edit this file! Your changes will be overwritten when you re-save the Jucer project! + +ifndef CONFIG + CONFIG=Debug +endif + +DEPFLAGS := $(if $(word 2, $(TARGET_ARCH)), , -MMD) + +ifeq ($(CONFIG),Debug) + BINDIR := build + LIBDIR := build + OBJDIR := build/intermediate/Debug + OUTDIR := build + CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -I "/usr/include" -I "/usr/include/freetype2" + CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O0 + CXXFLAGS += $(CFLAGS) + LDFLAGS += -L$(BINDIR) -L$(LIBDIR) -mwindows -L"/usr/X11R6/lib/" -L"../../../../bin" -lfreetype -lpthread -lrt -lX11 -lGL -lGLU -lXinerama -lasound + LDDEPS := + RESFLAGS := -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -I "/usr/include" -I "/usr/include/freetype2" + TARGET := amalgamator + BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH) +endif + +ifeq ($(CONFIG),Release) + BINDIR := build + LIBDIR := build + OBJDIR := build/intermediate/Release + OUTDIR := build + CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "NDEBUG=1" -I "/usr/include" -I "/usr/include/freetype2" + CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -Os + CXXFLAGS += $(CFLAGS) + LDFLAGS += -L$(BINDIR) -L$(LIBDIR) -mwindows -L"/usr/X11R6/lib/" -L"../../../../bin" -lfreetype -lpthread -lrt -lX11 -lGL -lGLU -lXinerama -lasound + LDDEPS := + RESFLAGS := -D "LINUX=1" -D "NDEBUG=1" -I "/usr/include" -I "/usr/include/freetype2" + TARGET := amalgamator + BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH) +endif + +OBJECTS := \ + $(OBJDIR)/Main.o \ + $(OBJDIR)/JuceLibraryCode.o \ + +.PHONY: clean + +$(OUTDIR)/$(TARGET): $(OBJECTS) $(LDDEPS) $(RESOURCES) + @echo Linking Amalgamator + -@mkdir -p $(BINDIR) + -@mkdir -p $(LIBDIR) + -@mkdir -p $(OUTDIR) + @$(BLDCMD) + +clean: + @echo Cleaning Amalgamator + -@rm -f $(OUTDIR)/$(TARGET) + -@rm -rf $(OBJDIR)/* + -@rm -rf $(OBJDIR) + +$(OBJDIR)/Main.o: ../../Source/Main.cpp + -@mkdir -p $(OBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + +$(OBJDIR)/JuceLibraryCode.o: ../../JuceLibraryCode/JuceLibraryCode.cpp + -@mkdir -p $(OBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + +-include $(OBJECTS:%.o=%.d) diff --git a/extras/amalgamator/Builds/MacOSX/Amalgamator.xcodeproj/project.pbxproj b/extras/amalgamator/Builds/MacOSX/Amalgamator.xcodeproj/project.pbxproj new file mode 100644 index 0000000000..fba39736e8 --- /dev/null +++ b/extras/amalgamator/Builds/MacOSX/Amalgamator.xcodeproj/project.pbxproj @@ -0,0 +1,152 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 44; + objects = { + + 76FCF61E52C8A664FB837DF5 = { isa = PBXBuildFile; fileRef = B98C60B57B831FE5215CDD21; }; + 12F285749FDD4E85B41169E5 = { isa = PBXBuildFile; fileRef = E4FB558EEF2604584B3F8103; }; + 62DB84D23F5FFEB64E02C314 = { isa = PBXBuildFile; fileRef = FC09587C418D230D3DFCE77B; }; + A028055931B7BED8C821E448 = { isa = PBXBuildFile; fileRef = E32AC05DBDEAF89686B2773B; }; + 988B72E3850D78021A3BF8FE = { isa = PBXBuildFile; fileRef = 334AF89077B2F537534DD3BB; }; + FA19E3E997AF0B26877F4AD6 = { isa = PBXBuildFile; fileRef = 24576DA9A947FFDAAE8EFD32; }; + 731784A25860983FCEDB8B6B = { isa = PBXBuildFile; fileRef = DB9C30FE77C7186E81570638; }; + 350B17B9F5C95B595634B3FB = { isa = PBXBuildFile; fileRef = 37C6BBAF39E5746857D58C58; }; + 9B76E2EEEAB49C62DFE3B1EC = { isa = PBXBuildFile; fileRef = AEB975FAD8A99FA884DC5937; }; + 694E761C899FD9316742F31B = { isa = PBXBuildFile; fileRef = 8971DE42C4A4141F326A56EF; }; + 095AC31326B20F2065351A27 = { isa = PBXBuildFile; fileRef = 7CDCBF126A9838C411716015; }; + 9AD4D5BCBB26F9B20341D6B7 = { isa = PBXBuildFile; fileRef = D30830DEDBD77D0A65868F7A; }; + 58B56B56A602ED529FDB8462 = { isa = PBXBuildFile; fileRef = 9519CEA83C2BD274A0305483; }; + B98C60B57B831FE5215CDD21 = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = ""; }; + E4FB558EEF2604584B3F8103 = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = ""; }; + FC09587C418D230D3DFCE77B = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = /System/Library/Frameworks/IOKit.framework; sourceTree = ""; }; + E32AC05DBDEAF89686B2773B = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudio.framework; path = /System/Library/Frameworks/CoreAudio.framework; sourceTree = ""; }; + 334AF89077B2F537534DD3BB = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMIDI.framework; path = /System/Library/Frameworks/CoreMIDI.framework; sourceTree = ""; }; + 24576DA9A947FFDAAE8EFD32 = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = /System/Library/Frameworks/WebKit.framework; sourceTree = ""; }; + DB9C30FE77C7186E81570638 = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = DiscRecording.framework; path = /System/Library/Frameworks/DiscRecording.framework; sourceTree = ""; }; + 37C6BBAF39E5746857D58C58 = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = /System/Library/Frameworks/OpenGL.framework; sourceTree = ""; }; + AEB975FAD8A99FA884DC5937 = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = /System/Library/Frameworks/QuartzCore.framework; sourceTree = ""; }; + 8971DE42C4A4141F326A56EF = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QTKit.framework; path = /System/Library/Frameworks/QTKit.framework; sourceTree = ""; }; + 7CDCBF126A9838C411716015 = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuickTime.framework; path = /System/Library/Frameworks/QuickTime.framework; sourceTree = ""; }; + CA1CAD166727F3F5EA4E2F00 = { isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = amalgamator; sourceTree = BUILT_PRODUCTS_DIR; }; + D30830DEDBD77D0A65868F7A = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Main.cpp; path = ../../Source/Main.cpp; sourceTree = SOURCE_ROOT; }; + D7B573B9812F7B72BD4B4CAF = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = AppConfig.h; path = ../../JuceLibraryCode/AppConfig.h; sourceTree = SOURCE_ROOT; }; + EB740AE538D86C85837D57DE = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = JuceHeader.h; path = ../../JuceLibraryCode/JuceHeader.h; sourceTree = SOURCE_ROOT; }; + 9519CEA83C2BD274A0305483 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = JuceLibraryCode.mm; path = ../../JuceLibraryCode/JuceLibraryCode.mm; sourceTree = SOURCE_ROOT; }; + BA8673778A175624FC9F52E7 = { isa = PBXGroup; children = ( + D30830DEDBD77D0A65868F7A ); name = Source; sourceTree = ""; }; + AFB48DD8DBF094F63F431979 = { isa = PBXGroup; children = ( + D7B573B9812F7B72BD4B4CAF, + EB740AE538D86C85837D57DE, + 9519CEA83C2BD274A0305483 ); name = "Juce Library Code"; sourceTree = ""; }; + 78D302C2D44FC9025738F347 = { isa = PBXGroup; children = ( + F171DBD1E44152AAE93F2DAA ); name = Resources; sourceTree = ""; }; + E48144B707BAD4CB5B26617C = { isa = PBXGroup; children = ( + B98C60B57B831FE5215CDD21, + E4FB558EEF2604584B3F8103, + FC09587C418D230D3DFCE77B, + E32AC05DBDEAF89686B2773B, + 334AF89077B2F537534DD3BB, + 24576DA9A947FFDAAE8EFD32, + DB9C30FE77C7186E81570638, + 37C6BBAF39E5746857D58C58, + AEB975FAD8A99FA884DC5937, + 8971DE42C4A4141F326A56EF, + 7CDCBF126A9838C411716015 ); name = Frameworks; sourceTree = ""; }; + AD2B02F2BB48C6DB847AB729 = { isa = PBXGroup; children = ( + CA1CAD166727F3F5EA4E2F00 ); name = Products; sourceTree = ""; }; + 7A94AFBB35D1BABFA6C9DF47 = { isa = PBXGroup; children = ( + BA8673778A175624FC9F52E7, + AFB48DD8DBF094F63F431979, + 78D302C2D44FC9025738F347, + E48144B707BAD4CB5B26617C, + AD2B02F2BB48C6DB847AB729 ); name = Source; sourceTree = ""; }; + D623E5ACBFF093B579AE3E45 = { isa = XCBuildConfiguration; buildSettings = { + ARCHS = "$(ARCHS_STANDARD_32_BIT)"; + GCC_MODEL_TUNING = G5; + PREBINDING = NO; + ZERO_LINK = NO; + GCC_INLINES_ARE_PRIVATE_EXTERN = YES; + USER_HEADER_SEARCH_PATHS = " $(inherited)"; + GCC_OPTIMIZATION_LEVEL = 0; + ONLY_ACTIVE_ARCH = YES; + COPY_PHASE_STRIP = NO; + GCC_PREPROCESSOR_DEFINITIONS = ( + "_DEBUG=1", + "DEBUG=1 "); }; name = Debug; }; + E11D0F60E7C2B13209F441B7 = { isa = XCBuildConfiguration; buildSettings = { + ARCHS = "$(ARCHS_STANDARD_32_BIT)"; + GCC_MODEL_TUNING = G5; + PREBINDING = NO; + ZERO_LINK = NO; + GCC_INLINES_ARE_PRIVATE_EXTERN = YES; + USER_HEADER_SEARCH_PATHS = " $(inherited)"; + GCC_OPTIMIZATION_LEVEL = s; + GCC_GENERATE_DEBUGGING_SYMBOLS = NO; + GCC_SYMBOLS_PRIVATE_EXTERN = YES; + GCC_PREPROCESSOR_DEFINITIONS = ( + "_NDEBUG=1", + "NDEBUG=1 "); }; name = Release; }; + 2A7232EC86FC4C9937F7FDB1 = { isa = XCBuildConfiguration; buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + GCC_VERSION = 4.0; + GCC_C_LANGUAGE_STANDARD = c99; + GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_CHECK_SWITCH_STATEMENTS = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + GCC_WARN_MISSING_PARENTHESES = YES; + GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES; + GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = YES; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + INFOPLIST_FILE = Info.plist; + PRODUCT_NAME = "amalgamator"; + COPY_PHASE_STRIP = NO; + GCC_DYNAMIC_NO_PIC = NO; + GCC_ENABLE_FIX_AND_CONTINUE = YES; + MACOSX_DEPLOYMENT_TARGET_ppc = 10.4; }; name = Debug; }; + 2F5C4639C0B6F8AACA14098A = { isa = XCBuildConfiguration; buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + GCC_VERSION = 4.0; + GCC_C_LANGUAGE_STANDARD = c99; + GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_CHECK_SWITCH_STATEMENTS = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + GCC_WARN_MISSING_PARENTHESES = YES; + GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES; + GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = YES; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + INFOPLIST_FILE = Info.plist; + PRODUCT_NAME = "amalgamator"; + MACOSX_DEPLOYMENT_TARGET_ppc = 10.4; }; name = Release; }; + 2CFBFFDFB38FB5353DB13339 = { isa = XCConfigurationList; buildConfigurations = ( + 2A7232EC86FC4C9937F7FDB1, + 2F5C4639C0B6F8AACA14098A ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Debug; }; + 9D9354DAA8B4F66302F44EB3 = { isa = XCConfigurationList; buildConfigurations = ( + D623E5ACBFF093B579AE3E45, + E11D0F60E7C2B13209F441B7 ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Debug; }; + 5203B474A9EC120E05FAFC7E = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( ); runOnlyForDeploymentPostprocessing = 0; }; + 26D5C1A755E31038E6AA5F65 = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( + 9AD4D5BCBB26F9B20341D6B7, + 58B56B56A602ED529FDB8462 ); runOnlyForDeploymentPostprocessing = 0; }; + E0796C07FC7AE37755E690BD = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 76FCF61E52C8A664FB837DF5, + 12F285749FDD4E85B41169E5, + 62DB84D23F5FFEB64E02C314, + A028055931B7BED8C821E448, + 988B72E3850D78021A3BF8FE, + FA19E3E997AF0B26877F4AD6, + 731784A25860983FCEDB8B6B, + 350B17B9F5C95B595634B3FB, + 9B76E2EEEAB49C62DFE3B1EC, + 694E761C899FD9316742F31B, + 095AC31326B20F2065351A27 ); runOnlyForDeploymentPostprocessing = 0; }; + B824C4A447FB724196B914CE = { isa = PBXNativeTarget; buildConfigurationList = 9D9354DAA8B4F66302F44EB3; buildPhases = ( + 5203B474A9EC120E05FAFC7E, + 26D5C1A755E31038E6AA5F65, + E0796C07FC7AE37755E690BD ); buildRules = ( ); dependencies = ( ); name = Amalgamator; productInstallPath = "$(HOME)/Applications"; productName = Amalgamator; productReference = CA1CAD166727F3F5EA4E2F00; productType = "com.apple.product-type.tool"; }; + 3F3EC7723ED2D70B1F2AA68A = { isa = PBXProject; buildConfigurationList = 2CFBFFDFB38FB5353DB13339; compatibilityVersion = "Xcode 3.0"; hasScannedForEncodings = 0; mainGroup = 7A94AFBB35D1BABFA6C9DF47; projectDirPath = ""; projectRoot = ""; targets = ( B824C4A447FB724196B914CE ); }; + }; + rootObject = 3F3EC7723ED2D70B1F2AA68A; +} diff --git a/extras/amalgamator/Builds/VisualStudio2005/Amalgamator.sln b/extras/amalgamator/Builds/VisualStudio2005/Amalgamator.sln new file mode 100644 index 0000000000..24ce6bc8b1 --- /dev/null +++ b/extras/amalgamator/Builds/VisualStudio2005/Amalgamator.sln @@ -0,0 +1,20 @@ + +Microsoft Visual Studio Solution File, Format Version 8.00 +# Visual C++ Express 2005 +Project("{D4CF920D-DA2B-1AAF-EF83-BB77BB696832}") = "Amalgamator", "Amalgamator.vcproj", "{8EBCACB6-792B-92FF-1C9B-34A5D310E725}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Release|Win32 = Release|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {8EBCACB6-792B-92FF-1C9B-34A5D310E725}.Debug|Win32.ActiveCfg = Debug|Win32 + {8EBCACB6-792B-92FF-1C9B-34A5D310E725}.Debug|Win32.Build.0 = Debug|Win32 + {8EBCACB6-792B-92FF-1C9B-34A5D310E725}.Release|Win32.ActiveCfg = Release|Win32 + {8EBCACB6-792B-92FF-1C9B-34A5D310E725}.Release|Win32.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/extras/amalgamator/Builds/VisualStudio2005/Amalgamator.vcproj b/extras/amalgamator/Builds/VisualStudio2005/Amalgamator.vcproj new file mode 100644 index 0000000000..4582c131cc --- /dev/null +++ b/extras/amalgamator/Builds/VisualStudio2005/Amalgamator.vcproj @@ -0,0 +1,146 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/extras/amalgamator/Builds/VisualStudio2008/Amalgamator.sln b/extras/amalgamator/Builds/VisualStudio2008/Amalgamator.sln new file mode 100644 index 0000000000..576b159c94 --- /dev/null +++ b/extras/amalgamator/Builds/VisualStudio2008/Amalgamator.sln @@ -0,0 +1,20 @@ + +Microsoft Visual Studio Solution File, Format Version 10.00 +# Visual C++ Express 2008 +Project("{D4CF920D-DA2B-1AAF-EF83-BB77BB696832}") = "Amalgamator", "Amalgamator.vcproj", "{8EBCACB6-792B-92FF-1C9B-34A5D310E725}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Release|Win32 = Release|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {8EBCACB6-792B-92FF-1C9B-34A5D310E725}.Debug|Win32.ActiveCfg = Debug|Win32 + {8EBCACB6-792B-92FF-1C9B-34A5D310E725}.Debug|Win32.Build.0 = Debug|Win32 + {8EBCACB6-792B-92FF-1C9B-34A5D310E725}.Release|Win32.ActiveCfg = Release|Win32 + {8EBCACB6-792B-92FF-1C9B-34A5D310E725}.Release|Win32.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/extras/amalgamator/Builds/VisualStudio2008/Amalgamator.vcproj b/extras/amalgamator/Builds/VisualStudio2008/Amalgamator.vcproj new file mode 100644 index 0000000000..32e8deb91b --- /dev/null +++ b/extras/amalgamator/Builds/VisualStudio2008/Amalgamator.vcproj @@ -0,0 +1,146 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/extras/amalgamator/JuceLibraryCode/AppConfig.h b/extras/amalgamator/JuceLibraryCode/AppConfig.h new file mode 100644 index 0000000000..cdb56372fb --- /dev/null +++ b/extras/amalgamator/JuceLibraryCode/AppConfig.h @@ -0,0 +1,38 @@ +/* + + IMPORTANT! This file is auto-generated by the Jucer each time you save your + project - if you alter its contents, your changes may be overwritten! + The following flags are Juce compilation options, taken fron juce_Config.h + + If you want to change any of these values, use the Jucer to do so, rather than + editing this file directly! + + Any commented-out settings will fall back to using the default values that + they are given in juce_Config.h + +*/ + +//#define JUCE_FORCE_DEBUG +//#define JUCE_LOG_ASSERTIONS +//#define JUCE_ASIO +//#define JUCE_WASAPI +//#define JUCE_DIRECTSOUND +//#define JUCE_ALSA +//#define JUCE_QUICKTIME +//#define JUCE_OPENGL +//#define JUCE_USE_FLAC +//#define JUCE_USE_OGGVORBIS +//#define JUCE_USE_CDBURNER +//#define JUCE_USE_CDREADER +//#define JUCE_USE_CAMERA +//#define JUCE_ENABLE_REPAINT_DEBUGGING +//#define JUCE_USE_XINERAMA +//#define JUCE_USE_XSHM +//#define JUCE_PLUGINHOST_VST +//#define JUCE_PLUGINHOST_AU +#define JUCE_ONLY_BUILD_CORE_LIBRARY 1 +//#define JUCE_WEB_BROWSER +//#define JUCE_SUPPORT_CARBON +//#define JUCE_CHECK_MEMORY_LEAKS +//#define JUCE_CATCH_UNHANDLED_EXCEPTIONS +//#define JUCE_STRINGS_ARE_UNICODE diff --git a/extras/amalgamator/JuceLibraryCode/JuceHeader.h b/extras/amalgamator/JuceLibraryCode/JuceHeader.h new file mode 100644 index 0000000000..a43e194823 --- /dev/null +++ b/extras/amalgamator/JuceLibraryCode/JuceHeader.h @@ -0,0 +1,19 @@ +/* + + IMPORTANT! This file is auto-generated by the Jucer each time you save your + project - if you alter its contents, your changes may be overwritten! + + This is the header file that your files should include in order to get all the + Juce library headers. You should NOT include juce.h or juce_amalgamated.h directly in + your own source files, because that wouldn't pick up the correct Juce configuration + options for your app. + +*/ + +#ifndef __APPHEADERFILE_F6BAAE14__ +#define __APPHEADERFILE_F6BAAE14__ + +#include "AppConfig.h" +#include "../../../juce_amalgamated.h" + +#endif // __APPHEADERFILE_F6BAAE14__ diff --git a/extras/amalgamator/JuceLibraryCode/JuceLibraryCode.cpp b/extras/amalgamator/JuceLibraryCode/JuceLibraryCode.cpp new file mode 100644 index 0000000000..98c4ab5e25 --- /dev/null +++ b/extras/amalgamator/JuceLibraryCode/JuceLibraryCode.cpp @@ -0,0 +1,15 @@ +/* + + IMPORTANT! This file is auto-generated by the Jucer each time you save your + project - if you alter its contents, your changes may be overwritten! + + This file pulls in all the Juce source code, and builds it using the settings + defined in AppConfig.h. + + If you want to change the method by which Juce is linked into your app, use the + Jucer to change it, rather than trying to edit this file directly. + +*/ + +#include "AppConfig.h" +#include "../../../amalgamation/juce_amalgamated_template.cpp" diff --git a/extras/amalgamator/JuceLibraryCode/JuceLibraryCode.mm b/extras/amalgamator/JuceLibraryCode/JuceLibraryCode.mm new file mode 100644 index 0000000000..98c4ab5e25 --- /dev/null +++ b/extras/amalgamator/JuceLibraryCode/JuceLibraryCode.mm @@ -0,0 +1,15 @@ +/* + + IMPORTANT! This file is auto-generated by the Jucer each time you save your + project - if you alter its contents, your changes may be overwritten! + + This file pulls in all the Juce source code, and builds it using the settings + defined in AppConfig.h. + + If you want to change the method by which Juce is linked into your app, use the + Jucer to change it, rather than trying to edit this file directly. + +*/ + +#include "AppConfig.h" +#include "../../../amalgamation/juce_amalgamated_template.cpp" diff --git a/extras/amalgamator/juce_AmalgamatorMain.cpp b/extras/amalgamator/Source/Main.cpp similarity index 95% rename from extras/amalgamator/juce_AmalgamatorMain.cpp rename to extras/amalgamator/Source/Main.cpp index 989c046d07..c43820312a 100644 --- a/extras/amalgamator/juce_AmalgamatorMain.cpp +++ b/extras/amalgamator/Source/Main.cpp @@ -23,8 +23,7 @@ ============================================================================== */ -#include "juce_AppConfig.h" -#include "../../juce_amalgamated.h" +#include "../JuceLibraryCode/JuceHeader.h" //============================================================================== @@ -367,9 +366,10 @@ static void mungeJuce (const File& juceFolder) //============================================================================== int main (int argc, char* argv[]) { - // If you're running a command-line app, you need to initialise juce manually - // before calling any Juce functionality.. - initialiseJuce_NonGUI(); + // This object makes sure that Juce is initialised and shut down correctly + // for the scope of this function call. Make sure this declaration is the + // first statement of this function. + const ScopedJuceInitialiser_NonGUI juceSystemInitialiser; std::cout << "\n*** The C++ Amalgamator! Written for Juce - www.rawmaterialsoftware.com\n"; diff --git a/extras/amalgamator/juce_AppConfig.h b/extras/amalgamator/juce_AppConfig.h deleted file mode 100644 index aa04cb8e61..0000000000 --- a/extras/amalgamator/juce_AppConfig.h +++ /dev/null @@ -1,33 +0,0 @@ -/* - This file contains settings that you might want to explicitly apply to - your Juce build. - - These flags enable or disable juce features - if you're linking to juce as - a library, then to change them, you'd need to alter your juce_Config.h file and - recompile the juce lib. But because we're using the amalgamated file, you can - just include this file before including your juce_amalgamated.cpp file to - have the same effect. - - If you leave any of these commented-out, they'll take on the default value - assigned to them in juce_Config.h, so to force them on or off, just set them - to an explicit 0 or 1 in here. -*/ - -#define JUCE_ONLY_BUILD_CORE_LIBRARY 1 -//#define JUCE_FORCE_DEBUG 1 -//#define JUCE_LOG_ASSERTIONS 1 -//#define JUCE_ASIO 1 -//#define JUCE_ALSA 1 -//#define JUCE_QUICKTIME 1 -//#define JUCE_OPENGL 1 -//#define JUCE_USE_FLAC 1 -//#define JUCE_USE_OGGVORBIS 1 -//#define JUCE_USE_CDBURNER 1 -//#define JUCE_ENABLE_REPAINT_DEBUGGING 1 -//#define JUCE_USE_XINERAMA 1 -//#define JUCE_USE_XSHM 1 -//#define JUCE_PLUGINHOST_VST 1 -//#define JUCE_PLUGINHOST_AU 1 -//#define JUCE_CHECK_MEMORY_LEAKS 1 -//#define JUCE_CATCH_UNHANDLED_EXCEPTIONS 1 -//#define JUCE_STRINGS_ARE_UNICODE 1 diff --git a/extras/amalgamator/juce_LibrarySource.cpp b/extras/amalgamator/juce_LibrarySource.cpp deleted file mode 100644 index db6b7e85fd..0000000000 --- a/extras/amalgamator/juce_LibrarySource.cpp +++ /dev/null @@ -1,12 +0,0 @@ - -/* - This file includes the entire juce source tree via the amalgamated file. - - You could add the amalgamated file directly to your project, but doing it - like this allows you to put your app's config settings in the - juce_AppConfig.h file and have them applied to both the juce headers and - the source code. -*/ - -#include "juce_AppConfig.h" -#include "../../juce_amalgamated.cpp" diff --git a/extras/amalgamator/juce_LibrarySource.mm b/extras/amalgamator/juce_LibrarySource.mm deleted file mode 100755 index fcbdfc2744..0000000000 --- a/extras/amalgamator/juce_LibrarySource.mm +++ /dev/null @@ -1,11 +0,0 @@ - -/* - This file includes the entire juce source tree via the amalgamated file. - - You could add the amalgamated file directly to your project, but doing it - like this allows you to put your app's config settings in the - juce_AppConfig.h file and have them applied to both the juce headers and - the source code. -*/ - -#include "juce_LibrarySource.cpp" diff --git a/extras/amalgamator/linux/Amalgamator.make b/extras/amalgamator/linux/Amalgamator.make deleted file mode 100644 index 4857a1f8f2..0000000000 --- a/extras/amalgamator/linux/Amalgamator.make +++ /dev/null @@ -1,96 +0,0 @@ -# C++ Console Executable Makefile autogenerated by premake -# Don't edit this file! Instead edit `premake.lua` then rerun `make` - -ifndef CONFIG - CONFIG=Debug -endif - -# if multiple archs are defined turn off automated dependency generation -DEPFLAGS := $(if $(word 2, $(TARGET_ARCH)), , -MMD) - -ifeq ($(CONFIG),Debug) - BINDIR := build - LIBDIR := build - OBJDIR := build/intermediate/Debug - OUTDIR := build - CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -I "/usr/include" -I "/usr/include/freetype2" - CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -g -D_DEBUG -ggdb - CXXFLAGS += $(CFLAGS) - LDFLAGS += -L$(BINDIR) -L$(LIBDIR) -L"/usr/X11R6/lib/" -lpthread -lrt -ldl - LDDEPS := - RESFLAGS := -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -I "/usr/include" -I "/usr/include/freetype2" - TARGET := amalgamator - BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH) -endif - -ifeq ($(CONFIG),Release) - BINDIR := build - LIBDIR := build - OBJDIR := build/intermediate/Release - OUTDIR := build - CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "NDEBUG=1" -I "/usr/include" -I "/usr/include/freetype2" - CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -O2 - CXXFLAGS += $(CFLAGS) - LDFLAGS += -L$(BINDIR) -L$(LIBDIR) -s -L"/usr/X11R6/lib/" -lpthread -lrt -ldl - LDDEPS := - RESFLAGS := -D "LINUX=1" -D "NDEBUG=1" -I "/usr/include" -I "/usr/include/freetype2" - TARGET := amalgamator - BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH) -endif - -OBJECTS := \ - $(OBJDIR)/juce_AmalgamatorMain.o \ - $(OBJDIR)/juce_LibrarySource.o \ - -MKDIR_TYPE := msdos -CMD := $(subst \,\\,$(ComSpec)$(COMSPEC)) -ifeq (,$(CMD)) - MKDIR_TYPE := posix -endif -ifeq (/bin,$(findstring /bin,$(SHELL))) - MKDIR_TYPE := posix -endif -ifeq ($(MKDIR_TYPE),posix) - CMD_MKBINDIR := mkdir -p $(BINDIR) - CMD_MKLIBDIR := mkdir -p $(LIBDIR) - CMD_MKOUTDIR := mkdir -p $(OUTDIR) - CMD_MKOBJDIR := mkdir -p $(OBJDIR) -else - CMD_MKBINDIR := $(CMD) /c if not exist $(subst /,\\,$(BINDIR)) mkdir $(subst /,\\,$(BINDIR)) - CMD_MKLIBDIR := $(CMD) /c if not exist $(subst /,\\,$(LIBDIR)) mkdir $(subst /,\\,$(LIBDIR)) - CMD_MKOUTDIR := $(CMD) /c if not exist $(subst /,\\,$(OUTDIR)) mkdir $(subst /,\\,$(OUTDIR)) - CMD_MKOBJDIR := $(CMD) /c if not exist $(subst /,\\,$(OBJDIR)) mkdir $(subst /,\\,$(OBJDIR)) -endif - -.PHONY: clean - -$(OUTDIR)/$(TARGET): $(OBJECTS) $(LDDEPS) $(RESOURCES) - @echo Linking Amalgamator - -@$(CMD_MKBINDIR) - -@$(CMD_MKLIBDIR) - -@$(CMD_MKOUTDIR) - @$(BLDCMD) - -clean: - @echo Cleaning Amalgamator -ifeq ($(MKDIR_TYPE),posix) - -@rm -f $(OUTDIR)/$(TARGET) - -@rm -rf $(OBJDIR) -else - -@if exist $(subst /,\,$(OUTDIR)/$(TARGET)) del /q $(subst /,\,$(OUTDIR)/$(TARGET)) - -@if exist $(subst /,\,$(OBJDIR)) del /q $(subst /,\,$(OBJDIR)) - -@if exist $(subst /,\,$(OBJDIR)) rmdir /s /q $(subst /,\,$(OBJDIR)) -endif - -$(OBJDIR)/juce_AmalgamatorMain.o: ../juce_AmalgamatorMain.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - -$(OBJDIR)/juce_LibrarySource.o: ../juce_LibrarySource.cpp - -@$(CMD_MKOBJDIR) - @echo $(notdir $<) - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - --include $(OBJECTS:%.o=%.d) - diff --git a/extras/amalgamator/linux/Makefile b/extras/amalgamator/linux/Makefile deleted file mode 100644 index 00f7a7e29a..0000000000 --- a/extras/amalgamator/linux/Makefile +++ /dev/null @@ -1,25 +0,0 @@ -# Makefile autogenerated by premake -# Don't edit this file! Instead edit `premake.lua` then rerun `make` -# Options: -# CONFIG=[Debug|Release] - -ifndef CONFIG - CONFIG=Debug -endif - -export CONFIG - -.PHONY: all clean Amalgamator - -all: Amalgamator - -Makefile: premake.lua - @echo ==== Regenerating Makefiles ==== - @premake --file $^ --cc gcc --target gnu - -Amalgamator: - @echo ==== Building Amalgamator ==== - @$(MAKE) --no-print-directory -C . -f Amalgamator.make - -clean: - @$(MAKE) --no-print-directory -C . -f Amalgamator.make clean diff --git a/extras/amalgamator/linux/premake.lua b/extras/amalgamator/linux/premake.lua deleted file mode 100644 index 80ce7991a2..0000000000 --- a/extras/amalgamator/linux/premake.lua +++ /dev/null @@ -1,46 +0,0 @@ - -project.name = "Amalgamator" -project.bindir = "build" -project.libdir = "build" - -project.configs = { "Debug", "Release" } - -package = newpackage() -package.name = "Amalgamator" -package.target = "amalgamator" -package.kind = "exe" -package.language = "c++" - -package.objdir = "build/intermediate" -package.config["Debug"].objdir = "build/intermediate/Debug" -package.config["Release"].objdir = "build/intermediate/Release" - -package.config["Debug"].defines = { "LINUX=1", "DEBUG=1", "_DEBUG=1" }; -package.config["Debug"].buildoptions = { "-D_DEBUG -ggdb" } - -package.config["Release"].defines = { "LINUX=1", "NDEBUG=1" }; - -package.includepaths = { - "/usr/include", - "/usr/include/freetype2" -} - -package.libpaths = { - "/usr/X11R6/lib/" -} - -package.config["Debug"].links = { - "pthread", "rt", "dl" -} - -package.config["Release"].links = { - "pthread", "rt", "dl" -} - -package.linkflags = { "static-runtime" } - -package.files = { matchfiles ( - "../*.h", - "../*.cpp" - ) -} diff --git a/extras/amalgamator/linux/runpremake b/extras/amalgamator/linux/runpremake deleted file mode 100644 index 0c37e39aeb..0000000000 --- a/extras/amalgamator/linux/runpremake +++ /dev/null @@ -1 +0,0 @@ -premake --file premake.lua --cc gcc --target gnu diff --git a/extras/amalgamator/mac/Amalgamator.xcodeproj/project.pbxproj b/extras/amalgamator/mac/Amalgamator.xcodeproj/project.pbxproj deleted file mode 100755 index 4594cf4ace..0000000000 --- a/extras/amalgamator/mac/Amalgamator.xcodeproj/project.pbxproj +++ /dev/null @@ -1,230 +0,0 @@ -// !$*UTF8*$! -{ - archiveVersion = 1; - classes = { - }; - objectVersion = 45; - objects = { - -/* Begin PBXBuildFile section */ - 844B0A970F52DC4200B2F1FD /* juce_AmalgamatorMain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 844B0A940F52DC4200B2F1FD /* juce_AmalgamatorMain.cpp */; }; - 844B0AA40F52DCA000B2F1FD /* ApplicationServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 844B0AA00F52DCA000B2F1FD /* ApplicationServices.framework */; }; - 844B0AA50F52DCA000B2F1FD /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 844B0AA10F52DCA000B2F1FD /* Cocoa.framework */; }; - 844B0AA60F52DCA000B2F1FD /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 844B0AA20F52DCA000B2F1FD /* CoreFoundation.framework */; }; - 844B0AA70F52DCA000B2F1FD /* CoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 844B0AA30F52DCA000B2F1FD /* CoreServices.framework */; }; - 844B0AB30F52DCCD00B2F1FD /* juce_LibrarySource.mm in Sources */ = {isa = PBXBuildFile; fileRef = 844B0AB20F52DCCD00B2F1FD /* juce_LibrarySource.mm */; }; - 844B0AC30F52DEB900B2F1FD /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 844B0AC20F52DEB900B2F1FD /* IOKit.framework */; }; - 844B0ACC0F52DECD00B2F1FD /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 844B0ACB0F52DECD00B2F1FD /* CoreAudio.framework */; }; -/* End PBXBuildFile section */ - -/* Begin PBXCopyFilesBuildPhase section */ - 8DD76FAF0486AB0100D96B5E /* CopyFiles */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 8; - dstPath = /usr/share/man/man1/; - dstSubfolderSpec = 0; - files = ( - ); - runOnlyForDeploymentPostprocessing = 1; - }; -/* End PBXCopyFilesBuildPhase section */ - -/* Begin PBXFileReference section */ - 844B0A940F52DC4200B2F1FD /* juce_AmalgamatorMain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = juce_AmalgamatorMain.cpp; path = ../juce_AmalgamatorMain.cpp; sourceTree = SOURCE_ROOT; }; - 844B0A950F52DC4200B2F1FD /* juce_AppConfig.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = juce_AppConfig.h; path = ../juce_AppConfig.h; sourceTree = SOURCE_ROOT; }; - 844B0AA00F52DCA000B2F1FD /* ApplicationServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ApplicationServices.framework; path = /System/Library/Frameworks/ApplicationServices.framework; sourceTree = ""; }; - 844B0AA10F52DCA000B2F1FD /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = ""; }; - 844B0AA20F52DCA000B2F1FD /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = /System/Library/Frameworks/CoreFoundation.framework; sourceTree = ""; }; - 844B0AA30F52DCA000B2F1FD /* CoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreServices.framework; path = /System/Library/Frameworks/CoreServices.framework; sourceTree = ""; }; - 844B0AB20F52DCCD00B2F1FD /* juce_LibrarySource.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = juce_LibrarySource.mm; path = ../juce_LibrarySource.mm; sourceTree = SOURCE_ROOT; }; - 844B0AC20F52DEB900B2F1FD /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = /System/Library/Frameworks/IOKit.framework; sourceTree = ""; }; - 844B0ACB0F52DECD00B2F1FD /* CoreAudio.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudio.framework; path = /System/Library/Frameworks/CoreAudio.framework; sourceTree = ""; }; - 8DD76FB20486AB0100D96B5E /* Amalgamator */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = Amalgamator; sourceTree = BUILT_PRODUCTS_DIR; }; -/* End PBXFileReference section */ - -/* Begin PBXFrameworksBuildPhase section */ - 8DD76FAD0486AB0100D96B5E /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - 844B0AA40F52DCA000B2F1FD /* ApplicationServices.framework in Frameworks */, - 844B0AA50F52DCA000B2F1FD /* Cocoa.framework in Frameworks */, - 844B0AA60F52DCA000B2F1FD /* CoreFoundation.framework in Frameworks */, - 844B0AA70F52DCA000B2F1FD /* CoreServices.framework in Frameworks */, - 844B0AC30F52DEB900B2F1FD /* IOKit.framework in Frameworks */, - 844B0ACC0F52DECD00B2F1FD /* CoreAudio.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXFrameworksBuildPhase section */ - -/* Begin PBXGroup section */ - 08FB7794FE84155DC02AAC07 /* Amalgamator */ = { - isa = PBXGroup; - children = ( - 08FB7795FE84155DC02AAC07 /* Source */, - 1AB674ADFE9D54B511CA2CBB /* Products */, - 844B0A9F0F52DC7400B2F1FD /* Frameworks */, - ); - name = Amalgamator; - sourceTree = ""; - }; - 08FB7795FE84155DC02AAC07 /* Source */ = { - isa = PBXGroup; - children = ( - 844B0AB20F52DCCD00B2F1FD /* juce_LibrarySource.mm */, - 844B0A940F52DC4200B2F1FD /* juce_AmalgamatorMain.cpp */, - 844B0A950F52DC4200B2F1FD /* juce_AppConfig.h */, - ); - name = Source; - sourceTree = ""; - }; - 1AB674ADFE9D54B511CA2CBB /* Products */ = { - isa = PBXGroup; - children = ( - 8DD76FB20486AB0100D96B5E /* Amalgamator */, - ); - name = Products; - sourceTree = ""; - }; - 844B0A9F0F52DC7400B2F1FD /* Frameworks */ = { - isa = PBXGroup; - children = ( - 844B0ACB0F52DECD00B2F1FD /* CoreAudio.framework */, - 844B0AC20F52DEB900B2F1FD /* IOKit.framework */, - 844B0AA00F52DCA000B2F1FD /* ApplicationServices.framework */, - 844B0AA10F52DCA000B2F1FD /* Cocoa.framework */, - 844B0AA20F52DCA000B2F1FD /* CoreFoundation.framework */, - 844B0AA30F52DCA000B2F1FD /* CoreServices.framework */, - ); - name = Frameworks; - sourceTree = ""; - }; -/* End PBXGroup section */ - -/* Begin PBXNativeTarget section */ - 8DD76FA90486AB0100D96B5E /* Amalgamator */ = { - isa = PBXNativeTarget; - buildConfigurationList = 1DEB928508733DD80010E9CD /* Build configuration list for PBXNativeTarget "Amalgamator" */; - buildPhases = ( - 8DD76FAB0486AB0100D96B5E /* Sources */, - 8DD76FAD0486AB0100D96B5E /* Frameworks */, - 8DD76FAF0486AB0100D96B5E /* CopyFiles */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = Amalgamator; - productInstallPath = "$(HOME)/bin"; - productName = Amalgamator; - productReference = 8DD76FB20486AB0100D96B5E /* Amalgamator */; - productType = "com.apple.product-type.tool"; - }; -/* End PBXNativeTarget section */ - -/* Begin PBXProject section */ - 08FB7793FE84155DC02AAC07 /* Project object */ = { - isa = PBXProject; - buildConfigurationList = 1DEB928908733DD80010E9CD /* Build configuration list for PBXProject "Amalgamator" */; - compatibilityVersion = "Xcode 3.1"; - hasScannedForEncodings = 1; - mainGroup = 08FB7794FE84155DC02AAC07 /* Amalgamator */; - projectDirPath = ""; - projectRoot = ""; - targets = ( - 8DD76FA90486AB0100D96B5E /* Amalgamator */, - ); - }; -/* End PBXProject section */ - -/* Begin PBXSourcesBuildPhase section */ - 8DD76FAB0486AB0100D96B5E /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 844B0A970F52DC4200B2F1FD /* juce_AmalgamatorMain.cpp in Sources */, - 844B0AB30F52DCCD00B2F1FD /* juce_LibrarySource.mm in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXSourcesBuildPhase section */ - -/* Begin XCBuildConfiguration section */ - 1DEB928608733DD80010E9CD /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COPY_PHASE_STRIP = NO; - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; - GCC_MODEL_TUNING = G5; - GCC_OPTIMIZATION_LEVEL = 0; - INSTALL_PATH = /usr/local/bin; - PRODUCT_NAME = amalgamator; - }; - name = Debug; - }; - 1DEB928708733DD80010E9CD /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_MODEL_TUNING = G5; - INSTALL_PATH = /usr/local/bin; - PRODUCT_NAME = Amalgamator; - }; - name = Release; - }; - 1DEB928A08733DD80010E9CD /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_BIT)"; - GCC_C_LANGUAGE_STANDARD = c99; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_WARN_ABOUT_RETURN_TYPE = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - ONLY_ACTIVE_ARCH = YES; - PREBINDING = NO; - SDKROOT = macosx10.5; - }; - name = Debug; - }; - 1DEB928B08733DD80010E9CD /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_BIT)"; - GCC_C_LANGUAGE_STANDARD = c99; - GCC_PREPROCESSOR_DEFINITIONS = "NDEBUG=1"; - GCC_WARN_ABOUT_RETURN_TYPE = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - PREBINDING = NO; - SDKROOT = macosx10.5; - }; - name = Release; - }; -/* End XCBuildConfiguration section */ - -/* Begin XCConfigurationList section */ - 1DEB928508733DD80010E9CD /* Build configuration list for PBXNativeTarget "Amalgamator" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 1DEB928608733DD80010E9CD /* Debug */, - 1DEB928708733DD80010E9CD /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 1DEB928908733DD80010E9CD /* Build configuration list for PBXProject "Amalgamator" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 1DEB928A08733DD80010E9CD /* Debug */, - 1DEB928B08733DD80010E9CD /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; -/* End XCConfigurationList section */ - }; - rootObject = 08FB7793FE84155DC02AAC07 /* Project object */; -} diff --git a/extras/amalgamator/vc8/Amalgamator.sln b/extras/amalgamator/vc8/Amalgamator.sln deleted file mode 100644 index 7d092650e9..0000000000 --- a/extras/amalgamator/vc8/Amalgamator.sln +++ /dev/null @@ -1,20 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 9.00 -# Visual Studio 2005 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Amalgamator", "Amalgamator.vcproj", "{E616D10E-A3BF-4227-9512-186086D297A6}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Release|Win32 = Release|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {E616D10E-A3BF-4227-9512-186086D297A6}.Debug|Win32.ActiveCfg = Debug|Win32 - {E616D10E-A3BF-4227-9512-186086D297A6}.Debug|Win32.Build.0 = Debug|Win32 - {E616D10E-A3BF-4227-9512-186086D297A6}.Release|Win32.ActiveCfg = Release|Win32 - {E616D10E-A3BF-4227-9512-186086D297A6}.Release|Win32.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/extras/amalgamator/vc8/Amalgamator.vcproj b/extras/amalgamator/vc8/Amalgamator.vcproj deleted file mode 100644 index c3bc7ebc8b..0000000000 --- a/extras/amalgamator/vc8/Amalgamator.vcproj +++ /dev/null @@ -1,193 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -