diff --git a/extras/the jucer/build/linux/Jucer.make b/extras/the jucer/build/linux/Jucer.make index 7ced18551a..63447a4359 100644 --- a/extras/the jucer/build/linux/Jucer.make +++ b/extras/the jucer/build/linux/Jucer.make @@ -10,12 +10,14 @@ ifeq ($(CONFIG),Debug) LIBDIR := build OBJDIR := build/intermediate/Debug OUTDIR := build - CPPFLAGS := -MD -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -I "/usr/include" - CFLAGS += $(CPPFLAGS) -g -D_DEBUG -ggdb + CPPFLAGS := -MMD -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/" -L "../../../../bin" -lfreetype -lpthread -lX11 -lGL -lGLU -lXinerama -lasound -ljuce_debug + LDFLAGS += -L$(BINDIR) -L$(LIBDIR) -mwindows -L"/usr/X11R6/lib/" -L"../../../../bin" -lfreetype -lpthread -lX11 -lGL -lGLU -lXinerama -lasound LDDEPS := + RESFLAGS := -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -I "/usr/include" -I "/usr/include/freetype2" TARGET := jucer + BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH) endif ifeq ($(CONFIG),Release) @@ -23,17 +25,20 @@ ifeq ($(CONFIG),Release) LIBDIR := build OBJDIR := build/intermediate/Release OUTDIR := build - CPPFLAGS := -MD -D "LINUX=1" -D "NDEBUG=1" -I "/usr/include" - CFLAGS += $(CPPFLAGS) -O2 + CPPFLAGS := -MMD -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/" -L "../../../../bin" -lfreetype -lpthread -lX11 -lGL -lGLU -lXinerama -lasound -ljuce + LDFLAGS += -L$(BINDIR) -L$(LIBDIR) -mwindows -s -L"/usr/X11R6/lib/" -L"../../../../bin" -lfreetype -lpthread -lX11 -lGL -lGLU -lXinerama -lasound LDDEPS := + RESFLAGS := -D "LINUX=1" -D "NDEBUG=1" -I "/usr/include" -I "/usr/include/freetype2" TARGET := jucer + BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH) endif OBJECTS := \ $(OBJDIR)/BinaryData.o \ $(OBJDIR)/jucer_Main.o \ + $(OBJDIR)/juce_LibrarySource.o \ $(OBJDIR)/jucer_ComponentLayoutEditor.o \ $(OBJDIR)/jucer_ComponentLayoutPanel.o \ $(OBJDIR)/jucer_ComponentOverlayComponent.o \ @@ -65,8 +70,15 @@ OBJECTS := \ $(OBJDIR)/jucer_PaintElementPath.o \ $(OBJDIR)/jucer_StrokeType.o \ +MKDIR_TYPE := msdos CMD := $(subst \,\\,$(ComSpec)$(COMSPEC)) ifeq (,$(CMD)) + MKDIR_TYPE := posix +endif +ifeq (/bin/sh.exe,$(SHELL)) + MKDIR_TYPE := posix +endif +ifeq ($(MKDIR_TYPE),posix) CMD_MKBINDIR := mkdir -p $(BINDIR) CMD_MKLIBDIR := mkdir -p $(LIBDIR) CMD_MKOUTDIR := mkdir -p $(OUTDIR) @@ -85,11 +97,17 @@ $(OUTDIR)/$(TARGET): $(OBJECTS) $(LDDEPS) $(RESOURCES) -@$(CMD_MKBINDIR) -@$(CMD_MKLIBDIR) -@$(CMD_MKOUTDIR) - @$(CXX) -o $@ $(OBJECTS) $(LDFLAGS) $(RESOURCES) + @$(BLDCMD) clean: @echo Cleaning Jucer +ifeq ($(MKDIR_TYPE),posix) -@rm -rf $(OUTDIR)/$(TARGET) $(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)/BinaryData.o: ../../src/BinaryData.cpp -@$(CMD_MKOBJDIR) @@ -101,6 +119,11 @@ $(OBJDIR)/jucer_Main.o: ../../src/jucer_Main.cpp @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o $@ -c $< +$(OBJDIR)/juce_LibrarySource.o: ../../src/juce_LibrarySource.cpp + -@$(CMD_MKOBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o $@ -c $< + $(OBJDIR)/jucer_ComponentLayoutEditor.o: ../../src/ui/jucer_ComponentLayoutEditor.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) diff --git a/extras/the jucer/build/linux/jucer_premake.lua b/extras/the jucer/build/linux/jucer_premake.lua index 1db930c8f9..3caf9b3dfa 100644 --- a/extras/the jucer/build/linux/jucer_premake.lua +++ b/extras/the jucer/build/linux/jucer_premake.lua @@ -22,7 +22,8 @@ package.config["Release"].defines = { "LINUX=1", "NDEBUG=1" }; package.target = "jucer" package.includepaths = { - "/usr/include" + "/usr/include", + "/usr/include/freetype2" } package.libpaths = { @@ -31,11 +32,11 @@ package.libpaths = { } package.config["Debug"].links = { - "freetype", "pthread", "X11", "GL", "GLU", "Xinerama", "asound", "juce_debug" + "freetype", "pthread", "X11", "GL", "GLU", "Xinerama", "asound" } package.config["Release"].links = { - "freetype", "pthread", "X11", "GL", "GLU", "Xinerama", "asound", "juce" + "freetype", "pthread", "X11", "GL", "GLU", "Xinerama", "asound" } package.linkflags = { "static-runtime" } diff --git a/extras/the jucer/build/mac/Jucer.xcodeproj/project.pbxproj b/extras/the jucer/build/mac/Jucer.xcodeproj/project.pbxproj index 942b863c9f..54033f37b8 100644 --- a/extras/the jucer/build/mac/Jucer.xcodeproj/project.pbxproj +++ b/extras/the jucer/build/mac/Jucer.xcodeproj/project.pbxproj @@ -8,6 +8,21 @@ /* Begin PBXBuildFile section */ 846929140A49DB9C00314975 /* juce.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 846929130A49DB9C00314975 /* juce.xcconfig */; }; + 846C10D40DE33F4D00E8CCE8 /* juce_LibrarySource.mm in Sources */ = {isa = PBXBuildFile; fileRef = 846C10D30DE33F4D00E8CCE8 /* juce_LibrarySource.mm */; }; + 846C10E90DE33FA100E8CCE8 /* AGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 846C10DB0DE33FA100E8CCE8 /* AGL.framework */; }; + 846C10EA0DE33FA100E8CCE8 /* ApplicationServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 846C10DC0DE33FA100E8CCE8 /* ApplicationServices.framework */; }; + 846C10EB0DE33FA100E8CCE8 /* AudioUnit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 846C10DD0DE33FA100E8CCE8 /* AudioUnit.framework */; }; + 846C10EC0DE33FA100E8CCE8 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 846C10DE0DE33FA100E8CCE8 /* Carbon.framework */; }; + 846C10ED0DE33FA100E8CCE8 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 846C10DF0DE33FA100E8CCE8 /* Cocoa.framework */; }; + 846C10EE0DE33FA100E8CCE8 /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 846C10E00DE33FA100E8CCE8 /* CoreAudio.framework */; }; + 846C10EF0DE33FA100E8CCE8 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 846C10E10DE33FA100E8CCE8 /* CoreFoundation.framework */; }; + 846C10F00DE33FA100E8CCE8 /* CoreMIDI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 846C10E20DE33FA100E8CCE8 /* CoreMIDI.framework */; }; + 846C10F10DE33FA100E8CCE8 /* CoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 846C10E30DE33FA100E8CCE8 /* CoreServices.framework */; }; + 846C10F20DE33FA100E8CCE8 /* DiscRecording.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 846C10E40DE33FA100E8CCE8 /* DiscRecording.framework */; }; + 846C10F30DE33FA100E8CCE8 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 846C10E50DE33FA100E8CCE8 /* IOKit.framework */; }; + 846C10F40DE33FA100E8CCE8 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 846C10E60DE33FA100E8CCE8 /* OpenGL.framework */; }; + 846C10F50DE33FA100E8CCE8 /* QuickTime.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 846C10E70DE33FA100E8CCE8 /* QuickTime.framework */; }; + 846C10F60DE33FA100E8CCE8 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 846C10E80DE33FA100E8CCE8 /* WebKit.framework */; }; 84F1769F0A271BBD00908B2F /* jucer_StoredSettings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84F1769B0A271BBD00908B2F /* jucer_StoredSettings.cpp */; }; 84F176A00A271BBD00908B2F /* jucer_UtilityFunctions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84F1769D0A271BBD00908B2F /* jucer_UtilityFunctions.cpp */; }; 84F176BA0A271BD000908B2F /* jucer_ComponentLayoutEditor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84F176A20A271BD000908B2F /* jucer_ComponentLayoutEditor.cpp */; }; @@ -42,31 +57,28 @@ 84F555CF0A22381100A8311C /* Jucer To Do list.txt in Resources */ = {isa = PBXBuildFile; fileRef = 84F5556A0A22381000A8311C /* Jucer To Do list.txt */; }; 84F555D30A22381100A8311C /* BinaryData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84F555700A22381000A8311C /* BinaryData.cpp */; }; 84F555D40A22381100A8311C /* jucer_Main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84F555730A22381000A8311C /* jucer_Main.cpp */; }; - 84F5592D0A223B0E00A8311C /* AGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84F559250A223B0E00A8311C /* AGL.framework */; }; - 84F5592E0A223B0E00A8311C /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84F559260A223B0E00A8311C /* Carbon.framework */; }; - 84F5592F0A223B0E00A8311C /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84F559270A223B0E00A8311C /* CoreAudio.framework */; }; - 84F559300A223B0E00A8311C /* CoreMIDI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84F559280A223B0E00A8311C /* CoreMIDI.framework */; }; - 84F559310A223B0E00A8311C /* CoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84F559290A223B0E00A8311C /* CoreServices.framework */; }; - 84F559320A223B0E00A8311C /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84F5592A0A223B0E00A8311C /* IOKit.framework */; }; - 84F559330A223B0E00A8311C /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84F5592B0A223B0E00A8311C /* OpenGL.framework */; }; - 84F559340A223B0E00A8311C /* QuickTime.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84F5592C0A223B0E00A8311C /* QuickTime.framework */; }; - 84FDB1B50C15C24F00CD0087 /* libjucedebug.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 84FDB1B20C15C24300CD0087 /* libjucedebug.a */; }; 8D0C4E8D0486CD37000505A6 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 0867D6AAFE840B52C02AAC07 /* InfoPlist.strings */; }; /* End PBXBuildFile section */ -/* Begin PBXContainerItemProxy section */ - 84FDB1B10C15C24300CD0087 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 84F559480A223B8400A8311C /* Juce.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = D2AAC046055464E500DB518D; - remoteInfo = Juce; - }; -/* End PBXContainerItemProxy section */ - /* Begin PBXFileReference section */ 0867D6ABFE840B52C02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = ""; }; 846929130A49DB9C00314975 /* juce.xcconfig */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xcconfig; name = juce.xcconfig; path = ../../../../build/macosx/juce.xcconfig; sourceTree = SOURCE_ROOT; }; + 846C10D20DE33F4D00E8CCE8 /* juce_AppConfig.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = juce_AppConfig.h; path = ../../src/juce_AppConfig.h; sourceTree = SOURCE_ROOT; }; + 846C10D30DE33F4D00E8CCE8 /* juce_LibrarySource.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = juce_LibrarySource.mm; path = ../../src/juce_LibrarySource.mm; sourceTree = SOURCE_ROOT; }; + 846C10DB0DE33FA100E8CCE8 /* AGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AGL.framework; path = /System/Library/Frameworks/AGL.framework; sourceTree = ""; }; + 846C10DC0DE33FA100E8CCE8 /* ApplicationServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ApplicationServices.framework; path = /System/Library/Frameworks/ApplicationServices.framework; sourceTree = ""; }; + 846C10DD0DE33FA100E8CCE8 /* AudioUnit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioUnit.framework; path = /System/Library/Frameworks/AudioUnit.framework; sourceTree = ""; }; + 846C10DE0DE33FA100E8CCE8 /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = ""; }; + 846C10DF0DE33FA100E8CCE8 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = ""; }; + 846C10E00DE33FA100E8CCE8 /* CoreAudio.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudio.framework; path = /System/Library/Frameworks/CoreAudio.framework; sourceTree = ""; }; + 846C10E10DE33FA100E8CCE8 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = /System/Library/Frameworks/CoreFoundation.framework; sourceTree = ""; }; + 846C10E20DE33FA100E8CCE8 /* CoreMIDI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMIDI.framework; path = /System/Library/Frameworks/CoreMIDI.framework; sourceTree = ""; }; + 846C10E30DE33FA100E8CCE8 /* CoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreServices.framework; path = /System/Library/Frameworks/CoreServices.framework; sourceTree = ""; }; + 846C10E40DE33FA100E8CCE8 /* DiscRecording.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = DiscRecording.framework; path = /System/Library/Frameworks/DiscRecording.framework; sourceTree = ""; }; + 846C10E50DE33FA100E8CCE8 /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = /System/Library/Frameworks/IOKit.framework; sourceTree = ""; }; + 846C10E60DE33FA100E8CCE8 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = /System/Library/Frameworks/OpenGL.framework; sourceTree = ""; }; + 846C10E70DE33FA100E8CCE8 /* QuickTime.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuickTime.framework; path = /System/Library/Frameworks/QuickTime.framework; sourceTree = ""; }; + 846C10E80DE33FA100E8CCE8 /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = /System/Library/Frameworks/WebKit.framework; sourceTree = ""; }; 84F176990A271BBD00908B2F /* jucer_ColourEditorComponent.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = jucer_ColourEditorComponent.h; sourceTree = ""; }; 84F1769A0A271BBD00908B2F /* jucer_Colours.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = jucer_Colours.h; sourceTree = ""; }; 84F1769B0A271BBD00908B2F /* jucer_StoredSettings.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = jucer_StoredSettings.cpp; sourceTree = ""; }; @@ -171,15 +183,6 @@ 84F555720A22381000A8311C /* jucer_Headers.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = jucer_Headers.h; path = ../../src/jucer_Headers.h; sourceTree = SOURCE_ROOT; }; 84F555730A22381000A8311C /* jucer_Main.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = jucer_Main.cpp; path = ../../src/jucer_Main.cpp; sourceTree = SOURCE_ROOT; }; 84F555B00A22381000A8311C /* jucer_ComponentTemplate.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = jucer_ComponentTemplate.h; path = ../../src/templates/jucer_ComponentTemplate.h; sourceTree = SOURCE_ROOT; }; - 84F559250A223B0E00A8311C /* AGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AGL.framework; path = /System/Library/Frameworks/AGL.framework; sourceTree = ""; }; - 84F559260A223B0E00A8311C /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = ""; }; - 84F559270A223B0E00A8311C /* CoreAudio.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudio.framework; path = /System/Library/Frameworks/CoreAudio.framework; sourceTree = ""; }; - 84F559280A223B0E00A8311C /* CoreMIDI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMIDI.framework; path = /System/Library/Frameworks/CoreMIDI.framework; sourceTree = ""; }; - 84F559290A223B0E00A8311C /* CoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreServices.framework; path = /System/Library/Frameworks/CoreServices.framework; sourceTree = ""; }; - 84F5592A0A223B0E00A8311C /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = /System/Library/Frameworks/IOKit.framework; sourceTree = ""; }; - 84F5592B0A223B0E00A8311C /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = /System/Library/Frameworks/OpenGL.framework; sourceTree = ""; }; - 84F5592C0A223B0E00A8311C /* QuickTime.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuickTime.framework; path = /System/Library/Frameworks/QuickTime.framework; sourceTree = ""; }; - 84F559480A223B8400A8311C /* Juce.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Juce.xcodeproj; path = ../../../../build/macosx/Juce.xcodeproj; sourceTree = SOURCE_ROOT; }; 8D0C4E960486CD37000505A6 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = ""; }; 8D0C4E970486CD37000505A6 /* Jucer.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Jucer.app; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ @@ -189,15 +192,20 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 84FDB1B50C15C24F00CD0087 /* libjucedebug.a in Frameworks */, - 84F5592D0A223B0E00A8311C /* AGL.framework in Frameworks */, - 84F5592E0A223B0E00A8311C /* Carbon.framework in Frameworks */, - 84F5592F0A223B0E00A8311C /* CoreAudio.framework in Frameworks */, - 84F559300A223B0E00A8311C /* CoreMIDI.framework in Frameworks */, - 84F559310A223B0E00A8311C /* CoreServices.framework in Frameworks */, - 84F559320A223B0E00A8311C /* IOKit.framework in Frameworks */, - 84F559330A223B0E00A8311C /* OpenGL.framework in Frameworks */, - 84F559340A223B0E00A8311C /* QuickTime.framework in Frameworks */, + 846C10E90DE33FA100E8CCE8 /* AGL.framework in Frameworks */, + 846C10EA0DE33FA100E8CCE8 /* ApplicationServices.framework in Frameworks */, + 846C10EB0DE33FA100E8CCE8 /* AudioUnit.framework in Frameworks */, + 846C10EC0DE33FA100E8CCE8 /* Carbon.framework in Frameworks */, + 846C10ED0DE33FA100E8CCE8 /* Cocoa.framework in Frameworks */, + 846C10EE0DE33FA100E8CCE8 /* CoreAudio.framework in Frameworks */, + 846C10EF0DE33FA100E8CCE8 /* CoreFoundation.framework in Frameworks */, + 846C10F00DE33FA100E8CCE8 /* CoreMIDI.framework in Frameworks */, + 846C10F10DE33FA100E8CCE8 /* CoreServices.framework in Frameworks */, + 846C10F20DE33FA100E8CCE8 /* DiscRecording.framework in Frameworks */, + 846C10F30DE33FA100E8CCE8 /* IOKit.framework in Frameworks */, + 846C10F40DE33FA100E8CCE8 /* OpenGL.framework in Frameworks */, + 846C10F50DE33FA100E8CCE8 /* QuickTime.framework in Frameworks */, + 846C10F60DE33FA100E8CCE8 /* WebKit.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -237,6 +245,8 @@ 84F555710A22381000A8311C /* BinaryData.h */, 84F555720A22381000A8311C /* jucer_Headers.h */, 84F555730A22381000A8311C /* jucer_Main.cpp */, + 846C10D20DE33F4D00E8CCE8 /* juce_AppConfig.h */, + 846C10D30DE33F4D00E8CCE8 /* juce_LibrarySource.mm */, ); name = Sources; sourceTree = ""; @@ -254,15 +264,20 @@ 20286C32FDCF999611CA2CEA /* External Frameworks and Libraries */ = { isa = PBXGroup; children = ( - 84F559480A223B8400A8311C /* Juce.xcodeproj */, - 84F559250A223B0E00A8311C /* AGL.framework */, - 84F559260A223B0E00A8311C /* Carbon.framework */, - 84F559270A223B0E00A8311C /* CoreAudio.framework */, - 84F559280A223B0E00A8311C /* CoreMIDI.framework */, - 84F559290A223B0E00A8311C /* CoreServices.framework */, - 84F5592A0A223B0E00A8311C /* IOKit.framework */, - 84F5592B0A223B0E00A8311C /* OpenGL.framework */, - 84F5592C0A223B0E00A8311C /* QuickTime.framework */, + 846C10DB0DE33FA100E8CCE8 /* AGL.framework */, + 846C10DC0DE33FA100E8CCE8 /* ApplicationServices.framework */, + 846C10DD0DE33FA100E8CCE8 /* AudioUnit.framework */, + 846C10DE0DE33FA100E8CCE8 /* Carbon.framework */, + 846C10DF0DE33FA100E8CCE8 /* Cocoa.framework */, + 846C10E00DE33FA100E8CCE8 /* CoreAudio.framework */, + 846C10E10DE33FA100E8CCE8 /* CoreFoundation.framework */, + 846C10E20DE33FA100E8CCE8 /* CoreMIDI.framework */, + 846C10E30DE33FA100E8CCE8 /* CoreServices.framework */, + 846C10E40DE33FA100E8CCE8 /* DiscRecording.framework */, + 846C10E50DE33FA100E8CCE8 /* IOKit.framework */, + 846C10E60DE33FA100E8CCE8 /* OpenGL.framework */, + 846C10E70DE33FA100E8CCE8 /* QuickTime.framework */, + 846C10E80DE33FA100E8CCE8 /* WebKit.framework */, ); name = "External Frameworks and Libraries"; sourceTree = ""; @@ -429,14 +444,6 @@ path = ../../src/utility; sourceTree = SOURCE_ROOT; }; - 84FDB1AE0C15C24300CD0087 /* Products */ = { - isa = PBXGroup; - children = ( - 84FDB1B20C15C24300CD0087 /* libjucedebug.a */, - ); - name = Products; - sourceTree = ""; - }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -464,31 +471,17 @@ 20286C28FDCF999611CA2CEA /* Project object */ = { isa = PBXProject; buildConfigurationList = C0E91AC908A95435008D54AB /* Build configuration list for PBXProject "Jucer" */; + compatibilityVersion = "Xcode 2.4"; hasScannedForEncodings = 1; mainGroup = 20286C29FDCF999611CA2CEA /* Jucer */; projectDirPath = ""; - projectReferences = ( - { - ProductGroup = 84FDB1AE0C15C24300CD0087 /* Products */; - ProjectRef = 84F559480A223B8400A8311C /* Juce.xcodeproj */; - }, - ); + projectRoot = ""; targets = ( 8D0C4E890486CD37000505A6 /* Jucer */, ); }; /* End PBXProject section */ -/* Begin PBXReferenceProxy section */ - 84FDB1B20C15C24300CD0087 /* libjucedebug.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = libjucedebug.a; - remoteRef = 84FDB1B10C15C24300CD0087 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; -/* End PBXReferenceProxy section */ - /* Begin PBXResourcesBuildPhase section */ 8D0C4E8C0486CD37000505A6 /* Resources */ = { isa = PBXResourcesBuildPhase; @@ -540,6 +533,7 @@ 84F177270A271C2F00908B2F /* jucer_PaintElementPath.cpp in Sources */, 84F43CC30A2B5EF500284072 /* jucer_FillType.cpp in Sources */, 84F43CC40A2B5EF500284072 /* jucer_StrokeType.cpp in Sources */, + 846C10D40DE33F4D00E8CCE8 /* juce_LibrarySource.mm in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/extras/the jucer/build/vc8/jucer.sln b/extras/the jucer/build/vc8/jucer.sln index 542192735a..e2e6d373b4 100644 --- a/extras/the jucer/build/vc8/jucer.sln +++ b/extras/the jucer/build/vc8/jucer.sln @@ -1,12 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 9.00 # Visual Studio 2005 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jucer", "jucer.vcproj", "{050D65C2-17C4-4EE1-ABCE-BEA9DA83D77A}" - ProjectSection(ProjectDependencies) = postProject - {AE232C11-D91C-4CA1-B24E-8B11A52EFF26} = {AE232C11-D91C-4CA1-B24E-8B11A52EFF26} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JUCE", "..\..\..\..\build\win32\vc8\JUCE.vcproj", "{AE232C11-D91C-4CA1-B24E-8B11A52EFF26}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "The Jucer", "jucer.vcproj", "{050D65C2-17C4-4EE1-ABCE-BEA9DA83D77A}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -24,14 +19,6 @@ Global {050D65C2-17C4-4EE1-ABCE-BEA9DA83D77A}.DLL Release|Win32.Build.0 = Release|Win32 {050D65C2-17C4-4EE1-ABCE-BEA9DA83D77A}.Release|Win32.ActiveCfg = Release|Win32 {050D65C2-17C4-4EE1-ABCE-BEA9DA83D77A}.Release|Win32.Build.0 = Release|Win32 - {AE232C11-D91C-4CA1-B24E-8B11A52EFF26}.Debug|Win32.ActiveCfg = Debug|Win32 - {AE232C11-D91C-4CA1-B24E-8B11A52EFF26}.Debug|Win32.Build.0 = Debug|Win32 - {AE232C11-D91C-4CA1-B24E-8B11A52EFF26}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {AE232C11-D91C-4CA1-B24E-8B11A52EFF26}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {AE232C11-D91C-4CA1-B24E-8B11A52EFF26}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {AE232C11-D91C-4CA1-B24E-8B11A52EFF26}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {AE232C11-D91C-4CA1-B24E-8B11A52EFF26}.Release|Win32.ActiveCfg = Release|Win32 - {AE232C11-D91C-4CA1-B24E-8B11A52EFF26}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/extras/the jucer/build/vc8/jucer.vcproj b/extras/the jucer/build/vc8/jucer.vcproj index d31e192223..e94b5fbe0f 100644 --- a/extras/the jucer/build/vc8/jucer.vcproj +++ b/extras/the jucer/build/vc8/jucer.vcproj @@ -221,6 +221,10 @@ Name="Source Files" Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" > + + diff --git a/extras/the jucer/src/juce_AppConfig.h b/extras/the jucer/src/juce_AppConfig.h new file mode 100644 index 0000000000..bda0dbc8df --- /dev/null +++ b/extras/the jucer/src/juce_AppConfig.h @@ -0,0 +1,58 @@ +/* + ============================================================================== + + This file is part of the JUCE library - "Jules' Utility Class Extensions" + Copyright 2004-7 by Raw Material Software ltd. + + ------------------------------------------------------------------------------ + + JUCE can be redistributed and/or modified under the terms of the + GNU General Public License, as published by the Free Software Foundation; + either version 2 of the License, or (at your option) any later version. + + JUCE is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with JUCE; if not, visit www.gnu.org/licenses or write to the + Free Software Foundation, Inc., 59 Temple Place, Suite 330, + Boston, MA 02111-1307 USA + + ------------------------------------------------------------------------------ + + If you'd like to release a closed-source product which uses JUCE, commercial + licenses are also available: visit www.rawmaterialsoftware.com/juce for + more information. + + ============================================================================== +*/ + +/* + This file contains settings that you might want to explicitly apply to + the your build. + + Most of these are turned on or off by default, but you can override + that setting here by un-commenting it and giving it a 1 or 0 value. +*/ + +//#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_BUILD_GUI_CLASSES 1 +//#define JUCE_CHECK_MEMORY_LEAKS 1 +//#define JUCE_CATCH_UNHANDLED_EXCEPTIONS 1 +//#define JUCE_STRINGS_ARE_UNICODE 1 diff --git a/extras/the jucer/src/juce_LibrarySource.cpp b/extras/the jucer/src/juce_LibrarySource.cpp new file mode 100644 index 0000000000..ab4357598c --- /dev/null +++ b/extras/the jucer/src/juce_LibrarySource.cpp @@ -0,0 +1,12 @@ + +/* + 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/the jucer/src/juce_LibrarySource.mm b/extras/the jucer/src/juce_LibrarySource.mm new file mode 100644 index 0000000000..9493e3c6fc --- /dev/null +++ b/extras/the jucer/src/juce_LibrarySource.mm @@ -0,0 +1,12 @@ + +/* + 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.mm" diff --git a/extras/the jucer/src/jucer_Headers.h b/extras/the jucer/src/jucer_Headers.h index bb2204bf32..718cb8a93a 100644 --- a/extras/the jucer/src/jucer_Headers.h +++ b/extras/the jucer/src/jucer_Headers.h @@ -39,11 +39,7 @@ #define DONT_LIST_JUCE_AUTOLINKEDLIBS 1 //============================================================================== -// Normally you'd just include juce.h here, but I'm doing it this way instead -// so that I'm guaranteed to spot any bugs that might creep in when using the -// macro-free include method.. -#include "../../../src/juce_WithoutMacros.h" -#include "../../../src/juce_DefineMacros.h" +#include "../../../juce_amalgamated.h" //============================================================================== #define JUCER_MAJOR_VERSION 1