Changeset 51 in cheroxy

Timestamp:

11/27/12 13:50:22 (11 years ago)

Author:

cheese

Message:

#1 modify makefile to seperate build script to library and test module

Location:

trunk/src

Files:

• CRXHttpResponse.cpp (modified) (2 diffs)
• main.cpp (modified) (1 diff)
• makefile (modified) (5 diffs)

trunk/src/CRXHttpResponse.cpp

@@ -115 +115 @@
                              const int  aLength)
 {
-    int     aResult = 0;
-    int     aSize   = 0;
-    char    * aChunkedPtr = NULL;
+    int             aResult = 0;
+    unsigned int    aSize   = 0;
+    char            * aChunkedPtr = NULL;
 
     /*----------------------------------------------------------------*/
@@ -147 +147 @@
         mContentLength += aLength;
         aSize = mContent.size ();
-        if ((unsigned int)aSize > strlen (CRLF) + strlen (CRLF2))
+        if (aSize > strlen (CRLF) + strlen (CRLF2))
         {
             aChunkedPtr = &mContent[0] + aSize - strlen (CRLF2);

trunk/src/main.cpp

@@ -22 +22 @@
 # define THREAD_FUNCTION_CALLING_CONVENTION     WINAPI
 #else
+# include <pthread.h>
 # define THREAD_TYPE                            pthread_t
 # define THREAD_FUNCTION_RETURN                 void *

trunk/src/makefile

@@ -2 +2 @@
 # platform
 #----------------------------------------------------------
-OS  = 64
+OS      = 64
+DEBUG   = true
 
 ifeq ($(OS), 64)
@@ -8 +9 @@
 else
     PLATFORM    = -m32
+endif
+
+ifeq ($(DEBUG), true)
+    DEFS = -D_DEBUG
+else
+    DEFS = 
 endif
 
@@ -22 +29 @@
                     CRXFilter           \
                     CRXProxy            \
-                    main                \
+
+LIB_NAME        = cheroxy
 
 CXX             = g++
 LD              = g++
-CXXDEFS         = -D_DEBUG
-CXXFLAGS        = $(PLATFORM) -fPIC -Wall -Wcast-align -c -g
+AR              = ar
+CXXDEFS         = -DLINUX -DUNIX -DMTHREAD -D_REENTRANT $(DEFS)
+CXXFLAGS        = $(PLATFORM) -Wall -Wpointer-arith -Wcast-align -fPIC -Wno-non-virtual-dtor    \
+                              -Woverloaded-virtual -Wsynth -Wno-ctor-dtor-privacy               \
+                              -fno-rtti -fno-common -fno-exceptions -fshort-wchar               \
+                              -O2 -g
 LDFLAGS         = $(PLATFORM)
+EXT_SH          = so
+EXT_AR          = a
 SHARED_FLAGS    = $(PLATFORM) -shared
+ARFLAGS         = rc
 
 SOURCE_TYPE     = cpp
 TARGET_PATH     = ../_build
 OBJ_PATH        = ../_obj
-TARGET          = $(TARGET_PATH)/libcheroxy.so
+TARGET          = $(TARGET_PATH)/lib$(LIB_NAME).$(EXT_SH)
 SRCS            = $(addsuffix .$(SOURCE_TYPE),$(FILES))
 OBJS            = $(addprefix $(OBJ_PATH)/,$(addsuffix .o,$(FILES)))
 
 INCLUDES        = -I../include
-LIBS            = -lpthread
-
-# test
-TARGET_TEST     = $(TARGET_PATH)/cheroxy.ex
+LIBS            = 
 
 #----------------------------------------------------------
@@ -55 +67 @@
 
 # link
-$(TARGET): $(OBJS)
-    $(LD) $(SHARED_FLAGS) -o $@ $? $(LIBS)
+$(TARGET_PATH)/%.$(EXT_SH): $(OBJS)
+    $(LD) $(SHARED_FLAGS) -o $@ $?
+
+$(TARGET_PATH)/%.$(EXT_AR): $(OBJS)
+    $(AR) $(ARFLAGS) -o $@ $?
 
 # compile
 $(OBJ_PATH)/%.o: %.$(SOURCE_TYPE)
-    $(CXX) $(CXXFLAGS) $(CXXDEFS) $(INCLUDES) -o $@ $?
+    $(CXX) $(CXXFLAGS) $(CXXDEFS) $(INCLUDES) -o $@ -c $?
 
 clean: dummy
@@ -68 +83 @@
 
 # test
-$(TARGET_TEST): $(TARGET)
-    $(LD) $(LDFLAGS) -o $@ -L$(TARGET_PATH) -lcheroxy $(LIBS)
+test: all
+    $(CXX) $(CXXFLAGS) $(INCLUDES) $(CXXDEFS) -o $(OBJ_PATH)/main.o -c main.cpp
+    $(LD) $(LDFLAGS) -o $(TARGET_PATH)/cheroxy.ex $(OBJ_PATH)/main.o -L$(TARGET_PATH) -lcheroxy -lpthread
+    cd $(TARGET_PATH); LD_LIBRARY_PATH=. ./cheroxy.ex
 
-test: $(TARGET_TEST)
-    cd $(TARGET_PATH); LD_LIBRARY_PATH=. $<
-