Changeset 606

Timestamp:

01/04/12 05:21:06 (5 months ago)

Author:

aldacron

Message:

[Derelict2 - DerelictAllegro?]
* added support for the allegro_primitives addon

Files:

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

branches/Derelict2/DerelictAllegro/Makefile

@@ -10 +10 @@
-DIA_LIB=$(LIB_PRE)DerelictAllegroDialog.$(LIB_EXT)
-TTF_LIB=$(LIB_PRE)DerelictAllegroTTF.$(LIB_EXT)
+PRM_LIB=$(LIB_PRE)DerelictAllegroPrimitives.$(LIB_EXT)
-
-
+$(PRM_LIB) 
-DerelictAllegro : $(AL_LIB) copylib
-DerelictAllegroImage : $(IMG_LIB) copylib
@@ -19 +20 @@
-DerelictAllegroDialog : $(DIA_LIB) copylib
-DerelictAllegroTTF : $(TTF_LIB) copylib
+DerelictAllegroPrimitives : $(PRM_LIB) copylib
-
-AL_SRC= \
@@ -42 +44 @@
-TTF_SRC=\
-    derelict/allegro/ttf.d
+    
+PRM_SRC=\
+    derelict/allegro/primitives.d
-    
-$(AL_LIB) : $(DC)_build_al
@@ -50 +55 @@
-$(DIA_LIB) : $(DC)_build_dia
-$(TTF_LIB) : $(DC)_build_ttf
+$(PRM_LIB) : $(DC)_build_prm
-
-# DMD ##############################################
@@ -72 +78 @@
-dmd_build_ttf:
-    $(DC) $(DFLAGS) $(DFLAGS_REQ) $(TTF_SRC) $(HD)/$(PACKAGE_PATH) $(OF)$(TTF_LIB)
+    
+dmd_build_prm:
+    $(DC) $(DFLAGS) $(DFLAGS_REQ) $(PRM_SRC) $(HD)/$(PACKAGE_PATH) $(OF)$(PRM_LIB)
-    
-# LDC ##############################################
@@ -109 +118 @@
-    $(RM) *.o
-    
+ldc_build_prm:
+    $(DC) $(DFLAGS) $(DFLAGS_REQ) $(PRM_SRC) $(HD)/$(PACKAGE_PATH)
+    ar rcs $(PRM_LIB) *.o
+    $(RM) *.o
+    
-# GDMD/GDC ##############################################
-gdmd_build_al:
@@ -131 +145 @@
-    $(DC) $(DFLAGS) $(DFLAGS_REQ) $(TTF_SRC) $(HD)/$(PACKAGE_PATH) $(OF)$(TTF_LIB)
-    
+gdmd_build_prm:
+    $(DC) $(DFLAGS) $(DFLAGS_REQ) $(PRM_SRC) $(HD)/$(PACKAGE_PATH) $(OF)$(PRM_LIB)
+    
-copylib:        
-    $(CP) *.$(LIB_EXT) $(LIB_DEST)

branches/Derelict2/win32.mak

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