Fixed up ide.epj and Makefile to always use obj/resources.o regardless of config

- Makes it so that the Debug just builds after a 'make'

diff --git a/ide/Makefile b/ide/Makefile
index 4da512c..2b319b5 100644 (file)
--- a/ide/Makefile
+++ b/ide/Makefile
@@ -141,7 +141,7 @@ endif
 
 ifdef WINDOWS
 
-LIBS += $(OBJ)resources.o
+LIBS += obj/resources.o
 
 else
 ifdef LINUX
@@ -179,7 +179,7 @@ $(OBJ)$(MODULE).main.c: $(OBJ)$(MODULE).main.ec
 
 $(TARGET): $(SOURCES) $(RESOURCES) | objdir $(SYMBOLS) $(OBJECTS)
 ifdef WINDOWS
-$(TARGET): | $(OBJ)resources.o
+$(TARGET): | obj/resources.o
 endif
        $(CC) $(OFLAGS) $(OBJECTS) $(LIBS) -o $(TARGET) $(INSTALLNAME)
        $(STRIP) $(STRIPOPT) $(TARGET)
@@ -190,8 +190,8 @@ endif
        $(call cpq,$(TARGET),../obj/$(PLATFORM)/bin/)
 
 ifdef WINDOWS
-$(OBJ)resources.o: src/icon2.ico src/resources.rc
-       windres src/resources.rc $(OBJ)resources.o
+obj/resources.o: src/icon2.ico src/resources.rc
+       windres src/resources.rc obj/resources.o
 endif
 
 # SYMBOL RULES

diff --git a/ide/ide.epj b/ide/ide.epj
index 798e943..11c0316 100644 (file)
--- a/ide/ide.epj
+++ b/ide/ide.epj
@@ -36,6 +36,14 @@
                "/usr/X11R6/lib"
             ]
          }
+      },
+      {
+         "Name" : "win32",
+         "Options" : {
+            "Libraries" : [
+               "obj/resources.o"
+            ]
+         }
       }
    ],
    "Configurations" : [
@@ -58,7 +66,7 @@
                "Name" : "Win32",
                "Options" : {
                   "Libraries" : [
-                     "resources.o"
+
                   ]
                }
             }
@@ -86,7 +94,7 @@
                "Name" : "Win32",
                "Options" : {
                   "Libraries" : [
-                     "resources.o"
+
                   ]
                }
             },
@@ -128,7 +136,7 @@
                "Name" : "Win32",
                "Options" : {
                   "Libraries" : [
-                     "resources.o"
+
                   ]
                }
             }
@@ -175,7 +183,6 @@
                "Name" : "Win32",
                "Options" : {
                   "Libraries" : [
-                     "resources.o",
                      "dxguid",
                      "ddraw",
                      "dinput",