blob: e556d76193e9c6ed26301cd6bd454c81f35d4fd1 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
|
--- JLib/Makefile.orig 2006-03-26 23:38:39.000000000 -0500
+++ JLib/Makefile 2006-03-27 01:16:36.000000000 -0500
@@ -19,7 +19,7 @@
endif
# Define -D_JLIB_DEBUG to debug JLib. Compile the app to debug also with this flag
-CFLAGS=-I. -O3 -ffast-math -fPIC -Wall -Wshadow `$(SDL_CONFIG) --cflags`
+CXXFLAGS=-I. $(CPU_OPTS) `$(SDL_CONFIG) --cflags`
# Sample LDFLAGS for applications
# LDFLAGS=-L. -ffast-math -lSDL_image -lSDL_ttf -lSDL_mixer `$(SDL_CONFIG) --libs`
@@ -28,15 +28,14 @@
# JLib
libJLib: $(JLIB_OBJS)
- g++ -shared -fPIC -o $@.so $? \
- && ar rvus $@.a $? \
+ ar rvus $@.a $?
$(GRAPHICS)/%.o: $(GRAPHICS)/%.cpp
- g++ $(CFLAGS) -c -o $@ $<
+ $(CXX) $(CXXFLAGS) -c -o $@ $<
$(UTIL)/%.o: $(UTIL)/%.cpp
- g++ $(CFLAGS) -c -o $@ $<
+ $(CXX) $(CXXFLAGS) -c -o $@ $<
$(MATH)/%.o: $(MATH)/%.cpp
- g++ $(CFLAGS) -c -o $@ $<
+ $(CXX) $(CXXFLAGS) -c -o $@ $<
.PHONY: install
install:
--- src/Makefile.orig 2006-03-27 01:26:18.000000000 -0500
+++ src/Makefile 2006-03-27 01:27:31.000000000 -0500
@@ -30,7 +30,7 @@
DEFINES = -DHC_DATA_DIR=\"$(HC_DATA)\" -DHCED_DATA_DIR=\"$(HCED_DATA)\"
-all: JLib HC HCed
+all: HC HCed
HC_OBJ_MAIN=HolotzCastle.o
HC_OBJS=HCUtil.o HCTimer.o HCLoadSaveSlot.o HCPlaylist.o HCPreferences.o HCTheme.o HCText.o \
@@ -42,8 +42,8 @@
# Definir -D_JLIB_DEBUG para debug con JLib. Ponerlo también en el Makefile de JLib.
# Define -D_JLIB_DEBUG for JLib debug mode. Put it also in JLib's Makefile.
-CFLAGS=-I. -I../JLib -O3 -Wall -Werror -Wshadow $(CPU_OPTS) -ffast-math -c `$(SDL_CONFIG) --cflags`
-LDFLAGS=-L. -ffast-math -lSDL_image -lSDL_ttf -lSDL_mixer `$(SDL_CONFIG) --libs`
+CFLAGS=-I. -I../JLib $(CPU_OPTS) -c `$(SDL_CONFIG) --cflags`
+LDFLAGS=-L. -lSDL_image -lSDL_ttf -lSDL_mixer `$(SDL_CONFIG) --libs`
JLib:
|
GitWeb
