Browse Source

Fix for obj-c++ code build

tags/1.9.4
falkTX 10 years ago
parent
commit
1c5c6e3414
20 changed files with 10 additions and 263 deletions
  1. +1
    -1
      source/modules/juce_audio_basics/Makefile
  2. +0
    -25
      source/modules/juce_audio_basics/juce_audio_basics.mm
  3. +1
    -1
      source/modules/juce_audio_devices/Makefile
  4. +0
    -25
      source/modules/juce_audio_devices/juce_audio_devices.mm
  5. +1
    -1
      source/modules/juce_audio_formats/Makefile
  6. +0
    -25
      source/modules/juce_audio_formats/juce_audio_formats.mm
  7. +1
    -1
      source/modules/juce_audio_processors/Makefile
  8. +0
    -25
      source/modules/juce_audio_processors/juce_audio_processors.mm
  9. +1
    -1
      source/modules/juce_core/Makefile
  10. +1
    -0
      source/modules/juce_core/juce_core.cpp
  11. +0
    -29
      source/modules/juce_core/juce_core.mm
  12. +0
    -25
      source/modules/juce_data_structures/juce_data_structures.mm
  13. +1
    -1
      source/modules/juce_events/Makefile
  14. +0
    -25
      source/modules/juce_events/juce_events.mm
  15. +1
    -1
      source/modules/juce_graphics/Makefile
  16. +0
    -25
      source/modules/juce_graphics/juce_graphics.mm
  17. +1
    -1
      source/modules/juce_gui_basics/Makefile
  18. +0
    -25
      source/modules/juce_gui_basics/juce_gui_basics.mm
  19. +1
    -1
      source/modules/juce_gui_extra/Makefile
  20. +0
    -25
      source/modules/juce_gui_extra/juce_gui_extra.mm

+ 1
- 1
source/modules/juce_audio_basics/Makefile View File

@@ -77,7 +77,7 @@ juce_audio_basics.cpp.%64.o: $(CPP_DEPS)


# -------------------------------------------------------------- # --------------------------------------------------------------


MM_DEPS = juce_audio_basics.mm juce_audio_basics.h AppConfig.h */*.cpp */*.h
MM_DEPS = juce_audio_basics.cpp juce_audio_basics.h AppConfig.h */*.cpp */*.h


juce_audio_basics.mm.o: $(MM_DEPS) juce_audio_basics.mm.o: $(MM_DEPS)
$(CXX) $< $(BUILD_CXX_FLAGS) -ObjC++ -c -o $@ $(CXX) $< $(BUILD_CXX_FLAGS) -ObjC++ -c -o $@


+ 0
- 25
source/modules/juce_audio_basics/juce_audio_basics.mm View File

@@ -1,25 +0,0 @@
/*
==============================================================================
This file is part of the JUCE library.
Copyright (c) 2013 - Raw Material Software Ltd.
Permission is granted to use this software under the terms of either:
a) the GPL v2 (or any later version)
b) the Affero GPL v3
Details of these licenses can be found at: www.gnu.org/licenses
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.
------------------------------------------------------------------------------
To release a closed-source product which uses JUCE, commercial licenses are
available: visit www.juce.com for more information.
==============================================================================
*/
#include "juce_audio_basics.cpp"

+ 1
- 1
source/modules/juce_audio_devices/Makefile View File

@@ -81,7 +81,7 @@ juce_audio_devices.cpp.%64.o: $(CPP_DEPS)


# -------------------------------------------------------------- # --------------------------------------------------------------


MM_DEPS = juce_audio_devices.mm juce_audio_devices.h AppConfig.h */*.mm */*.cpp */*.h
MM_DEPS = juce_audio_devices.cpp juce_audio_devices.h AppConfig.h */*.mm */*.cpp */*.h


juce_audio_devices.mm.o: $(MM_DEPS) juce_audio_devices.mm.o: $(MM_DEPS)
$(CXX) $< $(BUILD_CXX_FLAGS) -ObjC++ -c -o $@ $(CXX) $< $(BUILD_CXX_FLAGS) -ObjC++ -c -o $@


