Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

WIP[win64]: it builds, runs. webkit disabled in cmake for now

Browse Source
This commit is contained in:
Latif Khalifa
2013-10-20 17:03:48 +02:00
parent 6bae4a8d92
commit 17c59f25f5
14 changed files with 253 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
indra/plugins/CMakeLists.txt
View File

@@ -3,7 +3,10 @@
add_subdirectory(base_basic)
add_subdirectory(base_media)
add_subdirectory(filepicker)
# Singu TODO::WIN64
if (NOT WINDOWS OR WORD_SIZE EQUAL 32)
add_subdirectory(webkit)
endif (NOT WINDOWS OR WORD_SIZE EQUAL 32)
if (LINUX)
add_subdirectory(gstreamer010)
@@ -13,9 +16,9 @@ if (WINDOWS OR DARWIN)
add_subdirectory(quicktime)
endif (WINDOWS OR DARWIN)
if (WINDOWS)
if (WINDOWS AND WORD_SIZE EQUAL 32)
add_subdirectory(winmmshim)
endif (WINDOWS)
endif (WINDOWS AND WORD_SIZE EQUAL 32)
add_subdirectory(example_basic)
add_subdirectory(example_media)

2
indra/plugins/base_basic/CMakeLists.txt
View File

@@ -17,7 +17,7 @@ include_directories(
if(NOT WORD_SIZE EQUAL 32)
if(WINDOWS)
add_definitions(/FIXED:NO)
# add_definitions(/FIXED:NO)
else(WINDOWS) # not windows therefore gcc LINUX and DARWIN
add_definitions(-fPIC)
endif(WINDOWS)

2
indra/plugins/base_media/CMakeLists.txt
View File

@@ -31,7 +31,7 @@ include_directories(
if(NOT WORD_SIZE EQUAL 32)
if(WINDOWS)
add_definitions(/FIXED:NO)
# add_definitions(/FIXED:NO)
else(WINDOWS) # not windows therefore gcc LINUX and DARWIN
add_definitions(-fPIC)
endif(WINDOWS)

2
indra/plugins/example_basic/CMakeLists.txt
View File

@@ -19,7 +19,7 @@ include_directories(
if(NOT WORD_SIZE EQUAL 32)
if(WINDOWS)
add_definitions(/FIXED:NO)
# add_definitions(/FIXED:NO)
else(WINDOWS) # not windows therefore gcc LINUX and DARWIN
add_definitions(-fPIC)
endif(WINDOWS)

2
indra/plugins/example_media/CMakeLists.txt
View File

@@ -30,7 +30,7 @@ include_directories(
if(NOT WORD_SIZE EQUAL 32)
if(WINDOWS)
add_definitions(/FIXED:NO)
# add_definitions(/FIXED:NO)
else(WINDOWS) # not windows therefore gcc LINUX and DARWIN
add_definitions(-fPIC)
endif(WINDOWS)

2
indra/plugins/filepicker/CMakeLists.txt
View File

@@ -25,7 +25,7 @@ include_directories(
if(NOT WORD_SIZE EQUAL 32)
if(WINDOWS)
add_definitions(/FIXED:NO)
# add_definitions(/FIXED:NO)
else(WINDOWS) # not windows therefore gcc LINUX and DARWIN
add_definitions(-fPIC)
endif(WINDOWS)

2
indra/plugins/webkit/CMakeLists.txt
View File

@@ -35,7 +35,7 @@ include_directories(
if(NOT WORD_SIZE EQUAL 32)
if(WINDOWS)
add_definitions(/FIXED:NO)
# add_definitions(/FIXED:NO)
else(WINDOWS) # not windows therefore gcc LINUX and DARWIN
add_definitions(-fPIC)
endif(WINDOWS)