Skip to content

Commit

Permalink
Now builds on macOS
Browse files Browse the repository at this point in the history
  • Loading branch information
Peter B Marks committed May 17, 2018
1 parent 57086c3 commit 78af5da
Show file tree
Hide file tree
Showing 6 changed files with 249 additions and 7 deletions.
2 changes: 1 addition & 1 deletion Makefile
View file
@@ -1,5 +1,5 @@
HEADERS = osmo-fl2k.h
INCLUDES=-I/usr/include/libusb-1.0/
INCLUDES=-I/usr/include/libusb-1.0/ -I/usr/local/Cellar/libusb/1.0.22/include/libusb-1.0/
LDFLAGS=-lusb-1.0 -pthread -lm

default: vgaplay
Expand Down
6 changes: 6 additions & 0 deletions README.md
View file
Expand Up @@ -38,6 +38,12 @@ Please fix the device permissions, e.g. by installing the udev rules file

Build and install the software as documented [here](https://osmocom.org/projects/osmo-fl2k/wiki)

## macOS
All builds just fine on macOS but you need libusb which I installed using [homebrew](https://brew.sh)
```
brew install libusb
```

# USB memory

You'll get this error:
Expand Down
2 changes: 1 addition & 1 deletion libosmo-fl2k.c
View file
Expand Up @@ -378,7 +378,7 @@ int fl2k_open(fl2k_dev_t **out_dev, uint32_t index)
return -1;
}

libusb_set_debug(dev->ctx, 3);
// libusb_set_debug(dev->ctx, 3);

dev->dev_lost = 1;

Expand Down
6 changes: 1 addition & 5 deletions vgaplay.c
View file
Expand Up @@ -316,10 +316,6 @@ int main(int argc, char **argv)
usage();
}

if (gFl2kDeviceIndex < 0) {
exit(1);
}

