Ecere Software / sdk / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
controls/TabControl: Modifications to solve Cartographer's styles editor issues
[sdk] / ecere / Makefile
diff --git a/ecere/Makefile b/ecere/Makefile
index 6667ec7..71946e9 100644 (file)
--- a/ecere/Makefile
+++ b/ecere/Makefile
@@ -109,6 +109,7 @@ _ECSOURCES2 = \
        $(if $(WINDOWS_TARGET),src/gfx/drivers/Win32ConsoleDisplayDriver.ec,) \
        $(if $(WINDOWS_TARGET),src/gfx/drivers/Win32PrinterDisplayDriver.ec,) \
        $(if $(or $(LINUX_TARGET),$(OSX_TARGET)),src/gfx/drivers/XDisplayDriver.ec,) \
+       src/gfx/drivers/edtaa3func.ec \
        src/gfx/Bitmap.ec \
        src/gfx/BitmapResource.ec \
        src/gfx/Color.ec \
@@ -169,6 +170,7 @@ _ECSOURCES3 = \
        src/net/NetworkClientFile.ec \
        src/net/Service.ec \
        src/net/Socket.ec \
+       $(if $(ENABLE_SSL),src/net/SSLSocket.ec,) \
        src/com/containers/Array.ec \
        src/com/containers/AVLTree.ec \
        src/com/containers/BuiltInContainer.ec \
@@ -398,12 +400,12 @@ endif
 PRJ_CFLAGS += \
         $(if $(WINDOWS_TARGET), \
                         -isystem ../deps/glext \
-                        -I../deps/DirectX-9.0/include \
-                        -I../deps/jpeg-6b \
-                        -I../deps/libpng-1.4.0 \
+                        -I../deps/jpeg-9a \
+                        -I../deps/libpng-1.6.12 \
                         -I../deps/libungif-4.1.1/lib \
-                        -I../deps/zlib \
-                        -I../deps/freetype-2.3.12/include,) \
+                        -I../deps/zlib-1.2.8 \
+                        -I../deps/freetype-2.3.12/include \
+                        $(if $(ENABLE_SSL),-I$(OPENSSL_INCLUDE_DIR),)) \
         $(if $(LINUX_TARGET), \
                         -I/usr/include/freetype2,) \
         $(if $(OSX_TARGET), \
@@ -412,8 +414,9 @@ PRJ_CFLAGS += \
                         -I$(SYSROOT)/usr/X11/include \
                         -I/usr/X11R6/include/freetype2 \
                         -I/usr/X11R6/include \
-                        -I../deps/jpeg-6b \
-                        -I../deps/libpng-1.4.0 \
+                        -Isrc/gui/drivers/cocoa \
+                        -I../deps/jpeg-9a \
+                        -I../deps/libpng-1.6.12 \
                         -I../deps/libungif-4.1.1/lib,) \
         $(if $(DEBUG), -g, -O2 -ffast-math) $(FPIC) -w \
                         -DBUILDING_ECERE_COM \
@@ -435,11 +438,12 @@ ifdef WINDOWS_TARGET
 
 ifndef STATIC_LIBRARY_TARGET
 OFLAGS += \
-        -L../deps/zlib/obj/release.$(PLATFORM)$(COMPILER_SUFFIX) \
-        -L../deps/jpeg-6b/obj/release.$(PLATFORM)$(COMPILER_SUFFIX) \
-        -L../deps/libpng-1.4.0/obj/release.$(PLATFORM)$(COMPILER_SUFFIX) \
+        -L../deps/zlib-1.2.8/obj/release.$(PLATFORM)$(COMPILER_SUFFIX) \
+        -L../deps/jpeg-9a/obj/release.$(PLATFORM)$(COMPILER_SUFFIX) \
+        -L../deps/libpng-1.6.12/obj/release.$(PLATFORM)$(COMPILER_SUFFIX) \
         -L../deps/libungif-4.1.1/obj/release.$(PLATFORM)$(COMPILER_SUFFIX) \
-        -L../deps/freetype-2.3.12/obj/release.$(PLATFORM)$(COMPILER_SUFFIX)
+        -L../deps/freetype-2.3.12/obj/release.$(PLATFORM)$(COMPILER_SUFFIX) \
+        $(if $(ENABLE_SSL),-L$(OPENSSL_LIB_DIR) -L$(OPENSSL_BIN_DIR))
 LIBS += \
        $(call _L,dxguid) \
        $(call _L,ddraw) \
