diff options
| author | Dan Gudmundsson <dgud@erlang.org> | 2010-10-11 11:00:38 +0200 |
|---|---|---|
| committer | Dan Gudmundsson <dgud@erlang.org> | 2010-11-15 10:13:07 +0100 |
| commit | 8577598667bff43f503f3cae87934c3e9918d135 (patch) | |
| tree | 7769951ae687f9c266ee938f0df221e291699529 /lib/wx/c_src/Makefile.in | |
| parent | ac433c8318566261a74ffe7fd0824fb99610bed3 (diff) | |
| download | erlang-8577598667bff43f503f3cae87934c3e9918d135.tar.gz | |
Windows and Mac build issues
Diffstat (limited to 'lib/wx/c_src/Makefile.in')
| -rw-r--r-- | lib/wx/c_src/Makefile.in | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/wx/c_src/Makefile.in b/lib/wx/c_src/Makefile.in index 9c85549a5c..4713b5ae69 100644 --- a/lib/wx/c_src/Makefile.in +++ b/lib/wx/c_src/Makefile.in @@ -76,7 +76,7 @@ endif WX_OBJECTS = $(GENERAL_O) $(GENERATED_O) $(RC_FILE) -OBJECTS = $(WX_OBJECTS) $(OPENGL_O) +OBJECTS = $(WX_OBJECTS) $(GL_OBJECTS) TARGET_APIS = wxe_driver erl_gl TARGET_DIR = ../priv/$(SYS_TYPE) @@ -113,7 +113,7 @@ CXX_FLAGS = @CXXFLAGS@ WX_LIBS = $(OPT_WX_LIBS) endif -CL_LIBS = -lGL -lGLU +GL_LIBS = @GL_LIBS@ CC_O = $(CC) -c $(CFLAGS) $(WX_CFLAGS) $(COMMON_CFLAGS) CPP_O = $(CPP) -c $(CXX_FLAGS) $(WX_CXX_FLAGS) $(COMMON_CFLAGS) @@ -170,7 +170,7 @@ $(TARGET_DIR)/wxe_driver$(SO_EXT): $(WX_OBJECTS) $(TARGET_DIR)/erl_gl$(SO_EXT): $(GL_OBJECTS) mkdir -p $(TARGET_DIR) - $(CC) $(LDFLAGS) $(GL_OBJECTS) $(CL_LIBS) -o $@ + $(CC) $(LDFLAGS) $(GL_OBJECTS) $(GL_LIBS) -o $@ # ---------------------------------------------------- |