diff --git a/norp/makefiles/Makefile.common b/norp/makefiles/Makefile.common index b8112e0..8d6568e 100755 --- a/norp/makefiles/Makefile.common +++ b/norp/makefiles/Makefile.common @@ -44,7 +44,7 @@ norp: $(LIBPROTO) $(LIBNORM) $(NORP_OBJ) $(CC) $(LDFLAGS) -o $@ $(NORP_OBJ) $(LIBS) $(LIBNORM) $(LIBPROTO) clean: - rm -f norp $(COMMON)/*.o; + rm -f norp $(COMMON)/*.o $(COMMON)/protoPktSOCKS.o; $(MAKE) -C $(NORM)/makefiles -f Makefile.$(SYSTEM) clean; $(MAKE) -C $(PROTOLIB)/makefiles -f Makefile.$(SYSTEM) clean; diff --git a/norp/makefiles/Makefile.macosx b/norp/makefiles/Makefile.macosx index 81f1984..65edaf1 100755 --- a/norp/makefiles/Makefile.macosx +++ b/norp/makefiles/Makefile.macosx @@ -8,8 +8,8 @@ WX_CFLAGS = `$(WX_CONFIG_PATH) --cxxflags` WX_LIBS = `$(WX_CONFIG_PATH) --libs` # 2) System-specific flags and libs -SYSTEM_CFLAGS = -arch x86_64 -SYSTEM_LIBS = -arch x86_64 -lresolv +SYSTEM_CFLAGS = +SYSTEM_LIBS = -lresolv -lpcap # 3) System-specific Protolib flags (_must_ correspond to Protolib SYSTEM_HAVES) # Must choose appropriate for the following: diff --git a/norp/src/common/norp.cpp b/norp/src/common/norp.cpp index 2579232..94f9d80 100755 --- a/norp/src/common/norp.cpp +++ b/norp/src/common/norp.cpp @@ -12,7 +12,7 @@ // numbers for NORM traffic. // Uncomment this to enable new NORM port handling to improve NAT compatibility -#define NEW_PORT +#define NEW_PORT 1 PortPool::PortPool(UINT16 basePort) : base_port(basePort)