@@ -455,7 +459,9 @@ LIBS += \
        $(call _L,shell32) \
        $(call _L,winspool) \
        $(call _L,imm32) \
-       $(call _L,ungif)
+       $(call _L,ungif) \
+       $(if $(ENABLE_SSL),$(call _L,eay32)) \
+       $(if $(ENABLE_SSL),$(call _L,ssleay32))
 endif
 
 else
@@ -474,7 +480,9 @@ LIBS += \
        $(call _L,X11) \
        $(call _L,Xext) \
        $(call _L,Xrender) \
-       $(if $(DISABLE_GL),,$(call _L,GL))
+       $(if $(DISABLE_GL),,$(call _L,GL)) \
+       $(if $(ENABLE_SSL),$(call _L,ssl)) \
+       $(if $(ENABLE_SSL),$(call _L,crypto))
 endif
 
 else
@@ -484,8 +492,7 @@ ifndef STATIC_LIBRARY_TARGET
 OFLAGS += \
         -L$(SYSROOT)/usr/X11/lib \
         -L/usr/X11R6/lib \
-        -L../deps/jpeg-6b/obj/release.$(PLATFORM)$(COMPILER_SUFFIX) \
-        -L../deps/libpng-1.4.0/obj/release.$(PLATFORM)$(COMPILER_SUFFIX) \
+        -L../deps/jpeg-9a/obj/release.$(PLATFORM)$(COMPILER_SUFFIX) \
         -L../deps/libungif-4.1.1/obj/release.$(PLATFORM)$(COMPILER_SUFFIX)
 LIBS += \
        $(call _L,curses) \
@@ -497,7 +504,9 @@ LIBS += \
        $(call _L,X11) \
        $(call _L,Xext) \
        $(call _L,Xrender) \
-       $(call _L,GL)
+       $(call _L,GL) \
+       $(if $(ENABLE_SSL),$(call _L,ssl)) \
+       $(if $(ENABLE_SSL),$(call _L,crypto))
 endif
 
 endif
@@ -583,7 +592,11 @@ endif
        $(EAR) aw$(EARFLAGS) $(TARGET) $(RES)unicode/derivedGeneralCategoryStripped.txt "unicode"
        $(EAR) aw$(EARFLAGS) $(TARGET) locale/es.mo locale/hu.mo locale/mr.mo locale/nl.mo locale/pt_BR.mo locale/ru.mo locale/zh_CN.mo "locale"
 else
+ifdef WINDOWS_HOST
        $(AR) rcs $(TARGET) @$(OBJ)objects.lst $(LIBS)
+else
+       $(AR) rcs $(TARGET) $(OBJECTS) $(LIBS)
+endif
 endif
        $(call mkdirq,../$(SODESTDIR))
        $(call cpq,$(TARGET),../$(SODESTDIR))
