Ver Fonte

Removes old makefile and Visual Studio solution, adds setup for posix

CapXilinx há 12 anos atrás
pai
commit
1d61d531b3
5 ficheiros alterados com 2 adições e 202 exclusões
  1. 0 20
      bin/VS_2010/VS_2010.sln
  2. BIN
      bin/VS_2010/VS_2010.suo
  3. 0 102
      bin/pc/Makefile
  4. 0 80
      bin/pc/Makefile.release
  5. 2 0
      bin/posix/setup_posix.sh

+ 0 - 20
bin/VS_2010/VS_2010.sln

@@ -1,20 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual C++ Express 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OpENer", "OpENer\OpENer.vcxproj", "{BC41EE68-0CD3-46BE-966E-7BAEBFAEA1DC}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Release|Win32 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{BC41EE68-0CD3-46BE-966E-7BAEBFAEA1DC}.Debug|Win32.ActiveCfg = Debug|Win32
-		{BC41EE68-0CD3-46BE-966E-7BAEBFAEA1DC}.Debug|Win32.Build.0 = Debug|Win32
-		{BC41EE68-0CD3-46BE-966E-7BAEBFAEA1DC}.Release|Win32.ActiveCfg = Release|Win32
-		{BC41EE68-0CD3-46BE-966E-7BAEBFAEA1DC}.Release|Win32.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal

BIN
bin/VS_2010/VS_2010.suo


+ 0 - 102
bin/pc/Makefile

