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

Improvements!

Browse Source 
Fixed Boost library to not throw warnings
Changed PNG cmake slightly
Updated 32lib package for correct locations
Cleaned up flags a bit for linux64
This commit is contained in:
Drake Arconis
2012-07-19 17:44:13 -04:00
parent 39847c4688
commit 8bfdc98ef4
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
indra/cmake/00-Common.cmake
View File

@@ -190,10 +190,10 @@ if (LINUX)
endif (NOT STANDALONE) endif (NOT STANDALONE)
if (${ARCH} STREQUAL "x86_64") if (${ARCH} STREQUAL "x86_64")
add_definitions(-DLINUX64=1 -pipe) add_definitions(-DLINUX64=1 -pipe)
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fomit-frame-pointer -mmmx -msse -mfpmath=sse -msse2 -ffast-math -ftree-vectorize -fweb -fexpensive-optimizations -frename-registers") set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fomit-frame-pointer -ffast-math -funroll-loops")
set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -fomit-frame-pointer -mmmx -msse -mfpmath=sse -msse2 -ffast-math -ftree-vectorize -fweb -fexpensive-optimizations -frename-registers") set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -fomit-frame-pointer -ffast-math -funroll-loops")
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -fomit-frame-pointer -mmmx -msse -mfpmath=sse -msse2 -ffast-math -ftree-vectorize -fweb -fexpensive-optimizations -frename-registers") set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -ffast-math")
set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -fomit-frame-pointer -mmmx -msse -mfpmath=sse -msse2 -ffast-math -ftree-vectorize -fweb -fexpensive-optimizations -frename-registers") set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -ffast-math")
else (${ARCH} STREQUAL "x86_64") else (${ARCH} STREQUAL "x86_64")
if (NOT STANDALONE) if (NOT STANDALONE)
set(MARCH_FLAG " -march=pentium4") set(MARCH_FLAG " -march=pentium4")
@@ -327,7 +327,7 @@ else (STANDALONE)
glib-2.0 glib-2.0
gstreamer-0.10 gstreamer-0.10
gtk-2.0 gtk-2.0
llfreetype2 freetype2
pango-1.0 pango-1.0
) )
endif (STANDALONE) endif (STANDALONE)

2
indra/cmake/PNG.cmake
View File

@@ -15,5 +15,5 @@ else (STANDALONE)
else(LINUX) else(LINUX)
set(PNG_LIBRARIES png15) set(PNG_LIBRARIES png15)
endif() endif()
set(PNG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/libpng15) set(PNG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/)
endif (STANDALONE) endif (STANDALONE)

2
indra/llimage/llpngwrapper.h
View File

@@ -32,7 +32,7 @@
#ifndef LL_LLPNGWRAPPER_H #ifndef LL_LLPNGWRAPPER_H
#define LL_LLPNGWRAPPER_H #define LL_LLPNGWRAPPER_H
#include "png.h" #include "libpng15/png.h"
#include "llimage.h" #include "llimage.h"
class LLPngWrapper class LLPngWrapper

8
install.xml
View File

@@ -20,9 +20,9 @@
<key>linux64</key> <key>linux64</key>
<map> <map>
<key>md5sum</key> <key>md5sum</key>
<string>cbaafc55fb8b14283541791e82f13462</string> <string>5add23ded1a53f57044132cb1aed4950</string>
<key>url</key> <key>url</key>
<uri>http://imprudenceviewer.org/download/libs/linux64-32bitcompatibilitylibs-20100903.tar.bz2</uri> <uri>https://github.com/downloads/LightDrake/Public-Libraries/linux64-32bitcompatibilitylibs-20100903_1.tar.bz2</uri>
</map> </map>
</map> </map>
</map> </map>
@@ -188,9 +188,9 @@
<key>linux64</key> <key>linux64</key>
<map> <map>
<key>md5sum</key> <key>md5sum</key>
<string>a7c23f5395f79033dbb09b201f16a4ce</string> <string>ac6e5b52d5cf13443607c09d8c62b6c5</string>
<key>url</key> <key>url</key>
<uri>https://github.com/downloads/LightDrake/Public-Libraries/boost-1.48.0-linux-x86_64-20120514.tar.bz2</uri> <uri>https://github.com/downloads/LightDrake/Public-Libraries/boost-1.48.0-linux-x86_64-20120719.tar.bz2</uri>
</map> </map>
<key>windows</key> <key>windows</key>
<map> <map>