+ 0
- 25
source/modules/juce_audio_devices/juce_audio_devices.mm View File

@@ -1,25 +0,0 @@
/*
==============================================================================
This file is part of the JUCE library.
Copyright (c) 2013 - Raw Material Software Ltd.
Permission is granted to use this software under the terms of either:
a) the GPL v2 (or any later version)
b) the Affero GPL v3
Details of these licenses can be found at: www.gnu.org/licenses
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.
------------------------------------------------------------------------------
To release a closed-source product which uses JUCE, commercial licenses are
available: visit www.juce.com for more information.
==============================================================================
*/
#include "juce_audio_devices.cpp"

+ 1
- 1
source/modules/juce_audio_formats/Makefile View File

@@ -77,7 +77,7 @@ juce_audio_formats.cpp.%64.o: $(CPP_DEPS)


# -------------------------------------------------------------- # --------------------------------------------------------------


MM_DEPS = juce_audio_formats.mm juce_audio_formats.h AppConfig.h */*.cpp */*.h
MM_DEPS = juce_audio_formats.cpp juce_audio_formats.h AppConfig.h */*.cpp */*.h


juce_audio_formats.mm.o: $(MM_DEPS) juce_audio_formats.mm.o: $(MM_DEPS)
$(CXX) $< $(BUILD_CXX_FLAGS) -ObjC++ -c -o $@ $(CXX) $< $(BUILD_CXX_FLAGS) -ObjC++ -c -o $@


+ 0
- 25
source/modules/juce_audio_formats/juce_audio_formats.mm View File

@@ -1,25 +0,0 @@
/*
==============================================================================
This file is part of the JUCE library.
Copyright (c) 2013 - Raw Material Software Ltd.
Permission is granted to use this software under the terms of either:
a) the GPL v2 (or any later version)
b) the Affero GPL v3
Details of these licenses can be found at: www.gnu.org/licenses
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.
------------------------------------------------------------------------------
To release a closed-source product which uses JUCE, commercial licenses are
available: visit www.juce.com for more information.
==============================================================================
*/
#include "juce_audio_formats.cpp"

+ 1
- 1
source/modules/juce_audio_processors/Makefile View File

@@ -89,7 +89,7 @@ juce_audio_processors.cpp.%64.o: $(CPP_DEPS)


# -------------------------------------------------------------- # --------------------------------------------------------------


MM_DEPS = juce_audio_processors.mm juce_audio_processors.h AppConfig.h */*.mm */*.cpp */*.h
MM_DEPS = juce_audio_processors.cpp juce_audio_processors.h AppConfig.h */*.mm */*.cpp */*.h


juce_audio_processors.mm.o: $(MM_DEPS) juce_audio_processors.mm.o: $(MM_DEPS)
$(CXX) $< $(BUILD_CXX_FLAGS) -ObjC++ -c -o $@ $(CXX) $< $(BUILD_CXX_FLAGS) -ObjC++ -c -o $@


+ 0
- 25
source/modules/juce_audio_processors/juce_audio_processors.mm View File

@@ -1,25 +0,0 @@
/*
==============================================================================
This file is part of the JUCE library.
Copyright (c) 2013 - Raw Material Software Ltd.
Permission is granted to use this software under the terms of either:
a) the GPL v2 (or any later version)
b) the Affero GPL v3
Details of these licenses can be found at: www.gnu.org/licenses
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.
------------------------------------------------------------------------------
To release a closed-source product which uses JUCE, commercial licenses are
available: visit www.juce.com for more information.
==============================================================================
*/
#include "juce_audio_processors.cpp"

+ 1
- 1
source/modules/juce_core/Makefile View File

@@ -77,7 +77,7 @@ juce_core.cpp.%64.o: $(CPP_DEPS)


# -------------------------------------------------------------- # --------------------------------------------------------------