@@ -1,102 +0,0 @@
-#*******************************************************************************
-# * Copyright (c) 2009, Rockwell Automation, Inc.
-# * All rights reserved. 
-# *
-# * Contributors:
-# *     <date>: <author>, <author email> - changes
-# ******************************************************************************
-
-#CC=g++
-
-ROOT=../..
-
-ENCAP=$(ROOT)/src/enet_encap
-CIP=$(ROOT)/src/cip
-PORT=$(ROOT)/src/ports/platform-pc
-
-CFLAGS= \
-	-g \
-	-I . \
-	-I$(ROOT) \
-	-I$(ROOT)/src \
-	-I$(ENCAP) \
-	-I$(CIP) \
-	-I$(PORT)/sample_application \
-	-DOPENER_WITH_TRACES \
-	-DOPENER_TRACE_LEVEL=0xFF \
-	-W -Wall -ansi -std=c99
-
-LDFLAGS=
-
-SOURCES= \
-	$(CIP)/appcontype.c \
-	$(CIP)/cipassembly.c \
-	$(CIP)/cipclass3connection.c \
-	$(CIP)/cipcommon.c \
-	$(CIP)/cipconnectionmanager.c	\
-	$(CIP)/cipethernetlink.c \
-	$(CIP)/cipidentity.c \
-	$(CIP)/cipioconnection.c \
-	$(CIP)/cipmessagerouter.c \
-	$(CIP)/ciptcpipinterface.c \
-	$(ENCAP)/cpf.c \
-	$(ENCAP)/encap.c \
-	$(ENCAP)/endianconv.c \
-	$(PORT)/main.c \
-	$(PORT)/networkhandler.c \
-	$(PORT)/sample_application/sampleapplication.c
-
-
-OBJECTS= \
-	$(CIP)/appcontype.o \
-	$(CIP)/cipassembly.o \
-	$(CIP)/cipclass3connection.o \
-	$(CIP)/cipcommon.o \
-	$(CIP)/cipconnectionmanager.o \
-	$(CIP)/cipethernetlink.o \
-	$(CIP)/cipioconnection.o \
-	$(CIP)/cipidentity.o \
-	$(CIP)/cipmessagerouter.o \
-	$(CIP)/ciptcpipinterface.o \
-	$(ENCAP)/cpf.o \
-	$(ENCAP)/encap.o \
-	$(ENCAP)/endianconv.o \
-	$(PORT)/main.o \
-	$(PORT)/networkhandler.o \
-	$(PORT)/sample_application/sampleapplication.o
-	
-SPLINTFLAGS = -I../../src \
-	-I$(ENCAP) \
-	-I$(CIP) \
-	-I$(PORT) \
-	+posixlib -skipposixheaders
-
-
-EXECUTABLE=opener
-
-
-all: $(SOURCES) $(EXECUTABLE)
-	
-splint:
-	splint $(SPLINTFLAGS) $(SOURCES) 
-    	
-$(EXECUTABLE): $(OBJECTS) Makefile
-	@echo "  [LD]	" $@
-	@$(CC) $(LDFLAGS) $(OBJECTS) -o $@
-	@echo BUILD COMPLETE
-
-# pull in dependency info for existing .o files
--include .deps/*.d
-
-%.o: %.c .deps Makefile
-	@echo "  [CC]	" $*.c
-	@$(CC) -c $(CFLAGS) -MMD -MP -MF .deps/$(*F).d $*.c -o $*.o
-
-.deps:
-	mkdir .deps
-
-
-clean:
-	@echo "  [CLEAN]"
-	@-rm -f $(EXECUTABLE) $(OBJECTS) .deps/*
-

+ 0 - 80
bin/pc/Makefile.release

@@ -1,80 +0,0 @@
-#*******************************************************************************
-# * Copyright (c) 2009, Rockwell Automation, Inc.
-# * All rights reserved. 
-# *
-# * Contributors:
-# *     <date>: <author>, <author email> - changes
-# ******************************************************************************
-
-CFLAGS= \
-	-O2 \
-	-I . \
-	-I ../../src \
-	-I ../../src/enet_encap \
-	-I ../../src/cip \
-	-I ../../src/ports/platform-pc \
-	-W -Wall -ansi -std=c99
-
-LDFLAGS=
-
-SOURCES= \
-	../../src/ports/platform-pc/main.c \
-	../../src/cip/cipconnectionmanager.c	\
-	../../src/cip/cipcommon.c \
-	../../src/cip/cipmessagerouter.c \
-	../../src/cip/cipassembly.c \
-	../../src/cip/ciptcpipinterface.c \
-	../../src/cip/cipidentity.c \
-	../../src/cip/cipethernetlink.c \
-	../../src/cip/appcontype.c \
-	../../src/cip/cipclass3connection.c \
-	../../src/cip/cipioconnection.c \
-	../../src/enet_encap/cpf.c \
-	../../src/enet_encap/endianconv.c \
-	../../src/enet_encap/encap.c \
-	../../src/ports/platform-pc/networkhandler.c
-
-
-OBJECTS= \
-	../../src/ports/platform-pc/main.o \
-	../../src/ports/platform-pc/networkhandler.o \
-	../../src/cip/cipconnectionmanager.o \
-	../../src/cip/cipcommon.o \
-	../../src/cip/cipmessagerouter.o \
-	../../src/cip/cipassembly.o \
-	../../src/cip/ciptcpipinterface.o \
-	../../src/cip/cipidentity.o \
-	../../src/cip/cipethernetlink.o \
-	../../src/cip/appcontype.o \
-	../../src/cip/cipclass3connection.o \
-	../../src/cip/cipioconnection.o \
-	../../src/enet_encap/cpf.o \
-	../../src/enet_encap/endianconv.o \
-	../../src/enet_encap/encap.o
-
-
-EXECUTABLE=opener_rel
-
-
-all: $(SOURCES) $(EXECUTABLE)
-	
-$(EXECUTABLE): $(OBJECTS) Makefile.release
-	@echo "  [LD]	" $@
-	@$(CC) $(LDFLAGS) $(OBJECTS) -o $@
-	@echo BUILD COMPLETE
-
-# pull in dependency info for existing .o files
--include .deps/*.d
-
-%.o: %.c .deps Makefile.release
-	@echo "  [CC]	" $*.c
-	@$(CC) -c $(CFLAGS) -MMD -MP -MF .deps/$(*F).d $*.c -o $*.o
-
-.deps:
-	mkdir .deps
-
-
-clean:
-	@echo "  [CLEAN]"
-	@-rm -f $(EXECUTABLE) $(OBJECTS) .deps/*
-

+ 2 - 0
bin/posix/setup_posix.sh

@@ -0,0 +1,2 @@
+cmake -DOpENer_PLATFORM:STRING="POSIX" -DCMAKE_BUILD_TYPE:STRING="" -DOpENer_PLATFORM:STRING=POSIX -DCMAKE_BUILD_TYPE:STRING= ../../source
+