BodgeMaster
/
NORM-mirror
mirror of https://github.com/USNavalResearchLaboratory/norm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix to MacOS Makefile

pull/86/head
bebopagogo 2024-06-08 17:38:25 -04:00
parent 6188965887
commit f242b53b72
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
norp/makefiles/Makefile.common
View File

@ -44,7 +44,7 @@ norp: $(LIBPROTO) $(LIBNORM) $(NORP_OBJ)
$(CC) $(LDFLAGS) -o $@ $(NORP_OBJ) $(LIBS) $(LIBNORM) $(LIBPROTO) $(CC) $(LDFLAGS) -o $@ $(NORP_OBJ) $(LIBS) $(LIBNORM) $(LIBPROTO)
clean: clean:
rm -f norp $(COMMON)/*.o; rm -f norp $(COMMON)/*.o $(COMMON)/protoPktSOCKS.o;
$(MAKE) -C $(NORM)/makefiles -f Makefile.$(SYSTEM) clean; $(MAKE) -C $(NORM)/makefiles -f Makefile.$(SYSTEM) clean;
$(MAKE) -C $(PROTOLIB)/makefiles -f Makefile.$(SYSTEM) clean; $(MAKE) -C $(PROTOLIB)/makefiles -f Makefile.$(SYSTEM) clean;

4
norp/makefiles/Makefile.macosx
View File

@ -8,8 +8,8 @@ WX_CFLAGS = `$(WX_CONFIG_PATH) --cxxflags`
WX_LIBS = `$(WX_CONFIG_PATH) --libs` WX_LIBS = `$(WX_CONFIG_PATH) --libs`
# 2) System-specific flags and libs # 2) System-specific flags and libs
SYSTEM_CFLAGS = -arch x86_64 SYSTEM_CFLAGS =
SYSTEM_LIBS = -arch x86_64 -lresolv SYSTEM_LIBS = -lresolv -lpcap
# 3) System-specific Protolib flags (_must_ correspond to Protolib SYSTEM_HAVES) # 3) System-specific Protolib flags (_must_ correspond to Protolib SYSTEM_HAVES)
# Must choose appropriate for the following: # Must choose appropriate for the following:

2
norp/src/common/norp.cpp
View File

@ -12,7 +12,7 @@
// numbers for NORM traffic. // numbers for NORM traffic.
// Uncomment this to enable new NORM port handling to improve NAT compatibility // Uncomment this to enable new NORM port handling to improve NAT compatibility
#define NEW_PORT #define NEW_PORT 1
PortPool::PortPool(UINT16 basePort) PortPool::PortPool(UINT16 basePort)
: base_port(basePort) : base_port(basePort)