Ecere Software / sdk / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
ecere: Fixed OS X build
[sdk] / ecere / Makefile
diff --git a/ecere/Makefile b/ecere/Makefile
index 08debd0..1ede552 100644 (file)
--- a/ecere/Makefile
+++ b/ecere/Makefile
@@ -3,6 +3,7 @@
 # CORE VARIABLES
 
 MODULE := ecere
+VERSION := 0.44
 CONFIG := release
 ifndef COMPILER
 COMPILER := default
@@ -37,7 +38,7 @@ include $(_CF_DIR)crossplatform.mk
 include $(_CF_DIR)default.cf
 
 ifdef PREFIXLIBDIR
-CFLAGS += -DDEB_HOST_MULTIARCH=\"$(PREFIXLIBDIR)\"
+CFLAGS += -DDEB_HOST_MULTIARCH=\"$(call escspace,$(PREFIXLIBDIR))\"
 endif
 
 # POST-INCLUDES VARIABLES
@@ -46,11 +47,10 @@ OBJ = obj/$(CONFIG).$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)/
 
 RES = res/
 
+TARGET = obj/$(CONFIG).$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)/$(LP)ecere$(SO)$(VER)
 ifdef LINUX_TARGET
-TARGET = obj/$(CONFIG).$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)/$(LP)$(MODULE)$(SO).0.44
 SONAME = -Wl,-soname,libecere.so.0
 else
-TARGET = obj/$(CONFIG).$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)/$(LP)$(MODULE)$(SO)
 SONAME =
 endif
 
@@ -102,7 +102,7 @@ _ECSOURCES1 = \
        src/gfx/drivers/lfbConvert.ec \
        src/gfx/drivers/LFBDisplayDriver.ec \
        $(if $(or $(LINUX_TARGET),$(OSX_TARGET)),src/gfx/drivers/NCursesDisplayDriver.ec,) \
-       src/gfx/drivers/OpenGLDisplayDriver.ec \
+       $(if $(DISABLE_GL),,src/gfx/drivers/OpenGLDisplayDriver.ec) \
        $(if $(WINDOWS_TARGET),src/gfx/drivers/Win32BitmapPrinterDisplayDriver.ec,)
 _ECSOURCES2 = \
        $(if $(OSX_TARGET),src/gfx/drivers/CocoaOpenGLDisplayDriver.ec,) \
@@ -169,6 +169,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 \
@@ -376,8 +377,13 @@ RESOURCES3 = \
        $(RES)status/audioVolumeHigh.png \
        $(RES)status/folderOpen.png \
        $(RES)unicode/derivedGeneralCategoryStripped.txt \
-       locale/zh_CN/LC_MESSAGES/ecere.mo \
-       locale/es_ES/LC_MESSAGES/ecere.mo
+       locale/es.mo \
+       locale/hu.mo \
+       locale/mr.mo \
+       locale/nl.mo \
+       locale/pt_BR.mo \
+       locale/ru.mo \
+       locale/zh_CN.mo
 
 LIBS += $(SHAREDLIB) $(EXECUTABLE) $(LINKOPT)
 
@@ -393,23 +399,23 @@ 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 \
-                        -I../deps/libungif-4.1.1/lib,) \
+                        -I/usr/include/freetype2,) \
         $(if $(OSX_TARGET), \
                         -I/usr/include/freetype2 \
                         -I$(SYSROOT)/usr/X11/include/freetype2 \
                         -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 \
@@ -421,22 +427,22 @@ CUSTOM1_PRJ_CFLAGS = \
                         -DECERE_COM_MODULE \
         $(PRJ_CFLAGS)
 
-
+ECFLAGS += -module $(MODULE)
 ECFLAGS += \
         -nolinenumbers -defaultns ecere
 
-
 # PLATFORM-SPECIFIC OPTIONS
 
 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) \
@@ -452,7 +458,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
@@ -460,7 +468,6 @@ ifdef LINUX_TARGET
 
 ifndef STATIC_LIBRARY_TARGET
 OFLAGS += \
-        -L../deps/libungif-4.1.1/obj/release.$(PLATFORM)$(COMPILER_SUFFIX) \
         -L/usr/X11R6/lib
 LIBS += \
        $(call _L,ncurses) \
