Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Try to fix par. build

  • Loading branch information...
commit 64caea56c655f9d1770085efe989a865a49a1b72 1 parent c03eb2c
@DaveDavenport authored
View
65 Makefile
@@ -1,4 +1,4 @@
-QUIET=
+QUIET=@
#@
#
# Vala compiler binary
@@ -57,7 +57,7 @@ VAPI_DIR=\
VALA_FLAGS=--thread --Xcc="-lSDL_ttf"
OUTPUT=$(BUILD_DIR)/$(PROGRAM)
-LIBS+="-lSDL_ttf"
+LIBS+=-lSDL_ttf
##################################################################################
## Pre-processing above information ##
@@ -87,61 +87,46 @@ C_SOURCES=$(foreach p,$(SOURCES:.vala=.c),$(SOURCE_DIR)/$p)
FVAPI_SOURCES=$(foreach p,$(SOURCES:.vala=.vapi),$(SOURCE_DIR)/$p)
FVAPI_SOURCES_STAMP=$(foreach p,$(SOURCES:.vala=.vapi.stamp),$(SOURCE_DIR)/$p)
FVAPI_SOURCES_DEPS=$(foreach p,$(SOURCES:.vala=.dep),$(SOURCE_DIR)/$p)
-$(info test)
+DIR_SOURCES=$(foreach p,$(SOURCES), $(SOURCE_DIR)/$(dir $p))
+BUILD_DIR_SOURCES=$(foreach p,$(SOURCES), $(BUILD_DIR)/$(dir $p))
-all: $(C_SOURCES)
+all: $(OUTPUT)
+$(BUILD_DIR):
+ $(info Create '$@' Directory)
+ $(QUIET)mkdir -p '$@'
+ $(QUIET) mkdir -p $(BUILD_DIR_SOURCES)
-$(SOURCE_DIR)/%.vapi.stamp: %.vala
- $(QUIET) mkdir -p $(dir $@)
- $(QUIET) $(VALAC) --fast-vapi=$(@:.stamp=) $< && touch $@
-
-
-$(SOURCE_DIR)/%.dep: %.vala | $(FVAPI_SOURCES_STAMP)
- $(QUIET) mkdir -p $(dir $@)
- $(QUIET) $(VALAC) -C --deps=$@ $(addprefix --use-fast-vapi=,$(subst $(@:.dep=.vapi),,$(FVAPI_SOURCES))) $(VAPI_DIRS) $(VALA_PKG) $(VALA_FLAGS) -D PC $<
-
+$(SOURCE_DIR):
+ $(info Create '$@' Directory)
+ $(QUIET)mkdir -p '$@'
+ $(QUIET) mkdir -p $(DIR_SOURCES)
-$(SOURCE_DIR)/%.c: %.vala | $(FVAPI_SOURCES_DEPS)
- $(QUIET) mkdir -p $(dir $@)
- $(QUIET) $(VALAC) -C $(addprefix --use-fast-vapi=,$(subst $(@:.c=.vapi),,$(FVAPI_SOURCES))) $(VAPI_DIRS) $(VALA_PKG) $(VALA_FLAGS) -D PC -d $(SOURCE_DIR) $<
+$(SOURCE_DIR)/%.vapi.stamp: %.vala | $(SOURCE_DIR)
+ $(QUIET) $(VALAC) --fast-vapi=$(@:.stamp=) $< && touch $@
+$(SOURCE_DIR)/%.dep: %.vala | $(FVAPI_SOURCES_STAMP)
+ $(QUIET) $(VALAC) -C --deps=$@ $(addprefix --use-fast-vapi=,$(subst $(@:.dep=.vapi),,$(FVAPI_SOURCES))) $(VAPI_DIRS) $(VALA_PKG) $(VALA_FLAGS) -D PC -d $(SOURCE_DIR) $<
-include $(FVAPI_SOURCES_DEPS)
+-include $(FVAPI_SOURCES_DEPS)
OBJECT_FILES=$(foreach p,$(SOURCES:.vala=.o),$(BUILD_DIR)/$p)
-$(info $(PKG_CFLAGS))
-$(info $(PKG_LIBS))
-$(BUILD_DIR)/%.o: %.c
- $(QUIET) mkdir -p $(dir $@)
- $(QUIET) $(CC) $(PKG_CFLAGS) $(CFLAGS) -c -o $@ $<
-
-$(PROGRAM): $(OBJECT_FILES)
- $(QUIET) $(CC) -o $@ $^ $(LIBS) $(CFLAGS) $(PKG_LIBS) $(PKG_CFLAGS)
-
-$(BUILD_DIR):
- $(info Create '$@' Directory)
- $(QUIET)mkdir -p '$@'
-
-$(OUTPUT): $(SOURCES) $(BUILD_DIR)
- $(info Building source files: '$(SOURCES)')
- $(QUIET) $(VALAC) -o $(PROGRAM) $(SOURCES) $(VAPI_DIRS) $(VALA_PKG) $(VALA_FLAGS) -D PC -d $(BUILD_DIR)
-
-$(SOURCE_DIR):
- $(info Create '$@' Directory)
- $(QUIET)mkdir -p '$@'
+$(BUILD_DIR)/%.o: $(SOURCE_DIR)/%.c | $(BUILD_DIR)
+ $(QUIET) $(CC) $(PKG_CFLAGS) $(CFLAGS) -g -c $< -o $@
-#source: $(SOURCES) $(SOURCE_DIR)
-# $(info Creating source files: '$(SOURCES)')
-# $(QUIET) $(VALAC) $(SOURCES) $(VAPI_DIRS) $(VALA_PKG) $(VALA_FLAGS) -C -d $(SOURCE_DIR)
+$(OUTPUT): $(OBJECT_FILES) | $(BUILD_DIR)
+ $(QUIET) $(CC) $^ $(LIBS) $(PKG_LIBS) $(CFLAGS) $(PKG_CFLAGS)-o $@
+source: $(SOURCES) $(SOURCE_DIR)
+ $(info Creating source files: '$(SOURCES)')
+ $(QUIET) $(VALAC) $(SOURCES) $(VAPI_DIRS) $(VALA_PKG) $(VALA_FLAGS) -C -d $(SOURCE_DIR)
##
# Run it.
##
View
4 Makefile.old
@@ -1,4 +1,4 @@
-QUIET=@
+QUIET=
#
# Vala compiler binary
#
@@ -103,7 +103,7 @@ $(SOURCE_DIR):
##
$(OUTPUT): $(SOURCES) $(BUILD_DIR)
$(info Building source files: '$(SOURCES)')
- $(QUIET) $(VALAC) -o $(PROGRAM) $(SOURCES) $(VAPI_DIRS) $(VALA_PKG) $(VALA_FLAGS) -D PC -d $(BUILD_DIR)
+ $(QUIET) $(VALAC) -v --save-temps -g -o $(PROGRAM) $(SOURCES) $(VAPI_DIRS) $(VALA_PKG) $(VALA_FLAGS) -D PC -d $(BUILD_DIR)
##
# Build source (for compilation on sbt)
View
1  SRC/EventHandlers/Event.vala
@@ -81,7 +81,6 @@ namespace SDLMpc
public bool released;
}
- [Compact]
public class Event {
public Posix.timeval time;
public EventType type;
View
2  SRC/SDLMpc.vala
@@ -68,7 +68,7 @@ namespace SDLMpc
class Main : GLib.Object
{
- public Font fonts[5/*FontSize.NUM_FONTS*/];
+ public Font[] fonts = new Font[5];
/**
* The main screen
*/
View
2  SRC/Widgets/SDLWidget.vala
@@ -165,7 +165,6 @@ namespace SDLMpc
this.get_absolute_position(ref tx, ref ty);
return !(tx> (r.x+r.w) || (tx+this.w) <= r.x ||
ty > (r.y+r.h) || (ty+this.h) <= r.y);
- return false;
}
public virtual void draw(Surface screen, SDL.Rect *rect)
{
@@ -232,7 +231,6 @@ namespace SDLMpc
focus_current.data.focus = true;
}
return true;
- break;
case EventCommand.DOWN:
if(focus_chain == null) break;
if(focus_current != null){
Please sign in to comment.
Something went wrong with that request. Please try again.