Skip to content

Commit 54ef641

Browse files
author
Ubuntu
committed
Make test for wx compilation more generic (works with gtk2 and 3)
1 parent a06411d commit 54ef641

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

ObjCryst/rules-gnu.mak

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -215,14 +215,14 @@ endif
215215
$(BUILD_DIR)/wxWidgets-3.0.2.tar.bz2:
216216
cd $(BUILD_DIR) && $(DOWNLOAD_COMMAND) http://ftp.wxwidgets.org/pub/3.0.2/wxWidgets-3.0.2.tar.bz2
217217

218-
$(BUILD_DIR)/static-libs/lib/libwx_gtk2u_core-3.0.a: $(BUILD_DIR)/wxWidgets-3.0.2.tar.bz2
218+
$(BUILD_DIR)/static-libs/include/wx-3.0/wx/wx.h: $(BUILD_DIR)/wxWidgets-3.0.2.tar.bz2
219219
cd $(BUILD_DIR) && rm -Rf wxWidgets-3.0.2 && tar -xjf wxWidgets-3.0.2.tar.bz2
220220
cd $(BUILD_DIR)/wxWidgets-3.0.2 && ./configure --with-gtk --with-opengl --prefix=$(BUILD_DIR)/static-libs --enable-unicode --enable-optimise --disable-shared --x-includes=/usr/X11R6/include/ && $(MAKE) install
221221
rm -Rf $(BUILD_DIR)/wxWidgets-3.0.2
222222

223223
ifneq ($(wxcryst),0)
224224
ifneq ($(shared-wxgtk),1)
225-
libwx = $(BUILD_DIR)/static-libs/lib/libwx_gtk2u_core-3.0.a
225+
libwx = $(BUILD_DIR)/static-libs/include/wx-3.0/wx/wx.h
226226
else
227227
libwx=
228228
endif

0 commit comments

Comments
 (0)