|
 |
3e6c483 |
diff -rupN ZynAddSubFX-2.4.2.old/ExternalPrograms/Controller/Makefile ZynAddSubFX-2.4.2/ExternalPrograms/Controller/Makefile
|
|
|
3e6c483 |
--- ZynAddSubFX-2.4.2.old/ExternalPrograms/Controller/Makefile 2012-02-26 13:37:11.000000000 -0500
|
|
|
3e6c483 |
+++ ZynAddSubFX-2.4.2/ExternalPrograms/Controller/Makefile 2012-03-08 21:32:16.843988193 -0500
|
|
|
3e6c483 |
@@ -1,17 +1,17 @@
|
|
|
3e6c483 |
controller: main.o Controller.o ControllerUI.o
|
|
|
3e6c483 |
- gcc -o controller *.o `fltk-config --ldflags` -lasound -lpthread -lm -lstdc++
|
|
|
3e6c483 |
+ gcc $(CFLAGS) -o controller *.o `fltk-config --ldflags` -lasound -lpthread -lm -lstdc++
|
|
|
3e6c483 |
|
|
|
3e6c483 |
ControllerUI.cxx ControllerUI.h: ControllerUI.fl
|
|
|
3e6c483 |
fluid -c ControllerUI.fl
|
|
|
3e6c483 |
|
|
|
3e6c483 |
ControllerUI.o: ControllerUI.cxx ControllerUI.h
|
|
|
3e6c483 |
- gcc `fltk-config --cflags` -c ControllerUI.cxx -o ControllerUI.o
|
|
|
3e6c483 |
+ gcc $(CFLAGS) `fltk-config --cflags` -c ControllerUI.cxx -o ControllerUI.o
|
|
|
3e6c483 |
|
|
|
3e6c483 |
Controller.o: Controller.C Controller.h
|
|
|
3e6c483 |
- gcc `fltk-config --cflags` -c Controller.C -o Controller.o
|
|
|
3e6c483 |
+ gcc $(CFLAGS) `fltk-config --cflags` -c Controller.C -o Controller.o
|
|
|
3e6c483 |
|
|
|
3e6c483 |
main.o: main.C Controller.h ControllerUI.h
|
|
|
3e6c483 |
- gcc `fltk-config --cflags` -c main.C -o main.o
|
|
|
3e6c483 |
+ gcc $(CFLAGS) `fltk-config --cflags` -c main.C -o main.o
|
|
|
3e6c483 |
|
|
|
3e6c483 |
clean:
|
|
|
3e6c483 |
rm -f *.o controller ControllerUI.cxx ControllerUI.h
|
|
|
3e6c483 |
diff -rupN ZynAddSubFX-2.4.2.old/ExternalPrograms/Spliter/Makefile ZynAddSubFX-2.4.2/ExternalPrograms/Spliter/Makefile
|
|
|
3e6c483 |
--- ZynAddSubFX-2.4.2.old/ExternalPrograms/Spliter/Makefile 2012-02-26 13:37:11.000000000 -0500
|
|
|
3e6c483 |
+++ ZynAddSubFX-2.4.2/ExternalPrograms/Spliter/Makefile 2012-03-08 21:33:39.109571039 -0500
|
|
|
3e6c483 |
@@ -1,17 +1,17 @@
|
|
|
3e6c483 |
spliter: main.o Spliter.o SpliterUI.o
|
|
|
3e6c483 |
- gcc -o spliter *.o `fltk-config --ldflags` -lasound -lstdc++
|
|
|
3e6c483 |
+ gcc $(CFLAGS) -o spliter *.o `fltk-config --ldflags` -lasound -lstdc++ -lpthread
|
|
|
3e6c483 |
|
|
|
3e6c483 |
SplitterUI.cxx SpliterUI.h: SpliterUI.fl
|
|
|
3e6c483 |
fluid -c SpliterUI.fl
|
|
|
3e6c483 |
|
|
|
3e6c483 |
SpliterUI.o: SplitterUI.cxx SpliterUI.h
|
|
|
3e6c483 |
- gcc -g `fltk-config --cflags` -c SpliterUI.cxx -o SpliterUI.o
|
|
|
3e6c483 |
+ gcc $(CFLAGS) -g `fltk-config --cflags` -c SpliterUI.cxx -o SpliterUI.o
|
|
|
3e6c483 |
|
|
|
3e6c483 |
Spliter.o: Spliter.C Spliter.h
|
|
|
3e6c483 |
- gcc -g `fltk-config --cflags` -c Spliter.C -o Spliter.o
|
|
|
3e6c483 |
+ gcc $(CFLAGS) -g `fltk-config --cflags` -c Spliter.C -o Spliter.o
|
|
|
3e6c483 |
|
|
|
3e6c483 |
main.o: main.C Spliter.h SpliterUI.h
|
|
|
3e6c483 |
- gcc -g `fltk-config --cflags` -c main.C -o main.o
|
|
|
3e6c483 |
+ gcc $(CFLAGS) -g `fltk-config --cflags` -c main.C -o main.o
|
|
|
3e6c483 |
|
|
|
3e6c483 |
clean:
|
|
|
3e6c483 |
rm -f *.o spliter SpliterUI.cxx SpliterUI.h
|
|
 |
