aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortcsullivan <tullivan99@gmail.com>2019-08-25 13:20:13 -0400
committertcsullivan <tullivan99@gmail.com>2019-08-25 13:20:13 -0400
commit9563ee05a4d73d51f5c42df3fc8af98adfa938f6 (patch)
tree908119f59dc373f0d922961cb2bd23ec0a51581c
parent8fad6784c4316e1fe41290ae80e6a8c535de4fa1 (diff)
finally put main.cpp in src
-rw-r--r--Makefile4
-rw-r--r--src/main.cpp (renamed from main.cpp)0
-rw-r--r--xml/!town.xml2
3 files changed, 3 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 2cc8f31..ab3a6e2 100644
--- a/Makefile
+++ b/Makefile
@@ -40,9 +40,9 @@ clean:
@mkdir out/components
@rm -f xml/*.dat
-$(EXEC): $(CXXOUTDIR)/$(CXXOBJ) main.cpp
+$(EXEC): $(CXXOUTDIR)/$(CXXOBJ)
@echo " CXX/LD main"
- @$(CXX) $(SPECIAL) $(CXXFLAGS) $(CXXINC) $(CXXWARN) -o $(EXEC) main.cpp out/components/*.o out/systems/*.o out/*.o $(LIBS)
+ @$(CXX) $(SPECIAL) $(CXXFLAGS) $(CXXINC) $(CXXWARN) -o $(EXEC) out/components/*.o out/systems/*.o out/*.o $(LIBS)
$(CXXOUTDIR)/%.o: $(CXXSRCDIR)/%.cpp
@echo " CXX " $<
diff --git a/main.cpp b/src/main.cpp
index ce1505d..ce1505d 100644
--- a/main.cpp
+++ b/src/main.cpp
diff --git a/xml/!town.xml b/xml/!town.xml
index 545fddf..da9450c 100644
--- a/xml/!town.xml
+++ b/xml/!town.xml
@@ -13,7 +13,7 @@
<layer path="bg/grass.png"/>
</style>
<ground path="assets/testground.png"/>
- <weather>Sunny</weather>
+ <weather>Snowy</weather>
<link right="!town2.xml"/>
<spawnx>-300</spawnx>
<time>8000</time>