MM_DEPS = juce_core.mm juce_core.h AppConfig.h */*.mm */*.cpp */*.h
MM_DEPS = juce_core.cpp juce_core.h AppConfig.h */*.mm */*.cpp */*.h


juce_core.mm.o: $(MM_DEPS) juce_core.mm.o: $(MM_DEPS)
$(CXX) $< $(BUILD_CXX_FLAGS) -ObjC++ -c -o $@ $(CXX) $< $(BUILD_CXX_FLAGS) -ObjC++ -c -o $@


+ 1
- 0
source/modules/juce_core/juce_core.cpp View File

@@ -95,6 +95,7 @@
#endif #endif
#if JUCE_MAC || JUCE_IOS #if JUCE_MAC || JUCE_IOS
#include <execinfo.h>
#include <xlocale.h> #include <xlocale.h>
#include <mach/mach.h> #include <mach/mach.h>
#endif #endif


+ 0
- 29
source/modules/juce_core/juce_core.mm View File

@@ -1,29 +0,0 @@
/*
==============================================================================
This file is part of the juce_core module of the JUCE library.
Copyright (c) 2013 - Raw Material Software Ltd.
Permission to use, copy, modify, and/or distribute this software for any purpose with
or without fee is hereby granted, provided that the above copyright notice and this
permission notice appear in all copies.
THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD
TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN
NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
------------------------------------------------------------------------------
NOTE! This permissive ISC license applies ONLY to files within the juce_core module!
All other JUCE modules are covered by a dual GPL/commercial license, so if you are
using any other modules, be sure to check that you also comply with their license.
For more details, visit www.juce.com
==============================================================================
*/
#include "juce_core.cpp"

+ 0
- 25
source/modules/juce_data_structures/juce_data_structures.mm View File

@@ -1,25 +0,0 @@
/*
==============================================================================
This file is part of the JUCE library.
Copyright (c) 2013 - Raw Material Software Ltd.
Permission is granted to use this software under the terms of either:
a) the GPL v2 (or any later version)
b) the Affero GPL v3
Details of these licenses can be found at: www.gnu.org/licenses
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.
------------------------------------------------------------------------------
To release a closed-source product which uses JUCE, commercial licenses are
available: visit www.juce.com for more information.
==============================================================================
*/
#include "juce_data_structures.cpp"

+ 1
- 1
source/modules/juce_events/Makefile View File

@@ -77,7 +77,7 @@ juce_events.cpp.%64.o: $(CPP_DEPS)


# -------------------------------------------------------------- # --------------------------------------------------------------


MM_DEPS = juce_events.mm juce_events.h AppConfig.h */*.mm */*.cpp */*.h
MM_DEPS = juce_events.cpp juce_events.h AppConfig.h */*.mm */*.cpp */*.h


juce_events.mm.o: $(MM_DEPS) juce_events.mm.o: $(MM_DEPS)
$(CXX) $< $(BUILD_CXX_FLAGS) -ObjC++ -c -o $@ $(CXX) $< $(BUILD_CXX_FLAGS) -ObjC++ -c -o $@


+ 0
- 25
source/modules/juce_events/juce_events.mm View File

@@ -1,25 +0,0 @@
/*
==============================================================================
This file is part of the JUCE library.
Copyright (c) 2013 - Raw Material Software Ltd.
Permission is granted to use this software under the terms of either:
a) the GPL v2 (or any later version)
b) the Affero GPL v3
Details of these licenses can be found at: www.gnu.org/licenses
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.
------------------------------------------------------------------------------
To release a closed-source product which uses JUCE, commercial licenses are
available: visit www.juce.com for more information.
==============================================================================
*/
#include "juce_events.cpp"

+ 1
- 1
source/modules/juce_graphics/Makefile View File

@@ -77,7 +77,7 @@ juce_graphics.cpp.%64.o: $(CPP_DEPS)


# -------------------------------------------------------------- # --------------------------------------------------------------


MM_DEPS = juce_graphics.mm juce_graphics.h AppConfig.h */*.mm */*.cpp */*.h
MM_DEPS = juce_graphics.cpp juce_graphics.h AppConfig.h */*.mm */*.cpp */*.h


