Browse Source

patch für dumme compiler: LDFLAGS nach hinten beim linken sonst bauen bestimmte gccs nicht.

twist 8 years ago
parent
commit
650b48a376
4 changed files with 6 additions and 6 deletions
  1. 2
    2
      Makefile
  2. 1
    1
      gitter/Makefile
  3. 2
    2
      net/Makefile
  4. 1
    1
      viewer/SDLview/Makefile

+ 2
- 2
Makefile View File

@@ -15,7 +15,7 @@ net: logging
15 15
 server: net
16 16
 
17 17
 gameserver: $(SUBDIRS)
18
-	$(CC) $(CFLAGS) $(LDFLAGS) -o gameserver ./logging/logging.o ./net/net.o ./net/network.o ./server/config.o ./server/entities.o ./server/entity_storage.o ./server/json_output.o ./server/luafuncs.o ./server/luastate.o ./server/main.o ./server/map.o ./server/physics.o ./server/route.o ./server/ship.o ./server/storages.o ./server/vector.o ./net/talk.o ./net/pstr.o ./net/userstuff.o ./net/dispatch.o ./server/player.o ./server/base.o
18
+	$(CC) $(CFLAGS) -o gameserver ./logging/logging.o ./net/net.o ./net/network.o ./server/config.o ./server/entities.o ./server/entity_storage.o ./server/json_output.o ./server/luafuncs.o ./server/luastate.o ./server/main.o ./server/map.o ./server/physics.o ./server/route.o ./server/ship.o ./server/storages.o ./server/vector.o ./net/talk.o ./net/pstr.o ./net/userstuff.o ./net/dispatch.o ./server/player.o ./server/base.o $(LDFLAGS)
19 19
 
20 20
 clean:
21 21
 	-rm gameserver
@@ -28,4 +28,4 @@ debug:
28 28
 	for dir in $(SUBDIRS); do \
29 29
 		$(MAKE) -C $$dir dbg; \
30 30
 	done
31
-	$(CC) $(CFLAGS) $(LDFLAGS) -DENABLE_DEBUG -fsignaling-nans -o gameserver ./logging/logging.o ./net/net.o ./net/network.o ./server/config.o ./server/entities.o ./server/entity_storage.o ./server/json_output.o ./server/luafuncs.o ./server/luastate.o ./server/main.o ./server/map.o ./server/physics.o ./server/route.o ./server/ship.o ./server/storages.o ./server/vector.o ./net/talk.o ./net/pstr.o ./net/userstuff.o ./net/dispatch.o ./server/player.o ./server/base.o
31
+	$(CC) $(CFLAGS) -DENABLE_DEBUG -fsignaling-nans -o gameserver ./logging/logging.o ./net/net.o ./net/network.o ./server/config.o ./server/entities.o ./server/entity_storage.o ./server/json_output.o ./server/luafuncs.o ./server/luastate.o ./server/main.o ./server/map.o ./server/physics.o ./server/route.o ./server/ship.o ./server/storages.o ./server/vector.o ./net/talk.o ./net/pstr.o ./net/userstuff.o ./net/dispatch.o ./server/player.o ./server/base.o $(LDFLAGS)

+ 1
- 1
gitter/Makefile View File

@@ -5,7 +5,7 @@ LDFLAGS = `sdl-config --libs` -lSDL_gfx  -lm -lpthread
5 5
 OBJ = main.o screen.o route.o json_output.o
6 6
 
7 7
 main: $(OBJ)
8
-	$(CXX) $(FLAGS) $(LDFLAGS) -o $@ $(OBJ) 
8
+	$(CXX) $(FLAGS) -o $@ $(OBJ) $(LDFLAGS)
9 9
 
10 10
 %.o: %.c %.h
11 11
 	$(CXX) $(FLAGS) $(CLIBS) -c $< 

+ 2
- 2
net/Makefile View File

@@ -9,10 +9,10 @@ all: talk net
9 9
 dbg: all
10 10
 
11 11
 talk: $(OBJ_TALK)
12
-		$(CC) $(LDFLAGS) -o $@ $(OBJ_TALK)
12
+		$(CC) -o $@ $(OBJ_TALK)  $(LDFLAGS)
13 13
 
14 14
 net: $(OBJ_NET)
15
-		$(CC) $(LDFLAGS) -o $@ $(OBJ_NET)
15
+		$(CC) -o $@ $(OBJ_NET) $(LDFLAGS)
16 16
 
17 17
 %.o: %.c %.h
18 18
 		$(CC) $(CFLAGS) -c $<

+ 1
- 1
viewer/SDLview/Makefile View File

@@ -13,7 +13,7 @@ ifeq ($(CC),clang)
13 13
 endif
14 14
 
15 15
 main: $(OBJ) Makefile
16
-	$(CC) $(FLAGS) $(LDFLAGS) -o $@ $(OBJ)
16
+	$(CC) $(FLAGS) -o $@ $(OBJ) $(LDFLAGS)
17 17
 
18 18
 %.o: %.c %.h
19 19
 	$(CC) $(FLAGS) $(CLIBS) -c $<