/* allocate buffer */
gTransmitBuffer = malloc(FL2K_BUF_LEN);
if (!gTransmitBuffer) {
Expand Down Expand Up @@ -357,7 +353,7 @@ int main(int argc, char **argv)

while (!gUserCancelled) {
if(frequencyFile) {
while(read = getline(&line, &len, frequencyFile) != -1 && !gUserCancelled) {
while((read = getline(&line, &len, frequencyFile)) != -1 && !gUserCancelled) {
double frequency = atof(line);
fprintf(stderr, "Read frequency = %f from file.\n", frequency);

Expand Down
232 changes: 232 additions & 0 deletions vgaplay.xcodeproj/project.pbxproj
View file
@@ -0,0 +1,232 @@
// !$*UTF8*$!
{
archiveVersion = 1;
classes = {
};
objectVersion = 50;
objects = {

/* Begin PBXFileReference section */
72FEDF1E20AD65E9003379D3 /* wspr_encode.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = wspr_encode.py; sourceTree = "<group>"; };
72FEDF1F20AD65E9003379D3 /* libosmo-fl2k.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "libosmo-fl2k.c"; sourceTree = "<group>"; };
72FEDF2020AD65E9003379D3 /* vgaplay.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = vgaplay.c; sourceTree = "<group>"; };
72FEDF2120AD65E9003379D3 /* osmo-fl2k.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "osmo-fl2k.h"; sourceTree = "<group>"; };
72FEDF2220AD65E9003379D3 /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
72FEDF2320AD65E9003379D3 /* Makefile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.make; path = Makefile; sourceTree = "<group>"; };
72FEDF2420AD65E9003379D3 /* frequencylist.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = frequencylist.txt; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXGroup section */
72E242A320AD658500B314F6 = {
isa = PBXGroup;
children = (
72FEDF2420AD65E9003379D3 /* frequencylist.txt */,
72FEDF1F20AD65E9003379D3 /* libosmo-fl2k.c */,
72FEDF2320AD65E9003379D3 /* Makefile */,
72FEDF2120AD65E9003379D3 /* osmo-fl2k.h */,
72FEDF2220AD65E9003379D3 /* README.md */,
72FEDF2020AD65E9003379D3 /* vgaplay.c */,
72FEDF1E20AD65E9003379D3 /* wspr_encode.py */,
);
sourceTree = "<group>";
};
/* End PBXGroup section */

/* Begin PBXLegacyTarget section */
72E242A820AD658500B314F6 /* vgaplay */ = {
isa = PBXLegacyTarget;
buildArgumentsString = "$(ACTION)";
buildConfigurationList = 72E242AB20AD658500B314F6 /* Build configuration list for PBXLegacyTarget "vgaplay" */;
buildPhases = (
);
buildToolPath = /usr/bin/make;
dependencies = (
);
name = vgaplay;
passBuildSettingsInEnvironment = 1;
productName = vgaplay;
};
/* End PBXLegacyTarget section */

/* Begin PBXProject section */
72E242A420AD658500B314F6 /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 0930;
ORGANIZATIONNAME = "Peter Marks";
TargetAttributes = {
72E242A820AD658500B314F6 = {
CreatedOnToolsVersion = 9.3.1;
};
};
};
buildConfigurationList = 72E242A720AD658500B314F6 /* Build configuration list for PBXProject "vgaplay" */;
compatibilityVersion = "Xcode 9.3";
developmentRegion = en;
hasScannedForEncodings = 0;
knownRegions = (
en,
);
mainGroup = 72E242A320AD658500B314F6;
projectDirPath = "";
projectRoot = "";
targets = (
72E242A820AD658500B314F6 /* vgaplay */,
);
};
/* End PBXProject section */

/* Begin XCBuildConfiguration section */
72E242A920AD658500B314F6 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_NONNULL = YES;
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_ENABLE_OBJC_WEAK = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = dwarf;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
GCC_C_LANGUAGE_STANDARD = gnu11;
GCC_DYNAMIC_NO_PIC = NO;
GCC_NO_COMMON_BLOCKS = YES;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PREPROCESSOR_DEFINITIONS = (
"DEBUG=1",
"$(inherited)",
);
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
};
name = Debug;
};
72E242AA20AD658500B314F6 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_NONNULL = YES;
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_ENABLE_OBJC_WEAK = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_C_LANGUAGE_STANDARD = gnu11;
GCC_NO_COMMON_BLOCKS = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MTL_ENABLE_DEBUG_INFO = NO;
};
name = Release;
};
72E242AC20AD658500B314F6 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_STYLE = Automatic;
DEBUGGING_SYMBOLS = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
GCC_OPTIMIZATION_LEVEL = 0;
OTHER_CFLAGS = "";
OTHER_LDFLAGS = "";
PRODUCT_NAME = "$(TARGET_NAME)";
};
name = Debug;
};
72E242AD20AD658500B314F6 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_STYLE = Automatic;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
OTHER_CFLAGS = "";
OTHER_LDFLAGS = "";
PRODUCT_NAME = "$(TARGET_NAME)";
};
name = Release;
};
/* End XCBuildConfiguration section */

/* Begin XCConfigurationList section */
72E242A720AD658500B314F6 /* Build configuration list for PBXProject "vgaplay" */ = {
isa = XCConfigurationList;
buildConfigurations = (
72E242A920AD658500B314F6 /* Debug */,
72E242AA20AD658500B314F6 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
72E242AB20AD658500B314F6 /* Build configuration list for PBXLegacyTarget "vgaplay" */ = {
isa = XCConfigurationList;
buildConfigurations = (
72E242AC20AD658500B314F6 /* Debug */,
72E242AD20AD658500B314F6 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
/* End XCConfigurationList section */
};
rootObject = 72E242A420AD658500B314F6 /* Project object */;
}
8 changes: 8 additions & 0 deletions vgaplay.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
View file
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IDEDidComputeMac32BitWarning</key>
<true/>
</dict>
</plist>

0 comments on commit 78af5da

Please sign in to comment.