Skip to content

Commit

Permalink
Merge ced9914 into 95e73d3
Browse files Browse the repository at this point in the history
  • Loading branch information
kingster committed Mar 19, 2024
2 parents 95e73d3 + ced9914 commit e6031fc
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 5 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ jobs:

tinyphone_osx_job:
name: Build Tinyphone macOS
runs-on: macos-11
runs-on: macos-13
steps:
- name: Checkout
uses: actions/checkout@v3
Expand Down Expand Up @@ -140,7 +140,7 @@ jobs:
#boost
pushd tinyphone-osx/vendor/boost
./boost.sh -macos --boost-version 1.74.0
./boost.sh -macos --boost-version 1.84.0
popd
#stastd
Expand Down
5 changes: 3 additions & 2 deletions tinyphone-osx/Tinyphone.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -294,6 +294,7 @@
B3DDA55125515DF700D269C9 /* Project object */ = {
isa = PBXProject;
attributes = {
BuildIndependentTargetsInParallel = YES;
LastSwiftUpdateCheck = 1110;
LastUpgradeCheck = 1320;
ORGANIZATIONNAME = "Kinshuk Bairagi";
Expand Down Expand Up @@ -630,7 +631,7 @@
/usr/local/lib,
);
MACOSX_DEPLOYMENT_TARGET = 10.15;
MARKETING_VERSION = "36.0.0.84";
MARKETING_VERSION = 36.0.0.84;
OTHER_CPLUSPLUSFLAGS = (
"$(OTHER_CFLAGS)",
"-DBOOST_SYSTEM_DYN_LINK",
Expand Down Expand Up @@ -682,7 +683,7 @@
/usr/local/lib,
);
MACOSX_DEPLOYMENT_TARGET = 10.15;
MARKETING_VERSION = "36.0.0.84";
MARKETING_VERSION = 36.0.0.84;
OTHER_CPLUSPLUSFLAGS = (
"$(OTHER_CFLAGS)",
"-DBOOST_SYSTEM_DYN_LINK",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1320"
LastUpgradeVersion = "1530"
version = "1.7">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
9 changes: 9 additions & 0 deletions tinyphone/baseapp.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,15 @@
using namespace std;
using namespace pj;

/**
* @file baseapp.cpp
* @brief Implementation of the base application functionality for TinyPhone.
*
* This file contains the implementation of the base application functionality for TinyPhone.
* It includes functions for initializing the PJSUA endpoint, starting and stopping the application,
* and retrieving the phone object.
*/

#define MAX_DNS_SERVERS 4

inline void pj_logerror(pj_status_t status, char * message) {
Expand Down
1 change: 1 addition & 0 deletions tinyphone/utils.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
#include <stdio.h>
#include <thread>
#include <vector>
#include <fstream>
#include <sstream>
#include "consts.h"

Expand Down

0 comments on commit e6031fc

Please sign in to comment.