@@ -468,11 +475,13 @@ LIBS += \
        $(call _L,m) \
        $(call _L,dl) \
        $(call _L,fontconfig) \
-       $(call _L,ungif) \
+       $(call _L,gif) \
        $(call _L,X11) \
        $(call _L,Xext) \
        $(call _L,Xrender) \
-       $(call _L,GL)
+       $(if $(DISABLE_GL),,$(call _L,GL)) \
+       $(if $(ENABLE_SSL),$(call _L,ssl)) \
+       $(if $(ENABLE_SSL),$(call _L,crypto))
 endif
 
 else
@@ -482,8 +491,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) \
@@ -495,15 +503,15 @@ 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
 endif
 endif
 
-
-
 CECFLAGS += -cpp $(_CPP)
 
 # TARGETS
@@ -514,7 +522,15 @@ objdir:
        $(if $(wildcard $(OBJ)),,$(call mkdirq,$(OBJ)))
 
 $(OBJ)$(MODULE).main.ec: $(SYMBOLS) $(COBJECTS)
-       $(ECS) $(ECSLIBOPT) $(ARCH_FLAGS) $(SYMBOLS) $(IMPORTS) -symbols obj/$(CONFIG).$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX) -o $(OBJ)$(MODULE).main.ec
+       @$(call rmq,$(OBJ)symbols.lst)
+       @$(call touch,$(OBJ)symbols.lst)
+       @$(call echo,$(SYMBOLS1)) >> $(OBJ)symbols.lst
+       @$(call echo,$(SYMBOLS2)) >> $(OBJ)symbols.lst
+       @$(call echo,$(SYMBOLS3)) >> $(OBJ)symbols.lst
+       @$(call echo,$(IMPORTS1)) >> $(OBJ)symbols.lst
+       @$(call echo,$(IMPORTS2)) >> $(OBJ)symbols.lst
+       @$(call echo,$(IMPORTS3)) >> $(OBJ)symbols.lst
+       $(ECS) $(ARCH_FLAGS) $(ECSLIBOPT) @$(OBJ)symbols.lst -symbols obj/$(CONFIG).$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX) -o $(OBJ)$(MODULE).main.ec
 
 $(OBJ)$(MODULE).main.c: $(OBJ)$(MODULE).main.ec
        $(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c $(OBJ)$(MODULE).main.ec -o $(OBJ)$(MODULE).main.sym -symbols $(OBJ)
@@ -536,14 +552,23 @@ else
        $(AR) rcs $(TARGET) $(OBJECTS) $(LIBS)
 endif
        $(call cpq,$(TARGET),../$(HOST_SODESTDIR))
-ifdef LINUX_TARGET
-       ln -sf $(LP)$(MODULE)$(SO).0.44 ../$(SODESTDIR)$(LP)$(MODULE)$(SO).0
-       ln -sf $(LP)$(MODULE)$(SO).0.44 ../$(SODESTDIR)$(LP)$(MODULE)$(SO)
+ifdef SHARED_LIBRARY_TARGET
+ifdef LINUX_HOST
+       $(if $(basename $(VER)),ln -sf $(LP)$(MODULE)$(SO)$(VER) ../$(HOST_SODESTDIR)$(LP)$(MODULE)$(SO)$(basename $(VER)),)
+       $(if $(VER),ln -sf $(LP)$(MODULE)$(SO)$(VER) ../$(HOST_SODESTDIR)$(LP)$(MODULE)$(SO),)
+endif
 endif
 
 $(TARGET): $(SOURCES) $(RESOURCES) $(SYMBOLS) $(OBJECTS) | objdir
+       @$(call rmq,$(OBJ)objects.lst)
+       @$(call touch,$(OBJ)objects.lst)
+       @$(call echo,$(_OBJECTS)) >> $(OBJ)objects.lst
+       @$(call echo,$(OBJ)$(MODULE).main$(O)) >> $(OBJ)objects.lst
+       @$(call echo,$(ECOBJECTS1)) >> $(OBJ)objects.lst
+       @$(call echo,$(ECOBJECTS2)) >> $(OBJ)objects.lst
+       @$(call echo,$(ECOBJECTS3)) >> $(OBJ)objects.lst
 ifndef STATIC_LIBRARY_TARGET
-       $(CC) $(OFLAGS) $(OBJECTS) $(LIBS) -o $(TARGET) $(SONAME) $(INSTALLNAME)
+       $(CC) $(OFLAGS) @$(OBJ)objects.lst $(LIBS) -o $(TARGET) $(SONAME) $(INSTALLNAME)
 ifndef NOSTRIP
        $(STRIP) $(STRIPOPT) $(TARGET)
 endif
@@ -564,16 +589,26 @@ endif
        $(EAR) aw$(EARFLAGS) $(TARGET) $(RES)places/driveRemote.png $(RES)places/folder.png $(RES)places/folderRemote.png $(RES)places/networkServer.png $(RES)places/networkWorkgroup.png $(RES)places/brokenFolder.png "places"
        $(EAR) aw$(EARFLAGS) $(TARGET) $(RES)status/audioVolumeHigh.png $(RES)status/folderOpen.png "status"
        $(EAR) aw$(EARFLAGS) $(TARGET) $(RES)unicode/derivedGeneralCategoryStripped.txt "unicode"
-       $(EAR) aw$(EARFLAGS) $(TARGET) locale/zh_CN/LC_MESSAGES/ecere.mo "locale/zh_CN/LC_MESSAGES"
-       $(EAR) aw$(EARFLAGS) $(TARGET) locale/es_ES/LC_MESSAGES/ecere.mo "locale/es_ES/LC_MESSAGES"
+       $(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))
+ifdef SHARED_LIBRARY_TARGET
 ifdef LINUX_TARGET
