Skip to content

Commit 6056ccd

Browse files
aacuevasaacuevas
committed
Fix some makefile options
1 parent e99e095 commit 6056ccd

7 files changed

Lines changed: 7 additions & 17 deletions

File tree

‎Builds/MacOSX/Makefile.plugins‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,12 @@ ifeq ($(CONFIG),Release)
3939
TARGET_ARCH := -march=native
4040
endif
4141

42-
CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "NDEBUG=1" -D "OEPLUGIN" -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=0.3.5" -D "JUCE_APP_VERSION_HEX=0x305" -I /usr/include -I /usr/include/freetype2 -I $(CURDIR)../../JuceLibraryCode -I $(CURDIR)../../JuceLibraryCode/modules
43-
CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -O3 -g -pg -std=c++0x -fPIC -rdynamic
42+
CPPFLAGS := $(DEPFLAGS) -D "NDEBUG=1" -D "OEPLUGIN" -D "JUCER_XCODE_MAC_F6D2F4CF=1" -D "JUCE_APP_VERSION=0.3.5" -D "JUCE_APP_VERSION_HEX=0x305" -I $(CURDIR)../../JuceLibraryCode -I $(CURDIR)../../JuceLibraryCode/modules
43+
CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -O3 -g -std=c++0x -fPIC
4444
CXXFLAGS += $(CFLAGS)
45-
LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR) -fvisibility=hidden -L/usr/X11R6/lib/ -lGL -lX11 -lXext -lXinerama -lasound -ldl -lfreetype -lpthread -lrt -pg -ldl -lXext -lGLU -fPIC -rdynamic
45+
LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR) -fvisibility=hidden -ldl -lpthread -ldl -fPIC -rdynamic -dynamiclib -undefined dynamic_lookup
4646
LDDEPS1 :=
47-
RESFLAGS := -D "LINUX=1" -D "NDEBUG=1" -D "OEPLUGIN" -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=0.3.5" -D "JUCE_APP_VERSION_HEX=0x305" -I /usr/include -I /usr/include/freetype2 -I $(CURDIR)../../JuceLibraryCode -I $(CURDIR)../../JuceLibraryCode/modules
47+
RESFLAGS := -D "NDEBUG=1" -D "OEPLUGIN" -D "JUCER_XCODE_MAC_F6D2F4CF=1" -D "JUCE_APP_VERSION=0.3.5" -D "JUCE_APP_VERSION_HEX=0x305" -I /usr/include -I /usr/include/freetype2 -I $(CURDIR)../../JuceLibraryCode -I $(CURDIR)../../JuceLibraryCode/modules
4848
CLEANCMD = rm -rf $(OUTDIR)/* $(OBJDIR)
4949
endif
5050

‎Builds/MacOSX/open-ephys.xcodeproj/project.pbxproj‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1125,7 +1125,6 @@
11251125
DCA17BBB4FC31AAE9DC34DE9 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_FileFilter.cpp"; path = "../../JuceLibraryCode/modules/juce_core/files/juce_FileFilter.cpp"; sourceTree = "SOURCE_ROOT"; };
11261126
DCF6696CA1463CD8557E1FFE = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_LookAndFeel_V1.cpp"; path = "../../JuceLibraryCode/modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V1.cpp"; sourceTree = "SOURCE_ROOT"; };
11271127
DD5695DE97CEF7BE76869232 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_FileOutputStream.cpp"; path = "../../JuceLibraryCode/modules/juce_core/files/juce_FileOutputStream.cpp"; sourceTree = "SOURCE_ROOT"; };
1128-
DDD708C7DBA729D2550B40BF = {isa = PBXFileReference; lastKnownFileType = "file.h~"; name = "juce_StandardHeader.h~"; path = "../../JuceLibraryCode/modules/juce_core/system/juce_StandardHeader.h~"; sourceTree = "SOURCE_ROOT"; };
11291128
DDE157BB06373ECDBB23469C = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_StretchableLayoutManager.h"; path = "../../JuceLibraryCode/modules/juce_gui_basics/layout/juce_StretchableLayoutManager.h"; sourceTree = "SOURCE_ROOT"; };
11301129
DDE89F0D5E01F079323CC89C = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_AudioProcessorPlayer.h"; path = "../../JuceLibraryCode/modules/juce_audio_utils/players/juce_AudioProcessorPlayer.h"; sourceTree = "SOURCE_ROOT"; };
11311130
DE4861552DB1976665B25DFD = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_HighResolutionTimer.cpp"; path = "../../JuceLibraryCode/modules/juce_core/threads/juce_HighResolutionTimer.cpp"; sourceTree = "SOURCE_ROOT"; };
@@ -1925,7 +1924,6 @@
19251924
9D740F320C13F9B82EB64461 = {isa = PBXGroup; children = (
19261925
7F17077973FFDD70C4B78E7E,
19271926
A5E8E0CF6DA1AEAEE9D872DE,
1928-
DDD708C7DBA729D2550B40BF,
19291927
9978BC2A359BC506F69E545F,
19301928
DB4F34DA0F04B40EB6A50FB1,
19311929
C446923C1950EB5BE5E67F15, ); name = system; sourceTree = "<group>"; };
@@ -2680,7 +2678,7 @@
26802678
INSTALL_PATH = "$(HOME)/Applications";
26812679
LIBRARY_SEARCH_PATHS = ("$(inherited)", "\"/opt/local/lib\"", "\"/usr/local/lib\"");
26822680
MACOSX_DEPLOYMENT_TARGET_ppc = 10.4;
2683-
OTHER_CPLUSPLUSFLAGS = "-rdynamic";
2681+
OTHER_CPLUSPLUSFLAGS = "-fPIC";
26842682
OTHER_LDFLAGS = "-ldl -fPIC -rdynamic";
26852683
SDKROOT_ppc = macosx10.5; }; name = Debug; };
26862684
7A6F9B742B69F66DC3E29FA8 = {isa = XCBuildConfiguration; buildSettings = {
@@ -2704,7 +2702,7 @@
27042702
INSTALL_PATH = "$(HOME)/Applications";
27052703
LIBRARY_SEARCH_PATHS = ("$(inherited)", "\"/opt/local/lib\"", "\"/usr/local/lib\"");
27062704
MACOSX_DEPLOYMENT_TARGET_ppc = 10.4;
2707-
OTHER_CPLUSPLUSFLAGS = "-rdynamic";
2705+
OTHER_CPLUSPLUSFLAGS = "-fPIC";
27082706
OTHER_LDFLAGS = "-ldl -fPIC -rdynamic";
27092707
SDKROOT_ppc = macosx10.5; }; name = Release; };
27102708
C8018C9A4DA633CA60663294 = {isa = XCBuildConfiguration; buildSettings = {

‎Builds/VisualStudio2012/open-ephys.vcxproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2062,7 +2062,6 @@
20622062
<None Include="..\..\JuceLibraryCode\modules\juce_audio_formats\juce_module_info"/>
20632063
<None Include="..\..\JuceLibraryCode\modules\juce_audio_processors\juce_module_info"/>
20642064
<None Include="..\..\JuceLibraryCode\modules\juce_audio_utils\juce_module_info"/>
2065-
<None Include="..\..\JuceLibraryCode\modules\juce_core\system\juce_StandardHeader.h~"/>
20662065
<None Include="..\..\JuceLibraryCode\modules\juce_core\juce_module_info"/>
20672066
<None Include="..\..\JuceLibraryCode\modules\juce_cryptography\juce_module_info"/>
20682067
<None Include="..\..\JuceLibraryCode\modules\juce_data_structures\juce_module_info"/>

‎Builds/VisualStudio2012/open-ephys.vcxproj.filters‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3668,9 +3668,6 @@
36683668
<None Include="..\..\JuceLibraryCode\modules\juce_audio_utils\juce_module_info">
36693669
<Filter>Juce Modules\juce_audio_utils</Filter>
36703670
</None>
3671-
<None Include="..\..\JuceLibraryCode\modules\juce_core\system\juce_StandardHeader.h~">
3672-
<Filter>Juce Modules\juce_core\system</Filter>
3673-
</None>
36743671
<None Include="..\..\JuceLibraryCode\modules\juce_core\juce_module_info">
36753672
<Filter>Juce Modules\juce_core</Filter>
36763673
</None>

‎Builds/VisualStudio2013/open-ephys.vcxproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2066,7 +2066,6 @@
20662066
<None Include="..\..\JuceLibraryCode\modules\juce_audio_formats\juce_module_info"/>
20672067
<None Include="..\..\JuceLibraryCode\modules\juce_audio_processors\juce_module_info"/>
20682068
<None Include="..\..\JuceLibraryCode\modules\juce_audio_utils\juce_module_info"/>
2069-
<None Include="..\..\JuceLibraryCode\modules\juce_core\system\juce_StandardHeader.h~"/>
20702069
<None Include="..\..\JuceLibraryCode\modules\juce_core\juce_module_info"/>
20712070
<None Include="..\..\JuceLibraryCode\modules\juce_cryptography\juce_module_info"/>
20722071
<None Include="..\..\JuceLibraryCode\modules\juce_data_structures\juce_module_info"/>

‎Builds/VisualStudio2013/open-ephys.vcxproj.filters‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3668,9 +3668,6 @@
36683668
<None Include="..\..\JuceLibraryCode\modules\juce_audio_utils\juce_module_info">
36693669
<Filter>Juce Modules\juce_audio_utils</Filter>
36703670
</None>
3671-
<None Include="..\..\JuceLibraryCode\modules\juce_core\system\juce_StandardHeader.h~">
3672-
<Filter>Juce Modules\juce_core\system</Filter>
3673-
</None>
36743671
<None Include="..\..\JuceLibraryCode\modules\juce_core\juce_module_info">
36753672
<Filter>Juce Modules\juce_core</Filter>
36763673
</None>

‎open-ephys.jucer‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<EXPORTFORMATS>
1414
<XCODE_MAC targetFolder="Builds/MacOSX" vstFolder="~/SDKs/vstsdk2.4" rtasFolder="~/SDKs/PT_80_SDK"
1515
extraLinkerFlags="-ldl -fPIC -rdynamic" objCExtraSuffix="fea2mT"
16-
extraDefs="" extraCompilerFlags="-rdynamic ">
16+
extraDefs="" extraCompilerFlags="-fPIC ">
1717
<CONFIGURATIONS>
1818
<CONFIGURATION name="Debug" isDebug="1" optimisation="3" targetName="open-ephys"
1919
osxSDK="default" osxCompatibility="default" osxArchitecture="default"

0 commit comments

Comments
 (0)