@@ -776,6 +789,9 @@ $(OBJ)XDisplayDriver.sym: src/gfx/drivers/XDisplayDriver.ec
        $(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c src/gfx/drivers/XDisplayDriver.ec -o $(OBJ)XDisplayDriver.sym
 endif
 
+$(OBJ)edtaa3func.sym: src/gfx/drivers/edtaa3func.ec
+       $(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c $(call quote_path,src/gfx/drivers/edtaa3func.ec) -o $(call quote_path,$@)
+
 $(OBJ)Bitmap.sym: src/gfx/Bitmap.ec
        $(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c src/gfx/Bitmap.ec -o $(OBJ)Bitmap.sym
 
@@ -965,6 +981,9 @@ $(OBJ)Service.sym: src/net/Service.ec
 $(OBJ)Socket.sym: src/net/Socket.ec
        $(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c src/net/Socket.ec -o $(OBJ)Socket.sym
 
+$(OBJ)SSLSocket.sym: src/net/SSLSocket.ec
+       $(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c src/net/SSLSocket.ec -o $(OBJ)SSLSocket.sym
+
 $(OBJ)Array.sym: src/com/containers/Array.ec
        $(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(CUSTOM1_PRJ_CFLAGS) -c src/com/containers/Array.ec -o $(OBJ)Array.sym
 
@@ -1185,6 +1204,9 @@ $(OBJ)XDisplayDriver.c: src/gfx/drivers/XDisplayDriver.ec $(OBJ)XDisplayDriver.s
        $(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c src/gfx/drivers/XDisplayDriver.ec -o $(OBJ)XDisplayDriver.c -symbols $(OBJ)
 endif
 
+$(OBJ)edtaa3func.c: src/gfx/drivers/edtaa3func.ec $(OBJ)edtaa3func.sym | $(SYMBOLS)
+       $(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,src/gfx/drivers/edtaa3func.ec) -o $(call quote_path,$@) -symbols $(OBJ)
+
 $(OBJ)Bitmap.c: src/gfx/Bitmap.ec $(OBJ)Bitmap.sym | $(SYMBOLS)
        $(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c src/gfx/Bitmap.ec -o $(OBJ)Bitmap.c -symbols $(OBJ)
 
@@ -1374,6 +1396,9 @@ $(OBJ)Service.c: src/net/Service.ec $(OBJ)Service.sym | $(SYMBOLS)
 $(OBJ)Socket.c: src/net/Socket.ec $(OBJ)Socket.sym | $(SYMBOLS)
        $(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c src/net/Socket.ec -o $(OBJ)Socket.c -symbols $(OBJ)
 
+$(OBJ)SSLSocket.c: src/net/SSLSocket.ec $(OBJ)SSLSocket.sym | $(SYMBOLS)
+       $(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c src/net/SSLSocket.ec -o $(OBJ)SSLSocket.c -symbols $(OBJ)
+
 $(OBJ)Array.c: src/com/containers/Array.ec $(OBJ)Array.sym | $(SYMBOLS)
        $(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(CUSTOM1_PRJ_CFLAGS) -c src/com/containers/Array.ec -o $(OBJ)Array.c -symbols $(OBJ)
 
@@ -1660,6 +1685,9 @@ $(OBJ)XDisplayDriver.o: $(OBJ)XDisplayDriver.c
        $(CC) $(CFLAGS) $(PRJ_CFLAGS) -c $(OBJ)XDisplayDriver.c -o $(OBJ)XDisplayDriver.o
 endif
 
+$(OBJ)edtaa3func.o: $(OBJ)edtaa3func.c
+       $(CC) $(CFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,$(OBJ)edtaa3func.c) -o $(call quote_path,$@)
+
 $(OBJ)Bitmap.o: $(OBJ)Bitmap.c
        $(CC) $(CFLAGS) $(PRJ_CFLAGS) -c $(OBJ)Bitmap.c -o $(OBJ)Bitmap.o
 
@@ -1859,6 +1887,9 @@ $(OBJ)Service.o: $(OBJ)Service.c
 $(OBJ)Socket.o: $(OBJ)Socket.c
        $(CC) $(CFLAGS) $(PRJ_CFLAGS) -c $(OBJ)Socket.c -o $(OBJ)Socket.o
 
+$(OBJ)SSLSocket.o: $(OBJ)SSLSocket.c
+       $(CC) $(CFLAGS) $(PRJ_CFLAGS) -c $(OBJ)SSLSocket.c -o $(OBJ)SSLSocket.o
+
 $(OBJ)Array.o: $(OBJ)Array.c
        $(CC) $(CFLAGS) $(CUSTOM1_PRJ_CFLAGS) -c $(OBJ)Array.c -o $(OBJ)Array.o
 
@@ -1953,3 +1984,16 @@ realclean: cleantarget
 
 distclean: cleantarget
        $(call rmrq,obj/)
+
+#troubleshoot:
+#      @$(call echo,OBJECTS = $(OBJECTS))
+
+#ifdef WINDOWS
+.PHONY: debug_openssl
+debug_openssl:
+       @$(call echo,OPENSSL_CONF = $(OPENSSL_CONF))
+       @$(call echo,_OPENSSL_CONF = $(_OPENSSL_CONF))
+       @$(call echo,OPENSSL_INCLUDE_DIR = $(OPENSSL_INCLUDE_DIR))
+       @$(call echo,OPENSSL_LIB_DIR = $(OPENSSL_LIB_DIR))
+       @$(call echo,OPENSSL_BIN_DIR = $(OPENSSL_BIN_DIR))
+#endif
The Ecere SDK