Skip to content

Commit

Permalink
Updated instalation procedure for different OSX versions (default is …
Browse files Browse the repository at this point in the history
…10.9).
  • Loading branch information
JoostHuizinga committed Mar 31, 2017
1 parent 00ca9c9 commit 41fbe3d
Show file tree
Hide file tree
Showing 3 changed files with 34 additions and 30 deletions.
2 changes: 1 addition & 1 deletion INSTALL.txt
Original file line number Diff line number Diff line change
Expand Up @@ -98,4 +98,4 @@ More recent versions are reported to function properly when compiling QT yoursel
Usually you can just run build\release\cppn-x.exe
If that doesn't work due to dll errors, try running it using run.bat

Have fun using it, and please let me know if there are any features missing from this build.
Have fun using it, and please let me know if there are any features missing from this build.
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,8 @@ The following site lists the commands to install most of ffmpegs dependencies, b


#### Compile cppn-x
* Open compile.sh and check that all paths are correct. The compile.sh will have additional comments for setting.
* Open compile.sh and check that all paths are correct. The compile.sh will have additional comments for setting.
* Open cppnx.pro to set or change deployment target for OSX
* Run compile.sh

For UNIX:
Expand Down
59 changes: 31 additions & 28 deletions cppn-x.pro
Original file line number Diff line number Diff line change
Expand Up @@ -7,29 +7,38 @@ TARGET = cppn-x

CONFIG += static

message($$QMAKE_LFLAGS)
message($$QMAKE_LFLAGS_RELEASE)
message($$QMAKE_LFLAGS_APP)
message($$CONFIG)

QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.7
# Remove default deployment target
QMAKE_CFLAGS_X86_64 -= -mmacosx-version-min=10.5
QMAKE_CFLAGS_X86_64 += -mmacosx-version-min=10.7
QMAKE_CXXFLAGS_X86_64 = $$QMAKE_CFLAGS_X86_64
QMAKE_LFLAGS -= -mmacosx-version-min=10.5
QMAKE_LFLAGS += -mmacosx-version-min=10.7
QMAKE_CXXFLAGS_X86_64 -= -mmacosx-version-min=10.5
QMAKE_LFLAGS_X86_64 -= -mmacosx-version-min=10.5

# Set deployment target (edit line to choose your target)
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.9
#QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.7
#QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.5

# Add deployment target
QMAKE_CFLAGS_X86_64 += -mmacosx-version-min=$$QMAKE_MACOSX_DEPLOYMENT_TARGET
QMAKE_CXXFLAGS_X86_64 += -mmacosx-version-min=$$QMAKE_MACOSX_DEPLOYMENT_TARGET
QMAKE_LFLAGS_X86_64 += -mmacosx-version-min=$$QMAKE_MACOSX_DEPLOYMENT_TARGET

macx {
QMAKE_MAC_SDK = /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk
}
# Uncomment and edit to set a different SDK
#macx {
# QMAKE_MAC_SDK = /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk
#}

# Load the qt configuration
load(qt_config)
message($$QMAKE_LFLAGS)
message($$QMAKE_LFLAGS_RELEASE)
message($$QMAKE_LFLAGS_APP)
message($$CONFIG)

#Might need to add this option to the linker
#-headerpad_max_install_names
# Uncomment to verify compiler settings
#message("Deployment target:" $$QMAKE_MACOSX_DEPLOYMENT_TARGET)
#message("C-Flags:" $$QMAKE_CFLAGS)
#message("C-Flags X86_64:" $$QMAKE_CFLAGS_X86_64)
#message("CXX-Flags:" $$QMAKE_CXXFLAGS)
#message("CXX-Flags X86_64:" $$QMAKE_CXXFLAGS_X86_64)
#message("Link-Flags:" $$QMAKE_LFLAGS)
#message("Link-Flags X86_64:" $$QMAKE_LFLAGS_X86_64)
#message("Config:" $$CONFIG)

DEPENDPATH += . \
zlib \
Expand All @@ -47,22 +56,14 @@ INCLUDEPATH += . \
/usr/local/include \
libzip-0.11.1/src

#QTPLUGIN += qjpeg
# qgif \
# qmng \
# qico \
# qsvg \
# qtiff

LIBS += -lm \
-lgsl \
-L/usr/local/lib
#LIBS += -lz

# Required for some C99 defines
DEFINES += __STDC_CONSTANT_MACROS

# Input
# Header files
HEADERS += zlib/crc32.h \
zlib/deflate.h \
zlib/inffast.h \
Expand Down Expand Up @@ -119,6 +120,8 @@ HEADERS += zlib/crc32.h \
libzip-0.11.1/lib/zip.h \
libzip-0.11.1/lib/zipconf.h \
libzip-0.11.1/lib/zipint.h

# Source files
SOURCES += zlib/adler32.c \
zlib/compress.c \
zlib/crc32.c \
Expand Down

0 comments on commit 41fbe3d

Please sign in to comment.