AMD64 build support

AMD64 needs some -fPICs to build correctly

diff --git a/alg/CMakeLists.txt b/alg/CMakeLists.txt
index 48164b94eeb19c8c3340597c970e3d4bc53204c7..299a3f3cb144931800d1ab1447b34b2a5e1a5f67 100644 (file)
--- a/alg/CMakeLists.txt
+++ b/alg/CMakeLists.txt
@@ -24,14 +24,17 @@ SET(SOURCES annotation_colors.cpp
             sequence.cpp)
 
 ADD_LIBRARY( mussa_core STATIC ${SOURCES} ${MOC_SOURCES})
-INCLUDE_DIRECTORIES(${OPENGL_INCLUDE_DIR})
-INCLUDE_DIRECTORIES(${BOOST_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(${OPENGL_INCLUDE_DIR}
+                    ${BOOST_INCLUDE_DIR}
+                    ${QT_INCLUDES})
+
 TARGET_LINK_LIBRARIES(mussa_core 
                         ${OPEN_gl_LIBRARY}
                         ${QT_LIBRARIES})
 
 # these are really only needed for gcc on AMD64
-SET_SOURCE_FILES_PROPERTIES(${SOURCES} PROPERTIES COMPILE_FLAGS "-fPIC")
+SET_SOURCE_FILES_PROPERTIES(${SOURCES} ${MOC_SOURCES} 
+                            PROPERTIES COMPILE_FLAGS "-fPIC")
 SET_TARGET_PROPERTIES(mussa_core PROPERTIES COMPILE_FLAGS "-fPIC")
 
 ADD_SUBDIRECTORY( test )

diff --git a/qui/CMakeLists.txt b/qui/CMakeLists.txt
index c38f1dab59186680bb30b1dc34588395321ea4e8..2b5f0a82ec4534b0cc9aa0b9b1d00507dc414571 100644 (file)
--- a/qui/CMakeLists.txt
+++ b/qui/CMakeLists.txt
@@ -60,17 +60,20 @@ SET(MAIN_SOURCES
       mussagl.cpp)
 SET(RCCS ../icons.qrc)
 
-QT4_ADD_RESOURCES(RCC_SOURCE ${RCCS})
+QT4_ADD_RESOURCES(RCC_SOURCES ${RCCS})
 QT4_WRAP_CPP(MOC_SOURCES ${MOC_HEADERS})
 SET(SOURCES  ${MOC_SOURCES} ${GUI_SOURCES} ${RCC_SOURCES} ${MAIN_SOURCES})
+
+# these are really only needed for gcc on AMD64
 INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_PATH} 
                     ${QT_INCLUDES})
 
-ADD_LIBRARY(mussa_qui STATIC ${MOC_SOURCES} ${GUI_SOURCES} ${RCC_SOURCE})
+ADD_LIBRARY(mussa_qui STATIC ${SOURCES})
 TARGET_LINK_LIBRARIES(mussa_qui 
                         mussa_core)
+
 ADD_EXECUTABLE(mussagl WIN32 MACOSX_BUNDLE ${MAIN_SOURCES} )
-# ${SOURCES} ${MOC_SOURCES} ${RCC_SOURCE} )
+
 LINK_DIRECTORIES(${MUSSA_BINARY_DIR}/alg
                  ${MUSSA_BINARY_DIR}/py)
 TARGET_LINK_LIBRARIES(mussagl 
@@ -93,3 +96,7 @@ IF(USE_PYTHON)
                         )
 ENDIF(USE_PYTHON)
 
+# these are needed for AMD64 systems but don't hurt on 32bit
+SET_SOURCE_FILES_PROPERTIES(${SOURCES} PROPERTIES COMPILE_FLAGS "-fPIC")
+SET_TARGET_PROPERTIES(mussa_qui PROPERTIES COMPILE_FLAGS "-fPIC")
+SET_TARGET_PROPERTIES(mussagl PROPERTIES COMPILE_FLAGS "-fPIC")