b753e83 |
diff -Nurp zynaddsubfx-2.4.4.old/src/CMakeLists.txt zynaddsubfx-2.4.4.p/src/CMakeLists.txt
|
|
|
b753e83 |
--- zynaddsubfx-2.4.4.old/src/CMakeLists.txt 2014-06-28 01:43:43.000000000 +0200
|
|
|
b753e83 |
+++ zynaddsubfx-2.4.4.p/src/CMakeLists.txt 2014-06-29 21:13:38.608887395 +0200
|
|
|
b753e83 |
@@ -123,6 +123,7 @@ endif()
|
|
|
3e6c483 |
option (BuildForAMD_X86_64 "Build for AMD x86_64 system" OFF)
|
|
|
3e6c483 |
option (BuildForCore2_X86_64 "Build for Intel Core2 x86_64 system" OFF)
|
|
|
3e6c483 |
option (BuildForDebug "Include gdb debugging support" OFF)
|
|
|
3e6c483 |
+option (X86Build "Build for X86 family" OFF)
|
|
|
3e6c483 |
|
|
|
3e6c483 |
set(CMAKE_BUILD_TYPE "Release")
|
|
|
3e6c483 |
|
|
|
b753e83 |
@@ -137,7 +138,7 @@ set (BuildOptions_X86_64Core2
|
|
|
3e6c483 |
)
|
|
|
3e6c483 |
|
|
|
3e6c483 |
set (BuildOptionsBasic
|
|
|
3e6c483 |
- "-O3 -msse -msse2 -mfpmath=sse -ffast-math -fomit-frame-pointer"
|
|
|
b753e83 |
+ "-O3 -ffast-math -fomit-frame-pointer"
|
|
|
3e6c483 |
CACHE STRING "basic X86 complier options"
|
|
|
3e6c483 |
)
|
|
|
3e6c483 |
|
|
|
b753e83 |
@@ -205,17 +206,17 @@ endif()
|
|
|
3e6c483 |
|
|
|
3e6c483 |
if (BuildForDebug)
|
|
|
3e6c483 |
set (CMAKE_BUILD_TYPE "Debug")
|
|
|
3e6c483 |
- set (CMAKE_CXX_FLAGS_DEBUG ${BuildOptionsDebug})
|
|
|
3e6c483 |
+ set (CMAKE_CXX_FLAGS_DEBUG "${BuildOptionsDebug} ${CMAKE_CXX_FLAGS}")
|
|
|
3e6c483 |
message (STATUS "Building for ${CMAKE_BUILD_TYPE}, flags: ${CMAKE_CXX_FLAGS_DEBUG}")
|
|
|
3e6c483 |
else (BuildForDebug)
|
|
|
3e6c483 |
set (CMAKE_BUILD_TYPE "Release")
|
|
|
3e6c483 |
if (BuildForAMD_X86_64)
|
|
|
3e6c483 |
- set (CMAKE_CXX_FLAGS_RELEASE ${BuildOptions_x86_64AMD})
|
|
|
3e6c483 |
+ set (CMAKE_CXX_FLAGS_RELEASE "${BuildOptions_x86_64AMD} ${CMAKE_CXX_FLAGS}")
|
|
|
3e6c483 |
else (BuildForAMD_X86_64)
|
|
|
3e6c483 |
if (BuildForCore2_X86_64)
|
|
|
3e6c483 |
- set (CMAKE_CXX_FLAGS_RELEASE ${BuildOptions_X86_64Core2})
|
|
|
3e6c483 |
+ set (CMAKE_CXX_FLAGS_RELEASE "${BuildOptions_X86_64Core2} ${CMAKE_CXX_FLAGS}")
|
|
|
3e6c483 |
else (BuildForCore2_X86_64)
|
|
|
3e6c483 |
- set (CMAKE_CXX_FLAGS_RELEASE ${BuildOptionsBasic})
|
|
|
3e6c483 |
+ set (CMAKE_CXX_FLAGS_RELEASE "${BuildOptionsBasic} ${CMAKE_CXX_FLAGS}")
|
|
|
3e6c483 |
endif (BuildForCore2_X86_64)
|
|
|
3e6c483 |
endif (BuildForAMD_X86_64)
|
|
|
3e6c483 |
message (STATUS "Building for ${CMAKE_BUILD_TYPE}, flags: ${CMAKE_CXX_FLAGS_RELEASE}")
|