Changeset 603

Timestamp:

01/03/12 09:38:22 (5 months ago)

Author:

aldacron

Message:

[Derelict2 - DerelictAllegro?]
* added support for the allegro_ttf addon
* updated the linux and mac makefiles with build targets for DerelictAllegroDialog?

Files:

• branches/Derelict2/DerelictAllegro/Makefile (modified) (7 diffs)
• branches/Derelict2/DerelictAllegro/derelict/allegro/ttf.d (added)
• branches/Derelict2/linux.mak (modified) (1 diff)
• branches/Derelict2/mac.mak (modified) (1 diff)
• branches/Derelict2/win32.mak (modified) (1 diff)

branches/Derelict2/DerelictAllegro/Makefile

@@ -9 +9 @@
-COD_LIB=$(LIB_PRE)DerelictAllegroACodec.$(LIB_EXT)
-DIA_LIB=$(LIB_PRE)DerelictAllegroDialog.$(LIB_EXT)
+TTF_LIB=$(LIB_PRE)DerelictAllegroTTF.$(LIB_EXT)
-
-
+$(TTF_LIB) 
-DerelictAllegro : $(AL_LIB) copylib
-DerelictAllegroImage : $(IMG_LIB) copylib
@@ -17 +18 @@
-DerelictAllegroACodec : $(COD_LIB) copylib
-DerelictAllegroDialog : $(DIA_LIB) copylib
+DerelictAllegroTTF : $(TTF_LIB) copylib
-
-AL_SRC= \
@@ -37 +39 @@
-DIA_SRC=\
-    derelict/allegro/dialog.d
+    
+TTF_SRC=\
+    derelict/allegro/ttf.d
-    
-$(AL_LIB) : $(DC)_build_al
@@ -44 +49 @@
-$(COD_LIB) : $(DC)_build_cod
-$(DIA_LIB) : $(DC)_build_dia
+$(TTF_LIB) : $(DC)_build_ttf
-
-# DMD ##############################################
@@ -63 +69 @@
-dmd_build_dia:
-    $(DC) $(DFLAGS) $(DFLAGS_REQ) $(DIA_SRC) $(HD)/$(PACKAGE_PATH) $(OF)$(DIA_LIB)
+    
+dmd_build_ttf:
+    $(DC) $(DFLAGS) $(DFLAGS_REQ) $(TTF_SRC) $(HD)/$(PACKAGE_PATH) $(OF)$(TTF_LIB)
-    
-# LDC ##############################################
@@ -95 +104 @@
-    $(RM) *.o
-    
+ldc_build_ttf:
+    $(DC) $(DFLAGS) $(DFLAGS_REQ) $(TTF_SRC) $(HD)/$(PACKAGE_PATH)
+    ar rcs $(TTF_LIB) *.o
+    $(RM) *.o
+    
-# GDMD/GDC ##############################################
-gdmd_build_al:
@@ -114 +128 @@
-    $(DC) $(DFLAGS) $(DFLAGS_REQ) $(DIA_SRC) $(HD)/$(PACKAGE_PATH) $(OF)$(DIA_LIB)
-    
+gdmd_build_ttf:
+    $(DC) $(DFLAGS) $(DFLAGS_REQ) $(TTF_SRC) $(HD)/$(PACKAGE_PATH) $(OF)$(TTF_LIB)
+    
-copylib:        
-    $(CP) *.$(LIB_EXT) $(LIB_DEST)

branches/Derelict2/linux.mak

@@ -64 +64 @@
-DerelictAllegroACodec :
-    $(DMAKE) -C DerelictAllegro DerelictAllegroACodec PLATFORM=linux
+    
+DerelictAllegroDialog :
+    $(DMAKE) -C DerelictAllegro DerelictAllegroDialog PLATFORM=linux
+    
+DerelictAllegroTTF :
+    $(DMAKE) -C DerelictAllegro DerelictAllegroTTF PLATFORM=linux
-
-# There's only one DerelictFMODEX target

branches/Derelict2/mac.mak

@@ -58 +58 @@
-DerelictAllegroACodec :
-    $(DMAKE) -C DerelictAllegro DerelictAllegroACodec PLATFORM=mac
+    
+DerelictAllegroDialog :
+    $(DMAKE) -C DerelictAllegro DerelictAllegroDialog PLATFORM=mac
+    
+DerelictAllegroTTF :
+    $(DMAKE) -C DerelictAllegro DerelictAllegroTTF PLATFORM=mac
-
-# There's only one DerelictFMODEX target

branches/Derelict2/win32.mak

@@ -94 +94 @@
-    
-DerelictAllegroDialog :
+    cd DerelictAllegro
+    $(DMAKE) DerelictAllegroDialog PLATFORM=win32 DC=$(DC)
+    cd ..
+    
+DerelictAllegroTTF:
-    cd DerelictAllegro
-    $(DMAKE) DerelictAllegroDialog PLATFORM=win32 DC=$(DC)