juce_graphics.mm.o: $(MM_DEPS) juce_graphics.mm.o: $(MM_DEPS)
$(CXX) $< $(BUILD_CXX_FLAGS) -ObjC++ -c -o $@ $(CXX) $< $(BUILD_CXX_FLAGS) -ObjC++ -c -o $@


+ 0
- 25
source/modules/juce_graphics/juce_graphics.mm View File

@@ -1,25 +0,0 @@
/*
==============================================================================
This file is part of the JUCE library.
Copyright (c) 2013 - Raw Material Software Ltd.
Permission is granted to use this software under the terms of either:
a) the GPL v2 (or any later version)
b) the Affero GPL v3
Details of these licenses can be found at: www.gnu.org/licenses
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.
------------------------------------------------------------------------------
To release a closed-source product which uses JUCE, commercial licenses are
available: visit www.juce.com for more information.
==============================================================================
*/
#include "juce_graphics.cpp"

+ 1
- 1
source/modules/juce_gui_basics/Makefile View File

@@ -77,7 +77,7 @@ juce_gui_basics.cpp.%64.o: $(CPP_DEPS)


# -------------------------------------------------------------- # --------------------------------------------------------------


MM_DEPS = juce_gui_basics.mm juce_gui_basics.h AppConfig.h */*.mm */*.cpp */*.h
MM_DEPS = juce_gui_basics.cpp juce_gui_basics.h AppConfig.h */*.mm */*.cpp */*.h


juce_gui_basics.mm.o: $(MM_DEPS) juce_gui_basics.mm.o: $(MM_DEPS)
$(CXX) $< $(BUILD_CXX_FLAGS) -ObjC++ -c -o $@ $(CXX) $< $(BUILD_CXX_FLAGS) -ObjC++ -c -o $@


+ 0
- 25
source/modules/juce_gui_basics/juce_gui_basics.mm View File

@@ -1,25 +0,0 @@
/*
==============================================================================
This file is part of the JUCE library.
Copyright (c) 2013 - Raw Material Software Ltd.
Permission is granted to use this software under the terms of either:
a) the GPL v2 (or any later version)
b) the Affero GPL v3
Details of these licenses can be found at: www.gnu.org/licenses
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.
------------------------------------------------------------------------------
To release a closed-source product which uses JUCE, commercial licenses are
available: visit www.juce.com for more information.
==============================================================================
*/
#include "juce_gui_basics.cpp"

+ 1
- 1
source/modules/juce_gui_extra/Makefile View File

@@ -77,7 +77,7 @@ juce_gui_extra.cpp.%64.o: $(CPP_DEPS)


# -------------------------------------------------------------- # --------------------------------------------------------------


MM_DEPS = juce_gui_extra.mm juce_gui_extra.h AppConfig.h */*.mm */*.cpp */*.h
MM_DEPS = juce_gui_extra.cpp juce_gui_extra.h AppConfig.h */*.mm */*.cpp */*.h


juce_gui_extra.mm.o: $(MM_DEPS) juce_gui_extra.mm.o: $(MM_DEPS)
$(CXX) $< $(BUILD_CXX_FLAGS) -ObjC++ -c -o $@ $(CXX) $< $(BUILD_CXX_FLAGS) -ObjC++ -c -o $@


+ 0
- 25
source/modules/juce_gui_extra/juce_gui_extra.mm View File

@@ -1,25 +0,0 @@
/*
==============================================================================
This file is part of the JUCE library.
Copyright (c) 2013 - Raw Material Software Ltd.
Permission is granted to use this software under the terms of either:
a) the GPL v2 (or any later version)
b) the Affero GPL v3
Details of these licenses can be found at: www.gnu.org/licenses
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.
------------------------------------------------------------------------------
To release a closed-source product which uses JUCE, commercial licenses are
available: visit www.juce.com for more information.
==============================================================================
*/
#include "juce_gui_extra.cpp"

Loading…
Cancel
Save