-       ln -sf $(LP)$(MODULE)$(SO).0.44 ../$(SODESTDIR)$(LP)$(MODULE)$(SO).0
-       ln -sf $(LP)$(MODULE)$(SO).0.44 ../$(SODESTDIR)$(LP)$(MODULE)$(SO)
+ifdef LINUX_HOST
+       $(if $(basename $(VER)),ln -sf $(LP)$(MODULE)$(SO)$(VER) $(OBJ)$(LP)$(MODULE)$(SO)$(basename $(VER)),)
+       $(if $(VER),ln -sf $(LP)$(MODULE)$(SO)$(VER) $(OBJ)$(LP)$(MODULE)$(SO),)
+       $(if $(basename $(VER)),ln -sf $(LP)$(MODULE)$(SO)$(VER) ../$(SODESTDIR)$(LP)$(MODULE)$(SO)$(basename $(VER)),)
+       $(if $(VER),ln -sf $(LP)$(MODULE)$(SO)$(VER) ../$(SODESTDIR)$(LP)$(MODULE)$(SO),)
 endif  
+endif
+endif
 
 # SYMBOL RULES
 
@@ -942,6 +977,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
 
@@ -1351,6 +1389,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)
 
@@ -1836,6 +1877,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
 
@@ -1888,13 +1932,23 @@ cleaneceretarget: objdir
        $(call rmq,$(TARGET))
 
 cleantarget: objdir
+       $(call rmq,$(OBJ)$(MODULE).main.o $(OBJ)$(MODULE).main.c $(OBJ)$(MODULE).main.ec $(OBJ)$(MODULE).main$(I) $(OBJ)$(MODULE).main$(S))
+       $(call rmq,$(OBJ)symbols.lst)
+       $(call rmq,$(OBJ)objects.lst)
        $(call rmq,$(TARGET))
+ifdef SHARED_LIBRARY_TARGET
+ifdef LINUX_TARGET
+ifdef LINUX_HOST
+       $(call rmq,$(OBJ)$(LP)$(MODULE)$(SO)$(basename $(VER)))
+       $(call rmq,$(OBJ)$(LP)$(MODULE)$(SO))
+endif
+endif
+endif
        $(MAKE) -f Makefile.ecereCOM cleantarget
        $(MAKE) -f Makefile.vanilla cleantarget
 
 clean: cleantarget
        $(call rmq,$(_OBJECTS))
-       $(call rmq,$(OBJ)$(MODULE).main.o $(OBJ)$(MODULE).main.c $(OBJ)$(MODULE).main.ec $(OBJ)$(MODULE).main$(I) $(OBJ)$(MODULE).main$(S))
        $(call rmq,$(ECOBJECTS1))
        $(call rmq,$(ECOBJECTS2))
        $(call rmq,$(ECOBJECTS3))
@@ -1920,3 +1974,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